Merge branch '1.x' of https://git01.codeplex.com/orchard into 1.x

src/Orchard.Web/Modules/Orchard.DynamicForms/AdminMenu.cs

@@ -7,7 +7,7 @@ namespace Orchard.DynamicForms {
         public void GetNavigation(NavigationBuilder builder) {
             builder
                 .AddImageSet("dynamicforms")
-                .Add(T("Dynamic Forms"), "4", menu => menu
+                .Add(T("Form Submissions"), "8", menu => menu
                     .Add(T("Manage Forms"), "1.0",
                         item => item
                             .Action("Index", "Admin", new { area = "Orchard.DynamicForms" })

src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/FormDriver.cs

@@ -10,6 +10,7 @@ using Orchard.DynamicForms.Services;
 using Orchard.Forms.Services;
 using Orchard.Layouts.Framework.Display;
 using Orchard.Layouts.Framework.Drivers;
+using Orchard.Layouts.Framework.Elements;
 using Orchard.Layouts.Helpers;
 using Orchard.Layouts.Services;
 
@@ -47,6 +48,7 @@ namespace Orchard.DynamicForms.Drivers {
                         Id: "FormName",
                         Name: "FormName",
                         Title: "Name",
+                        Value: "Untitled",
                         Classes: new[] { "text", "medium" },
                         Description: T("The name of the form.")),
                     _FormAction: shape.Textbox(

src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Form.cs

@@ -8,7 +8,7 @@ namespace Orchard.DynamicForms.Elements {
         }
 
         public string Name {
-            get { return State.Get("FormName"); }
+            get { return State.Get("FormName", "Untitled"); }
             set { State["FormName"] = value; }
         }
 

src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/menu.dynamicforms-admin.css

@@ -1,7 +1,7 @@
-.navicon-dynamic-forms {
+.navicon-form-submissions {
     background-image: url(menu.dynamicforms.png) !important;
 }
 
-    .navicon-dynamic-forms:hover {
+    .navicon-form-submissions:hover {
         background-position: 0 -30px !important;
     }

src/Orchard.Web/Modules/Orchard.Layouts/AdminMenu.cs

@@ -8,8 +8,9 @@ namespace Orchard.Layouts {
         public string MenuName { get { return "admin"; } }
 
         public void GetNavigation(NavigationBuilder builder) {
-
-            builder.Add(T("Elements"), "1.4.5", menu => menu.Action("Index", "BlueprintAdmin", new { area = "Orchard.Layouts" }));
+            builder
+                .AddImageSet("layouts")
+                .Add(T("Elements"), "8.5", menu => menu.Action("Index", "BlueprintAdmin", new { area = "Orchard.Layouts" }));
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ContentItemDriver.cs

@@ -27,8 +27,9 @@ namespace Orchard.Layouts.Drivers {
 
             var contentItemIds = element.ContentItemIds;
             var displayType = element.DisplayType;
+            var layoutContentId = layoutPart != null ? layoutPart.Id : 0;
 
-            viewModel.ContentItems = GetContentItems(RemoveCurrentContentItemId(contentItemIds, layoutPart.Id)).ToArray();
+            viewModel.ContentItems = GetContentItems(RemoveCurrentContentItemId(contentItemIds, layoutContentId)).ToArray();
             viewModel.DisplayType = displayType;
 
             return Editor(context, editor);

src/Orchard.Web/Modules/Orchard.Layouts/Helpers/ElementStateHelper.cs

@@ -10,7 +10,7 @@ namespace Orchard.Layouts.Helpers {
         private static readonly string[] _elementStateBlackList = {"ElementState", "__RequestVerificationToken"};
 
         public static string Get(this StateDictionary state, string key, string defaultValue = null) {
-            return state == null ? null : state.ContainsKey(key) ? state[key] : null;
+            return state != null ? state.ContainsKey(key) ? state[key] : defaultValue : defaultValue;
         }
 
         public static string Serialize(this StateDictionary state) {

src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj

@@ -24,10 +24,14 @@
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -91,6 +95,8 @@
     <Content Include="Scripts\serializer.js" />
     <Content Include="Scripts\dialog.js" />
     <Content Include="Scripts\designer.canvas.js" />
+    <Content Include="Styles\menu.layouts-admin.css" />
+    <Content Include="Styles\menu.elements.png" />
     <Content Include="Styles\parts-layout-edit.css" />
     <Content Include="Styles\element-editor.css" />
     <Content Include="Styles\element-browser.css" />

src/Orchard.Web/Modules/Orchard.Layouts/Styles/menu.layouts-admin.css

@@ -0,0 +1,7 @@
+.navicon-elements {
+    background-image: url(menu.elements.png) !important;
+}
+
+    .navicon-elements:hover {
+        background-position: 0 -30px !important;
+    }