From b73e125ab47a6d5e33fe3b5f496183784023a4f4 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Wed, 3 Nov 2010 23:03:34 -0700
Subject: [PATCH] Bringing back the Feature management's view switcher

--HG--
branch : dev
---
 src/Orchard.Web/Core/Orchard.Core.csproj                 | 1 -
 src/Orchard.Web/Core/Shapes/ResourceManifest.cs          | 9 +++++----
 src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml   | 5 -----
 .../Modules/Orchard.Modules/Views/Admin/Features.cshtml  | 5 +++--
 .../Modules/Orchard.Themes/ResourceManifest.cs           | 3 ---
 5 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml

diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index f74e81b86..7c5f82b34 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -298,7 +298,6 @@
     <Content Include="Shapes\Views\HeadPreload.cshtml" />
     <Content Include="Shapes\Views\Message.cshtml" />
     <Content Include="Shapes\Views\NotFound.cshtml" />
-    <Content Include="Shapes\Views\UI\Switchable.cshtml" />
     <Content Include="Web.config" />
     <Content Include="XmlRpc\Module.txt" />
     <Content Include="Settings\Views\EditorTemplates\Parts\Settings.SiteSettingsPart.cshtml" />
diff --git a/src/Orchard.Web/Core/Shapes/ResourceManifest.cs b/src/Orchard.Web/Core/Shapes/ResourceManifest.cs
index cb6505345..656acaf5c 100644
--- a/src/Orchard.Web/Core/Shapes/ResourceManifest.cs
+++ b/src/Orchard.Web/Core/Shapes/ResourceManifest.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Orchard.UI.Resources;
 
 namespace Orchard.Core.Shapes {
@@ -11,6 +7,11 @@ namespace Orchard.Core.Shapes {
             manifest.DefineScript("ShapesBase").SetUrl("base.js").SetDependencies("jQuery");
             manifest.DefineStyle("Shapes").SetUrl("site.css"); // todo: missing
             manifest.DefineStyle("ShapesSpecial").SetUrl("special.css");
+
+            manifest.DefineScript("Switchable").SetUrl("jquery.switchable.js")
+                .SetDependencies("jQuery")
+                .SetDependencies("ShapesBase");
+            manifest.DefineStyle("Switchable").SetUrl("jquery.switchable.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml b/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml
deleted file mode 100644
index 8f3d5b92c..000000000
--- a/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-@{
-    Style.Require("Switchable");
-    Script.Require("Switchable");
-}
-@string.Format("{0} switchable", Model)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
index 673f34b24..839aa448d 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
@@ -4,14 +4,15 @@
 @using Orchard.Modules.ViewModels;
 @using Orchard.Utility.Extensions;
 @using Orchard.Modules.Models;
-
 @{
     Style.Require("ModulesAdmin");
+    Style.Require("Switchable");
+    Script.Require("Switchable");
 }
 
 <h1>@Html.TitleForPage(T("Manage Features").ToString())</h1>
 @if (Model.Features.Count() > 0) {
-<ul class="features summary-view">@{
+<ul class="features summary-view switchable">@{
     var featureGroups = Model.Features.OrderBy(f => f.Descriptor.Category, new DoghouseComparer("Core")).GroupBy(f => f.Descriptor.Category);
     foreach (var featureGroup in featureGroups) {
         var categoryName = LocalizedString.TextOrDefault(featureGroup.First().Descriptor.Category, T("Uncategorized"));
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
index 720cd4688..884143c24 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
@@ -6,9 +6,6 @@ namespace Orchard.Themes {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
             manifest.DefineStyle("ThemesAdmin").SetUrl("admin.css");
-            // todo: used by core\shapes -- move it?
-            manifest.DefineScript("Switchable").SetUrl("jquery.switchable.js").SetDependencies("jQuery");
-            manifest.DefineStyle("Switchable").SetUrl("jquery.switchable.css");
 
             // todo: include and define the min.js version too
             // todo: move EasySlider to common location, although it does not appear to be used anywhere right now