From b572c2780401e749de19142ced6325dcaabda8f8 Mon Sep 17 00:00:00 2001
From: Louis DeJardin <Louis.DeJardin@microsoft.com>
Date: Tue, 19 Oct 2010 15:56:02 -0700
Subject: [PATCH 1/3] Adding a disabled layer

For convenience, so widgets can be moved to disabled rather than deleted

--HG--
branch : dev
extra : rebase_source : 36d5a75b58182c593ec690a015d77296c7ca02c0
---
 src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
index c763dcbb7..9366e4e86 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
@@ -23,6 +23,8 @@ namespace Orchard.Widgets {
             _contentManager.Publish(authenticatedLayer.ContentItem);
             IContent anonymousLayer = _contentManager.Create<LayerPart>("Layer", t => { t.Record.Name = "Anonymous"; t.Record.LayerRule = "not authenticated"; });
             _contentManager.Publish(anonymousLayer.ContentItem);
+            IContent disabledLayer = _contentManager.Create<LayerPart>("Layer", t => { t.Record.Name = "Disabled"; t.Record.LayerRule = "false"; });
+            _contentManager.Publish(disabledLayer.ContentItem);
         }
     }
 

From fd2efe23e7a06221396fbbe7a753b554e6993e34 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Tue, 19 Oct 2010 16:17:59 -0700
Subject: [PATCH 2/3] Fixing zone and menu shapes' class names

--HG--
branch : dev
---
 src/Orchard.Web/Core/Shapes/CoreShapes.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Core/Shapes/CoreShapes.cs b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
index 7fa145711..aa9af9be7 100644
--- a/src/Orchard.Web/Core/Shapes/CoreShapes.cs
+++ b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
@@ -12,6 +12,7 @@ using Orchard.Settings;
 using Orchard.UI;
 using Orchard.UI.Resources;
 using Orchard.UI.Zones;
+using Orchard.Utility.Extensions;
 
 // ReSharper disable InconsistentNaming
 
@@ -51,17 +52,19 @@ namespace Orchard.Core.Shapes {
                 .OnCreating(creating => creating.BaseType = typeof(Zone))
                 .OnDisplaying(displaying => {
                     var zone = displaying.Shape;
-                    zone.Classes.Add("zone-" + zone.ZoneName.HtmlClassify());
+                    string zoneName = zone.ZoneName;
+                    zone.Classes.Add("zone-" + zoneName.HtmlClassify());
                     zone.Classes.Add("zone");
-                    zone.Metadata.Alternates.Add("Zone__" + zone.ZoneName);
+                    zone.Metadata.Alternates.Add("Zone__" + zoneName);
                 });
 
             builder.Describe("Menu")
                 .OnDisplaying(displaying => {
                     var menu = displaying.Shape;
-                    menu.Classes.Add("menu-" + menu.MenuName.HtmlClassify());
+                    string menuName = menu.MenuName;
+                    menu.Classes.Add("menu-" + menuName.HtmlClassify());
                     menu.Classes.Add("menu");
-                    menu.Metadata.Alternates.Add("Menu__" + menu.MenuName);
+                    menu.Metadata.Alternates.Add("Menu__" + menuName);
                 });
 
             builder.Describe("MenuItem")

From 8f17aa9d567fcef3a7d6d85455b295c20d68523c Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Tue, 19 Oct 2010 16:20:00 -0700
Subject: [PATCH 3/3] Removing an empty folder reference

--HG--
branch : dev
---
 src/Orchard.Web/Themes/Themes.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj
index 40f645e0d..53a1759f2 100644
--- a/src/Orchard.Web/Themes/Themes.csproj
+++ b/src/Orchard.Web/Themes/Themes.csproj
@@ -97,7 +97,6 @@
     <Content Include="TheThemeMachine\Views\Layout.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="TheThemeMachine\Views\Fields\" />
     <Folder Include="TheThemeMachine\Views\Parts\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />