From fb5e998e1f1a25c61a9f19e6b4ed108cf48af970 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 15 Mar 2016 16:39:17 +0100 Subject: [PATCH] remore ui replacements --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 1 - src/Umbraco.Web.UI/umbraco/create/User.ascx | 8 +- .../umbraco/dialogs/create.aspx | 2 +- .../umbraco/dialogs/editMacro.aspx | 6 +- .../umbraco/dialogs/emptyTrashcan.aspx | 2 +- .../dialogs/insertMasterpageContent.aspx | 2 +- .../dialogs/insertMasterpagePlaceholder.aspx | 2 +- .../umbraco/dialogs/insertTable.aspx | 290 ------------------ .../umbraco/dialogs/moveOrCopy.aspx | 4 +- .../umbraco/dialogs/protectPage.aspx | 12 +- .../umbraco/dialogs/publish.aspx | 4 +- src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx | 2 +- .../umbraco/members/EditMemberGroup.aspx | 2 +- .../umbraco/users/NodePermissions.ascx | 2 +- src/Umbraco.Web/LegacyActions/Action.cs | 3 +- .../Models/Mapping/SectionModelMapper.cs | 6 +- .../Routing/UrlProviderExtensions.cs | 8 +- .../Trees/ApplicationTreeController.cs | 2 +- .../Trees/ContentTreeController.cs | 2 +- .../umbraco/users/NodePermissions.ascx.cs | 3 +- .../businesslogic/workflow/Notification.cs | 10 +- 21 files changed, 45 insertions(+), 328 deletions(-) delete mode 100644 src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index c6ee89aa3e..a5438a47b0 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -860,7 +860,6 @@ - diff --git a/src/Umbraco.Web.UI/umbraco/create/User.ascx b/src/Umbraco.Web.UI/umbraco/create/User.ascx index 4f776bb02f..7fe65fe391 100644 --- a/src/Umbraco.Web.UI/umbraco/create/User.ascx +++ b/src/Umbraco.Web.UI/umbraco/create/User.ascx @@ -4,10 +4,10 @@

Login Name: *
@@ -15,10 +15,10 @@

E-mail: * ', id, updateName); } else - pageName.html("

<%=umbraco.ui.Text(App)%> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>

"); + pageName.html("

<%=Services.TextService.Localize(App)%> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>

"); pageNameHolder.attr("class","success"); } diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx index c9225ac7c1..92ba41a46b 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx @@ -39,8 +39,8 @@ - <%=umbraco.ui.Text("general", "cancel", this.getUser())%> - " /> + <%=Services.TextService.Localize("general/cancel")%> + " /> @@ -66,7 +66,7 @@ - <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + <%=Services.TextService.Localize("general/cancel")%> diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx index 86ae240117..31451e7a25 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx @@ -66,7 +66,7 @@

<%= Services.TextService.Localize("defaultdialogs/recycleBinWarning")%>

- +
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx index 349c4b542d..67482d3a7a 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx @@ -26,7 +26,7 @@ - <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + <%=Services.TextService.Localize("general/cancel")%> " /> \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx index fea07fc474..6d10e6e62a 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx @@ -30,7 +30,7 @@ - <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + <%=Services.TextService.Localize("general/cancel")%> " /> \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx deleted file mode 100644 index 7d8c745564..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx +++ /dev/null @@ -1,290 +0,0 @@ -<%@ Page language="c#" Codebehind="insertTable.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.insertTable" %> - - - - Insert Table - - - - - - - - - -

<%=umbraco.ui.Text("defaultdialogs", "inserttable", this.getUser())%>

-
- <%=umbraco.ui.Text("general", "size", this.getUser())%> -
- - - - - - - - - - - - -
- <%=umbraco.ui.Text("defaultdialogs", "tableColumns", this.getUser())%> - - -
- <%=umbraco.ui.Text("defaultdialogs", "tableRows", this.getUser())%> - - -
-
- <%=umbraco.ui.Text("general", "layout", this.getUser())%> -
- - - - - - - - - - - - - - - - - - - - - -
- <%=umbraco.ui.Text("general", "justify", this.getUser())%> - - - <%=umbraco.ui.Text("general", "width", this.getUser())%> - - -
- <%=umbraco.ui.Text("general", "innerMargin", this.getUser())%> - - - <%=umbraco.ui.Text("general", "height", this.getUser())%> - - -
- <%=umbraco.ui.Text("general", "cellMargin", this.getUser())%> - - -   - -   -
-
- <%=umbraco.ui.Text("general", "design", this.getUser())%> -
- - - - - - - -
- <%=umbraco.ui.Text("general", "border", this.getUser())%> - - - - <%=umbraco.ui.Text("buttons", "styleChoose", this.getUser())%> - - -
-   - ')) window.close();" value="<%=Services.TextService.Localize("cancel")%>">   - "> - - diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx index e0cc68e011..24d91a8b08 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx @@ -16,9 +16,9 @@ if (id > 0) umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName); else{ - //document.getElementById("pageNameContent").innerHTML = "'<%=umbraco.ui.Text(Request.CleanForXss("app"))%>' <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>"; + //document.getElementById("pageNameContent").innerHTML = "'<%=Services.TextService.Localize(Request.CleanForXss("app"))%>' <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>"; - jQuery("#pageNameContent").html("<%=umbraco.ui.Text(Request.CleanForXss("app"))%> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>"); + jQuery("#pageNameContent").html("<%=Services.TextService.Localize(Request.CleanForXss("app"))%> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>"); jQuery("#pageNameHolder").attr("class","success"); } } diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx index 3205e90a8a..ce0241ede3 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx @@ -11,7 +11,7 @@ if (treePicker > 0) { umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateLoginTitle); } else - document.getElementById("loginTitle").innerHTML = "<%=umbraco.ui.Text("content", base.getUser())%>"; + document.getElementById("loginTitle").innerHTML = "<%=Services.TextService.Localize("content")%>"; } } @@ -26,7 +26,7 @@ if (treePicker > 0) { umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateErrorTitle); } else - document.getElementById("errorTitle").innerHTML = "<%=umbraco.ui.Text("content", base.getUser())%>"; + document.getElementById("errorTitle").innerHTML = "<%=Services.TextService.Localize("content")%>"; } } function updateErrorTitle(result) { @@ -91,8 +91,8 @@ @@ -101,8 +101,8 @@