yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remore ui replacements

Browse Source
This commit is contained in:
Shannon
2016-03-11 15:47:22 +01:00
parent fa0588116f
commit ca3630f9d9
43 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
View File

@@ -26,6 +26,6 @@
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button ID="sbmt" runat="server" CssClass="btn btn-primary" Text="Create" OnClick="SubmitButton_Click"></asp:Button>
</cc1:Pane>

2
src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
View File

@@ -33,6 +33,6 @@
<input type="hidden" name="nodeType" value="-1">
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button ID="SubmitButton" CssClass="btn btn-primary" runat="server" OnClick="SubmitButton_Click" Text='<%#ui.Text("create") %>'></asp:Button>
</cc1:Pane>

10
src/Umbraco.Web.UI/umbraco/create/content.ascx
View File

@@ -1,11 +1,11 @@
<%@ Control Language="c#" AutoEventWireup="True" Codebehind="content.ascx.cs" Inherits="umbraco.cms.presentation.create.controls.content" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
<asp:literal id="typeJs" runat="server"/>
<div><%=umbraco.ui.Text("name")%>:<br /></div>
<div><%=Services.TextService.Localize("name")%>:<br /></div>
<asp:TextBox id="rename" Runat="server" CssClass="bigInput"></asp:TextBox><br /><br />
<asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
<span style="margin-left: -7px;"><%=umbraco.ui.Text("choose")%> <%=umbraco.ui.Text("documentType")%>:<br /></span>
<span style="margin-left: -7px;"><%=Services.TextService.Localize("choose")%> <%=Services.TextService.Localize("documentType")%>:<br /></span>
<asp:ListBox id="nodeType" Runat="server" cssClass="bigInput" Rows="1" SelectionMode="Single"></asp:ListBox>
<asp:RequiredFieldValidator id="RequiredFieldValidator2" ErrorMessage="*" ControlToValidate="nodeType" runat="server">*</asp:RequiredFieldValidator>
@@ -18,10 +18,10 @@
<div style="margin-right: 15px;">
<asp:Button id="sbmt" Runat="server" style="Width: 90px; margin-right: 6px;" onclick="sbmt_Click"></asp:Button>
<em> <%= umbraco.ui.Text("or") %> </em>
<a href="#" style="color: Blue; margin-left: 6px;" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<em> <%= Services.TextService.Localize("or") %> </em>
<a href="#" style="color: Blue; margin-left: 6px;" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<!--
<input type="button" value="" onClick="if (confirm('<%=umbraco.ui.Text("areyousure")%>')) window.close()" style="width: 90px; margin-left: 6px;"/>
<input type="button" value="" onClick="if (confirm('<%=Services.TextService.Localize("areyousure")%>')) window.close()" style="width: 90px; margin-left: 6px;"/>
-->
</div>

4
src/Umbraco.Web.UI/umbraco/create/language.ascx
View File

@@ -11,8 +11,8 @@
</cc1:Pane>
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<asp:Button ID="sbmt" CssClass="btn btn-primary" OnClick="sbmt_Click" runat="server" Text='<%#umbraco.ui.Text("create") %>'></asp:Button>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button ID="sbmt" CssClass="btn btn-primary" OnClick="sbmt_Click" runat="server" Text='<%#Services.TextService.Localize("create") %>'></asp:Button>
</cc1:Pane>

6
src/Umbraco.Web.UI/umbraco/create/member.ascx
View File

