diff --git a/umbraco.sln b/umbraco.sln
index 8cd1074760..65c5457eb2 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -3,7 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0242771-6DE6-4E03-BD3A-7B79BA79105B}"
ProjectSection(SolutionItems) = preProject
build.xml = build.xml
- foreign dlls\ClientDependency.Core.dll = foreign dlls\ClientDependency.Core.dll
foreign dlls\CookComputing.XmlRpcV2.dll = foreign dlls\CookComputing.XmlRpcV2.dll
default.build = default.build
foreign dlls\IronMath.dll = foreign dlls\IronMath.dll
diff --git a/umbraco/presentation/umbraco/config/create/UI.xml b/umbraco/presentation/umbraco/config/create/UI.xml
index 9d87702362..83465b8e56 100644
--- a/umbraco/presentation/umbraco/config/create/UI.xml
+++ b/umbraco/presentation/umbraco/config/create/UI.xml
@@ -249,30 +249,30 @@
-
-
- /create/DLRScripting.ascx
-
-
-
-
-
-
-
- /create/DLRScripting.ascx
-
-
-
-
-
-
-
- /create/DLRScripting.ascx
-
-
-
-
-
+
+
+ /create/DLRScripting.ascx
+
+
+
+
+
+
+
+ /create/DLRScripting.ascx
+
+
+
+
+
+
+
+ /create/DLRScripting.ascx
+
+
+
+
+
/create/script.ascx
@@ -295,7 +295,7 @@
-
+
/create/simple.ascx
@@ -303,6 +303,13 @@
+
+
+ /create/simple.ascx
+
+
+
+
/create/simple.ascx
@@ -325,5 +332,5 @@
-
+
diff --git a/umbraco/presentation/umbraco/create.aspx.cs b/umbraco/presentation/umbraco/create.aspx.cs
index 8dfdfd3ee0..764428c664 100644
--- a/umbraco/presentation/umbraco/create.aspx.cs
+++ b/umbraco/presentation/umbraco/create.aspx.cs
@@ -15,56 +15,63 @@ using umbraco.IO;
namespace umbraco.cms.presentation
{
- ///
- /// Summary description for create.
- ///
- public partial class Create : BasePages.UmbracoEnsuredPage
- {
- protected umbWindow createWindow;
- protected System.Web.UI.WebControls.Label helpText;
- protected System.Web.UI.WebControls.TextBox rename;
- protected System.Web.UI.WebControls.Label Label1;
- protected System.Web.UI.WebControls.ListBox nodeType;
-
- protected void Page_Load(object sender, System.EventArgs e)
- {
- // Load create definitions
- try
- {
- XmlDocument createDef = new XmlDocument();
- XmlTextReader defReader = new XmlTextReader( IOHelper.MapPath(SystemFiles.CreateUiXml ) );
- createDef.Load(defReader);
- defReader.Close();
+ ///
+ /// Summary description for create.
+ ///
+ public partial class Create : BasePages.UmbracoEnsuredPage
+ {
+ protected umbWindow createWindow;
+ protected System.Web.UI.WebControls.Label helpText;
+ protected System.Web.UI.WebControls.TextBox rename;
+ protected System.Web.UI.WebControls.Label Label1;
+ protected System.Web.UI.WebControls.ListBox nodeType;
- // Find definition for current nodeType
- XmlNode def = createDef.SelectSingleNode("//nodeType [@alias = '" + Request.QueryString["nodeType"] + "']");
- //title.Text = ui.Text("create") + " " + ui.Text(def.SelectSingleNode("./header").FirstChild.Value.ToLower(), base.getUser());
- //headerTitle.Text = title.Text;
- UI.Controls.Add(new UserControl().LoadControl( SystemDirectories.Umbraco + def.SelectSingleNode("./usercontrol").FirstChild.Value));
- }
- catch (Exception ex) {
- throw new ArgumentException("ERROR CREATING CONTROL FOR NODETYPE: " + Request.QueryString["nodeType"], ex);
- }
- }
+ protected void Page_Load(object sender, System.EventArgs e)
+ {
+ // Load create definitions
+ string nodeType = Request.QueryString["nodeType"];
- #region Web Form Designer generated code
- override protected void OnInit(EventArgs e)
- {
- //
- // CODEGEN: This call is required by the ASP.NET Web Form Designer.
- //
- InitializeComponent();
- base.OnInit(e);
- }
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
+ XmlDocument createDef = new XmlDocument();
+ XmlTextReader defReader = new XmlTextReader(IOHelper.MapPath(SystemFiles.CreateUiXml));
+ createDef.Load(defReader);
+ defReader.Close();
- }
- #endregion
- }
+ // Find definition for current nodeType
+ XmlNode def = createDef.SelectSingleNode("//nodeType [@alias = '" + nodeType + "']");
+ if (def == null)
+ {
+ throw new ArgumentException("The create dialog for \"" + nodeType + "\" does not match anything defined in the \"" + SystemFiles.CreateUiXml + "\". This could mean an incorrectly installed package or a corrupt UI file");
+ }
+ //title.Text = ui.Text("create") + " " + ui.Text(def.SelectSingleNode("./header").FirstChild.Value.ToLower(), base.getUser());
+ try
+ {
+ //headerTitle.Text = title.Text;
+ UI.Controls.Add(new UserControl().LoadControl(SystemDirectories.Umbraco + def.SelectSingleNode("./usercontrol").FirstChild.Value));
+ }
+ catch (Exception ex)
+ {
+ throw new ArgumentException("ERROR CREATING CONTROL FOR NODETYPE: " + nodeType, ex);
+ }
+ }
+
+ #region Web Form Designer generated code
+ override protected void OnInit(EventArgs e)
+ {
+ //
+ // CODEGEN: This call is required by the ASP.NET Web Form Designer.
+ //
+ InitializeComponent();
+ base.OnInit(e);
+ }
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+
+ }
+ #endregion
+ }
}