diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.html index 65412d27cd..7cc1bffcb2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.html @@ -1,8 +1,15 @@
-
- - - +
+
+

+ Are you sure you want to delete {{currentNode.name}} ? +

+ +
+ + +
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-confirm.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-confirm.html index d9f4f18e53..504122012a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-confirm.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-confirm.html @@ -1,6 +1,10 @@

{{caption}}

- Cancel - Ok +
+
+ Cancel + Ok +
+
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx index 3ebd86181d..86a703c753 100644 --- a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx +++ b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx @@ -3,8 +3,6 @@ <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> - - @@ -26,5 +24,5 @@ <%=umbraco.ui.Text("cancel")%> - + diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx index d2c72fef2a..b42ec52761 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx @@ -1,18 +1,7 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoDialog.Master"%> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> - - - - - - - - - @@ -27,6 +16,7 @@ + @@ -35,10 +25,8 @@ - <% ///* */ %> - - + @@ -51,12 +39,12 @@ -
- - or - Cancel -
+ + + + <%=umbraco.ui.Text("cancel")%> + + -
- + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx index 6bf030b86d..8e1e804702 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx @@ -14,19 +14,18 @@ -
+

<%= umbraco.ui.Text("defaultdialogs", "siterepublishHelp")%>

-
+
-
- - <%= umbraco.ui.Text("or") %> - <%=umbraco.ui.Text("cancel")%> -
+ -
@@ -35,6 +34,6 @@

<%= umbraco.ui.Text("defaultdialogs", "siterepublished")%>

- + \ No newline at end of file