diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master index 6d5d89e4ab..4b7150938e 100644 --- a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master +++ b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master @@ -24,7 +24,7 @@ - +
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx index 075f015439..d09d4189b3 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx @@ -1,19 +1,18 @@ <%@ Control Language="c#" AutoEventWireup="True" Codebehind="simple.ascx.cs" Inherits="umbraco.cms.presentation.create.controls.simple" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %> - +<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> + + + * + + +
+ <%=umbraco.ui.Text("cancel")%> + +
-
<%=umbraco.ui.Text("name")%>:*
- -
- -
- -   <%= umbraco.ui.Text("or") %>   - <%=umbraco.ui.Text("cancel")%> -
+ \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs index 7a8798b4c0..f32f8dada5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs @@ -20,6 +20,8 @@ namespace umbraco.cms.presentation.create.controls protected void Page_Load(object sender, System.EventArgs e) { sbmt.Text = ui.Text("create"); + rename.Text = ui.Text("name"); + // Put user code to initialize the page here } @@ -63,8 +65,6 @@ namespace umbraco.cms.presentation.create.controls .ChangeContentFrameUrl(returnUrl) .ChildNodeCreated() .CloseModalWindow(); - - } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.designer.cs index d7ea9b2a53..f4bb903739 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.designer.cs @@ -12,15 +12,6 @@ namespace umbraco.cms.presentation.create.controls { public partial class simple { - /// - /// RequiredFieldValidator1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1; - /// /// rename control. /// @@ -31,13 +22,13 @@ namespace umbraco.cms.presentation.create.controls { protected global::System.Web.UI.WebControls.TextBox rename; /// - /// Textbox1 control. + /// RequiredFieldValidator1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox Textbox1; + protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1; /// /// sbmt control. @@ -47,5 +38,14 @@ namespace umbraco.cms.presentation.create.controls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button sbmt; + + /// + /// Textbox1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Textbox1; } }