Bringing back the Feature management's view switcher

--HG--
branch : dev

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" />

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");
         }
     }
 }

src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml

@@ -1,5 +0,0 @@
-@{
-    Style.Require("Switchable");
-    Script.Require("Switchable");
-}
-@string.Format("{0} switchable", Model)

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"));

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