@@ -7,8 +7,8 @@
<br />
<asp:TextBox ID="rename" runat="server" Width="350px" CssClass="bigInput"></asp:TextBox>
<asp:Panel ID="memberChooser" runat="server">
<%=umbraco.ui.Text("choose")%>
<%=umbraco.ui.Text("membertype")%>:<asp:RequiredFieldValidator ID="memberTypeRequired" ErrorMessage="*" ControlToValidate="nodeType"
<%=Services.TextService.Localize("choose")%>
<%=Services.TextService.Localize("membertype")%>:<asp:RequiredFieldValidator ID="memberTypeRequired" ErrorMessage="*" ControlToValidate="nodeType"
runat="server">*</asp:RequiredFieldValidator><br />
<asp:ListBox ID="nodeType" runat="server" Width="350px" CssClass="bigInput" Rows="1"
SelectionMode="Single"></asp:ListBox>
@@ -44,5 +44,5 @@
<asp:Button ID="sbmt" runat="server" Style="margin-top: 14px" Width="90" OnClick="sbmt_Click">
</asp:Button>
&nbsp; <em>
<%= umbraco.ui.Text("or") %></em> &nbsp;<a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<%= Services.TextService.Localize("or") %></em> &nbsp;<a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
</div>

2
src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
View File

@@ -27,6 +27,6 @@
</cc1:Pane>
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" onclick="sbmt_Click"></asp:Button>
</cc1:Pane>

4
src/Umbraco.Web.UI/umbraco/create/script.ascx
View File

@@ -29,6 +29,6 @@
</cc1:Pane>
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<asp:Button ID="sbmt" CssClass="btn btn-primary" runat="server" Text='<%#umbraco.ui.Text("create") %>' OnClick="SubmitClick"></asp:Button>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button ID="sbmt" CssClass="btn btn-primary" runat="server" Text='<%#Services.TextService.Localize("create") %>' OnClick="SubmitClick"></asp:Button>
</cc1:Pane>

2
src/Umbraco.Web.UI/umbraco/create/simple.ascx
View File

@@ -9,7 +9,7 @@
</cc1:Pane>
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" onclick="sbmt_Click"></asp:Button>
</cc1:Pane>

2
src/Umbraco.Web.UI/umbraco/create/xslt.ascx
View File

@@ -24,7 +24,7 @@
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" onclick="sbmt_Click"></asp:Button>
</cc1:Pane>

2
src/Umbraco.Web.UI/umbraco/developer/Packages/SubmitPackage.aspx
View File

@@ -105,7 +105,7 @@
</div>
<p>
<asp:Button ID="bt_submit" runat="server" Text="Submit package" OnClick="submitPackage" /> &nbsp;<em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="editpackage.aspx?id=<%= Request.QueryString["id"] %>"><%= umbraco.ui.Text("cancel") %></a>
<asp:Button ID="bt_submit" runat="server" Text="Submit package" OnClick="submitPackage" /> &nbsp;<em><%= Services.TextService.Localize("or") %></em> &nbsp;<a href="editpackage.aspx?id=<%= Request.QueryString["id"] %>"><%= Services.TextService.Localize("cancel") %></a>
</p>
</asp:PlaceHolder>

2
src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx
View File

@@ -42,7 +42,7 @@
<umb:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button ID="addButton" runat="server" Text="Create" cssclass="btn btn-primary" onclick="AddButton_Click" CausesValidation="true" ValidationGroup="NewRelationType" />
</umb:Pane>

2
src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
View File

@@ -37,7 +37,7 @@ div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font
</cc1:Pane>
<p>
<asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= umbraco.ui.Text("or") %></em> <a href="xsltInsertValueOf.aspx"><%= umbraco.ui.Text("cancel") %></a>
<asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= Services.TextService.Localize("or") %></em> <a href="xsltInsertValueOf.aspx"><%= Services.TextService.Localize("cancel") %></a>
</p>
</asp:Content>

2
src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
View File

@@ -57,6 +57,6 @@ body{margin: 0px; padding: 0px;}
</cc1:Pane>
<p>
<input type="button" value="Insert value" onclick="doSubmit();" /> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
<input type="button" value="Insert value" onclick="doSubmit();" /> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
</p>
</asp:Content>

2
src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
View File

@@ -113,7 +113,7 @@
<p>
<asp:PlaceHolder ID="SavePlaceholder" runat="server">
<asp:Button ID="ValidateAndSave" runat="server" OnClick="ValidateAndSave_Click" />
<em> <%= umbraco.ui.Text("or") %> </em>
<em> <%= Services.TextService.Localize("or") %> </em>
</asp:PlaceHolder>
<a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", Security.CurrentUser)%></a>
</p>

6
src/Umbraco.Web.UI/umbraco/dialogs/SendPublish.aspx
View File

@@ -2,12 +2,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>umbraco - <%=umbraco.ui.Text("editContentSendToPublish")%></title>
<title>umbraco - <%=Services.TextService.Localize("editContentSendToPublish")%></title>
<link href="../css/umbracoGui.css" type="text/css" rel="stylesheet"/>
</head>
<body style="padding: 10px;">
<h3><img src="../images/publish.gif" alt="Republish" align="absmiddle" style="float:left; margin-top: 3px; margin-right: 5px"/> <%=umbraco.ui.Text("editContentSendToPublishText")%></h3>
<h3><img src="../images/publish.gif" alt="Republish" align="absmiddle" style="float:left; margin-top: 3px; margin-right: 5px"/> <%=Services.TextService.Localize("editContentSendToPublishText")%></h3>
<br/>
<a href="#" onclick="javascript:UmbClientMgr.closeModalWindow();" style="margin-left: 30px" class="guiDialogNormal"><%=umbraco.ui.Text("closewindow")%></a>
<a href="#" onclick="javascript:UmbClientMgr.closeModalWindow();" style="margin-left: 30px" class="guiDialogNormal"><%=Services.TextService.Localize("closewindow")%></a>
</body>
</html>

6
src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
View File

@@ -52,11 +52,11 @@
<cc1:Feedback runat="server" ID="PageNameHolder" type="notice" Style="margin-top: 10px;"
Text='<%#Services.TextService.Localize("moveOrCopy/noNodeSelected")%>' />
<div style="padding-top: 10px;" class="guiDialogNormal">
<input type="button" id="ok" value="<%=umbraco.ui.Text("ok")%>" onclick="onNodeSelectionConfirmed();"
<input type="button" id="ok" value="<%=Services.TextService.Localize("ok")%>" onclick="onNodeSelectionConfirmed();"
disabled="true" style="width: 100px" />
&nbsp; <em>
<%= umbraco.ui.Text("or") %></em>&nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
<%=umbraco.ui.Text("cancel")%></a>
<%= Services.TextService.Localize("or") %></em>&nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
<%=Services.TextService.Localize("cancel")%></a>
</div>
</asp:Panel>
<cc1:Pane ID="pane_chooseName" Visible="false" runat="server">

6
src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
View File

@@ -30,7 +30,7 @@
}
function updateStatusLabel(retVal) {
jQuery('#statusLabel').html("<strong>" + retVal + " <%=umbraco.ui.Text("remaining")%></strong>");
jQuery('#statusLabel').html("<strong>" + retVal + " <%=Services.TextService.Localize("remaining")%></strong>");
if (retVal != '' && retVal != '0') {
setTimeout('updateStatus();', 500);
@@ -74,9 +74,9 @@
<br />
<div id="buttons">
<input type="button" ID="ok" value="<%=Services.TextService.Localize("actions/emptyTrashcan") %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />
<em><%= umbraco.ui.Text("or") %></em>
<em><%= Services.TextService.Localize("or") %></em>
<a href="#" onclick="UmbClientMgr.closeModalWindow();">
<%=umbraco.ui.Text("cancel")%>
<%=Services.TextService.Localize("cancel")%>
</a>
</div>
</div>

8
src/Umbraco.Web.UI/umbraco/dialogs/importDocumenttype.aspx
View File

@@ -12,7 +12,7 @@
<asp:Panel ID="Wizard" runat="server" Visible="True">
<p>
<span class="guiDialogNormal">
<%=umbraco.ui.Text("importDocumentTypeHelp")%>
<%=Services.TextService.Localize("importDocumentTypeHelp")%>
</span>
</p>
@@ -21,18 +21,18 @@
</p>
<asp:Button ID="submit" runat="server"></asp:Button> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
<asp:Button ID="submit" runat="server"></asp:Button> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
</asp:Panel>
<asp:Panel ID="Confirm" runat="server" Visible="False">
<strong>
<%=umbraco.ui.Text("name")%>
<%=Services.TextService.Localize("name")%>
:</strong>
<asp:Literal ID="dtName" runat="server"></asp:Literal>
<br />
<strong>
<%=umbraco.ui.Text("alias")%>
<%=Services.TextService.Localize("alias")%>
:</strong>
<asp:Literal ID="dtAlias" runat="server"></asp:Literal>
<br />

2
src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx
View File

@@ -27,6 +27,6 @@
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
<input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
<input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />
</cc1:Pane>
</asp:Content>

2
src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx
View File

@@ -31,6 +31,6 @@
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
<input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
<input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />
</cc1:Pane>
</asp:Content>

4
src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx
View File

@@ -284,7 +284,7 @@ function insertTable()
</TR></FORM>
</TABLE>
&nbsp;
<input type="button" class="guiInputButton" onClick="if (confirm('<%=umbraco.ui.Text("areyousure").Replace("'", "\\'")%>')) window.close();" value="<%=umbraco.ui.Text("cancel")%>"> &nbsp;
<input type="button" class="guiInputButton" onClick="insertTable()" value="<%=umbraco.ui.Text("insert")%>">
<input type="button" class="guiInputButton" onClick="if (confirm('<%=Services.TextService.Localize("areyousure").Replace("'", "\\'")%>')) window.close();" value="<%=Services.TextService.Localize("cancel")%>"> &nbsp;
<input type="button" class="guiInputButton" onClick="insertTable()" value="<%=Services.TextService.Localize("insert")%>">
</body>
</HTML>

6
src/Umbraco.Web.UI/umbraco/dialogs/mediaPicker.aspx
View File

@@ -87,11 +87,11 @@
</asp:Panel>
<br />
<p>
<input type="submit" value="<%# umbraco.ui.Text("treepicker")%>" style="width: 60px;
<input type="submit" value="<%# Services.TextService.Localize("treepicker")%>" style="width: 60px;
color: gray" disabled="disabled" id="submitbutton" />
<em id="orcopy">
<%# umbraco.ui.Text("or") %></em> <a href="javascript:cancel();" style="color: blue"
<%# Services.TextService.Localize("or") %></em> <a href="javascript:cancel();" style="color: blue"
id="cancelbutton">
<%#umbraco.ui.Text("cancel") %></a>
<%#Services.TextService.Localize("cancel") %></a>
</p>
</asp:Content>

8
src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
View File

@@ -116,7 +116,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button ID="bt_selectMode" runat="server" Text="select" CssClass="btn btn-primary" OnClick="selectMode" />
</div>
</asp:Panel>
@@ -156,7 +156,7 @@
<cc1:PropertyPanel runat="server" ID="pp_loginPage" CssClass="pa-select-pages">
<small class="umb-detail">
<%=umbraco.ui.Text("paLoginPageHelp")%>
<%=Services.TextService.Localize("paLoginPageHelp")%>
</small>
<div class="pa-choose-page">
<asp:PlaceHolder ID="ph_loginpage" runat="server" />
@@ -168,7 +168,7 @@
<cc1:PropertyPanel runat="server" ID="pp_errorPage" CssClass="pa-select-pages">
<small class="umb-detail">
<%=umbraco.ui.Text("paErrorPageHelp")%>
<%=Services.TextService.Localize("paErrorPageHelp")%>
</small>
<div class="pa-choose-page">
<asp:PlaceHolder ID="ph_errorpage" runat="server" />
@@ -180,7 +180,7 @@
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button ID="bt_protect" CssClass="btn btn-primary" runat="server" OnCommand="protect_Click"></asp:Button>
<asp:Button ID="bt_buttonRemoveProtection" CssClass="btn btn-danger" runat="server" Visible="False" OnClick="buttonRemoveProtection_Click" />
</div>

2
src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
View File

@@ -88,7 +88,7 @@
</ul>
</div>
<p>
<a href='#' class="btn" data-bind="click: closeDialog"><%=umbraco.ui.Text("closeThisWindow") %></a>
<a href='#' class="btn" data-bind="click: closeDialog"><%=Services.TextService.Localize("closeThisWindow") %></a>
</p>
</div>

2
src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
View File

@@ -19,7 +19,7 @@
</div>
<div id="buttons" class="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow();"><%=umbraco.ui.Text("cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow();"><%=Services.TextService.Localize("cancel")%></a>
<asp:Button ID="bt_go" cssclass="btn btn-primary" OnClick="go" OnClientClick="showProgress(document.getElementById('buttons'),'progress'); return true;" runat="server" Text="Republish" />
</div>

2
src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx
View File

@@ -30,7 +30,7 @@
<asp:Panel ID="pl_buttons" runat="server">
<p>
<asp:Button ID="doTranslation" runat="Server" OnClick="doTranslation_Click" />
&nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="#" onClick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
&nbsp; <em><%= Services.TextService.Localize("or") %></em> &nbsp;<a href="#" onClick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
</p>
</asp:Panel>
</asp:Content>

2
src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
View File

@@ -63,7 +63,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<a id="closeWindowButton" href="#" class="btn btn-link"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
<input id="submitButton" type="button" class="btn btn-primary" value="<%=umbraco.ui.Text("save") %>" />
<input id="submitButton" type="button" class="btn btn-primary" value="<%=Services.TextService.Localize("save") %>" />
</div>
<script type="text/javascript">

4
src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
View File

@@ -83,7 +83,7 @@
<cc1:PropertyPanel ID="pp_encode" runat="server">
<input type="radio" name="urlEncode" value=""/>
<%=umbraco.ui.Text("none")%>
<%=Services.TextService.Localize("none")%>
<input type="radio" name="urlEncode" value="url"/>
<%=Services.TextService.Localize("templateEditor/urlEncode")%>
<input type="radio" name="urlEncode" value="html"/>
@@ -132,7 +132,7 @@
<a id="cancelButton" href="#" class="btn btn-link">
<%=Services.TextService.Localize("general/cancel")%></a>
<input id="submitButton" type="button" name="gem" class="btn btn-primary" value="<%=umbraco.ui.Text("insert")%>" />
<input id="submitButton" type="button" name="gem" class="btn btn-primary" value="<%=Services.TextService.Localize("insert")%>" />
</div>
</div>

8
src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
View File

@@ -22,7 +22,7 @@
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=umbraco.ui.Text("action")%>&nbsp;&nbsp;
<%=Services.TextService.Localize("action")%>&nbsp;&nbsp;
</b>
</HeaderTemplate>
<ItemTemplate>
@@ -32,7 +32,7 @@
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=umbraco.ui.Text("user")%>
<%=Services.TextService.Localize("user")%>
</b>
</HeaderTemplate>
<ItemTemplate>
@@ -42,7 +42,7 @@
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=umbraco.ui.Text("date")%>
<%=Services.TextService.Localize("date")%>
</b>
</HeaderTemplate>
<ItemTemplate>
@@ -52,7 +52,7 @@
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=umbraco.ui.Text("comment")%>
<%=Services.TextService.Localize("comment")%>
</b>
</HeaderTemplate>
<ItemTemplate>

2
src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx
View File

@@ -13,7 +13,7 @@
<HeaderTemplate>
<table rules="rows" border="0" class="members_table">
<thead>
<tr><th><%= umbraco.ui.Text("name") %></th><th><%= umbraco.ui.Text("email") %></th><th><%= umbraco.ui.Text("login") %></th></tr>
<tr><th><%= Services.TextService.Localize("name") %></th><th><%= Services.TextService.Localize("email") %></th><th><%= Services.TextService.Localize("login") %></th></tr>
</thead>
<tbody>
</HeaderTemplate>

2
src/Umbraco.Web.UI/umbraco/members/ViewMembers.aspx
View File

@@ -9,7 +9,7 @@
<HeaderTemplate>
<table rules="rows" border="0" class="members_table">
<thead>
<tr><th><%= umbraco.ui.Text("name") %></th><th><%= umbraco.ui.Text("email") %></th><th colspan="2"><%= umbraco.ui.Text("login") %></th></tr>
<tr><th><%= Services.TextService.Localize("name") %></th><th><%= Services.TextService.Localize("email") %></th><th colspan="2"><%= Services.TextService.Localize("login") %></th></tr>
</thead>
<tbody>
</HeaderTemplate>

2
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx
View File

@@ -105,7 +105,7 @@
</div>
<p>
<asp:Button ID="bt_submit" runat="server" Text="Submit package" OnClick="submitPackage" /> &nbsp;<em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="editpackage.aspx?id=<%= Request.QueryString["id"] %>"><%= umbraco.ui.Text("cancel") %></a>
<asp:Button ID="bt_submit" runat="server" Text="Submit package" OnClick="submitPackage" /> &nbsp;<em><%= Services.TextService.Localize("or") %></em> &nbsp;<a href="editpackage.aspx?id=<%= Request.QueryString["id"] %>"><%= Services.TextService.Localize("cancel") %></a>
</p>
</asp:PlaceHolder>

2
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx
View File

@@ -38,7 +38,7 @@ div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font
</cc1:Pane>
<p>
<asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= umbraco.ui.Text("or") %></em> <a href="xsltInsertValueOf.aspx"><%= umbraco.ui.Text("cancel") %></a>
<asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= Services.TextService.Localize("or") %></em> <a href="xsltInsertValueOf.aspx"><%= Services.TextService.Localize("cancel") %></a>
</p>
</asp:Content>

2
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx
View File

@@ -56,6 +56,6 @@ body{margin: 0px; padding: 0px;}
</cc1:Pane>
<p>
<input type="button" value="Insert value" onclick="doSubmit();" /> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
<input type="button" value="Insert value" onclick="doSubmit();" /> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
</p>
</asp:Content>

6
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx
View File

@@ -2,12 +2,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>umbraco - <%=umbraco.ui.Text("editContentSendToPublish")%></title>
<title>umbraco - <%=Services.TextService.Localize("editContentSendToPublish")%></title>
<link href="../css/umbracoGui.css" type="text/css" rel="stylesheet"/>
</head>
<body style="padding: 10px;">
<h3><img src="../images/publish.gif" alt="Republish" align="absmiddle" style="float:left; margin-top: 3px; margin-right: 5px"/> <%=umbraco.ui.Text("editContentSendToPublishText")%></h3>
<h3><img src="../images/publish.gif" alt="Republish" align="absmiddle" style="float:left; margin-top: 3px; margin-right: 5px"/> <%=Services.TextService.Localize("editContentSendToPublishText")%></h3>
<br/>
<a href="#" onclick="javascript:UmbClientMgr.closeModalWindow();" style="margin-left: 30px" class="guiDialogNormal"><%=umbraco.ui.Text("closewindow")%></a>
<a href="#" onclick="javascript:UmbClientMgr.closeModalWindow();" style="margin-left: 30px" class="guiDialogNormal"><%=Services.TextService.Localize("closewindow")%></a>
</body>
</html>

8
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx
View File

@@ -12,7 +12,7 @@
<asp:Panel ID="Wizard" runat="server" Visible="True">
<p>
<span class="guiDialogNormal">
<%=umbraco.ui.Text("importDocumentTypeHelp")%>
<%=Services.TextService.Localize("importDocumentTypeHelp")%>
</span>
</p>
@@ -21,18 +21,18 @@
</p>
<asp:Button ID="submit" runat="server"></asp:Button> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
<asp:Button ID="submit" runat="server"></asp:Button> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
</asp:Panel>
<asp:Panel ID="Confirm" runat="server" Visible="False">
<strong>
<%=umbraco.ui.Text("name")%>
<%=Services.TextService.Localize("name")%>
:</strong>
<asp:Literal ID="dtName" runat="server"></asp:Literal>
<br />
<strong>
<%=umbraco.ui.Text("alias")%>
<%=Services.TextService.Localize("alias")%>
:</strong>
<asp:Literal ID="dtAlias" runat="server"></asp:Literal>
<br />

2
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
View File

@@ -27,6 +27,6 @@
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=Services.TextService.Localize("general/cancel")%></a>
<input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
<input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />
</cc1:Pane>
</asp:Content>

2
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx
View File

@@ -29,6 +29,6 @@
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
<input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
<input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />
</cc1:Pane>
</asp:Content>

4
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
View File

@@ -20,8 +20,8 @@
<div id="buttons">
<asp:Button ID="bt_go" OnClick="go" OnClientClick="showProgress(document.getElementById('buttons'),'progress'); return true;" runat="server" Text="Republish" />
<em><%= umbraco.ui.Text("or") %></em>
<a href="#" onclick="UmbClientMgr.closeModalWindow();"><%=umbraco.ui.Text("cancel")%></a>
<em><%= Services.TextService.Localize("or") %></em>
<a href="#" onclick="UmbClientMgr.closeModalWindow();"><%=Services.TextService.Localize("cancel")%></a>
</div>
<div id="progress" style="visibility: hidden;">

2
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx
View File

@@ -30,7 +30,7 @@
<asp:Panel ID="pl_buttons" runat="server">
<p>
<asp:Button ID="doTranslation" runat="Server" OnClick="doTranslation_Click" />
&nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="#" onClick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
&nbsp; <em><%= Services.TextService.Localize("or") %></em> &nbsp;<a href="#" onClick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
</p>
</asp:Panel>
</asp:Content>

8
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
View File

@@ -22,7 +22,7 @@
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=umbraco.ui.Text("action")%>&nbsp;&nbsp;
<%=Services.TextService.Localize("action")%>&nbsp;&nbsp;
</b>
</HeaderTemplate>
<ItemTemplate>
@@ -32,7 +32,7 @@
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=umbraco.ui.Text("user")%>
<%=Services.TextService.Localize("user")%>
</b>
</HeaderTemplate>
<ItemTemplate>
@@ -42,7 +42,7 @@
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=umbraco.ui.Text("date")%>
<%=Services.TextService.Localize("date")%>
</b>
</HeaderTemplate>
<ItemTemplate>
@@ -52,7 +52,7 @@
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=umbraco.ui.Text("comment")%>
<%=Services.TextService.Localize("comment")%>
</b>
</HeaderTemplate>
<ItemTemplate>

2
src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx
View File

@@ -13,7 +13,7 @@
<HeaderTemplate>
<table rules="rows" border="0" class="members_table">
<thead>
<tr><th><%= umbraco.ui.Text("name") %></th><th><%= umbraco.ui.Text("email") %></th><th><%= umbraco.ui.Text("login") %></th></tr>
<tr><th><%= Services.TextService.Localize("name") %></th><th><%= Services.TextService.Localize("email") %></th><th><%= Services.TextService.Localize("login") %></th></tr>
</thead>
<tbody>
</HeaderTemplate>

2
src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx
View File

@@ -9,7 +9,7 @@
<HeaderTemplate>
<table rules="rows" border="0" class="members_table">
<thead>
<tr><th><%= umbraco.ui.Text("name") %></th><th><%= umbraco.ui.Text("email") %></th><th colspan="2"><%= umbraco.ui.Text("login") %></th></tr>
<tr><th><%= Services.TextService.Localize("name") %></th><th><%= Services.TextService.Localize("email") %></th><th colspan="2"><%= Services.TextService.Localize("login") %></th></tr>
</thead>
<tbody>
</HeaderTemplate>