From 2727dab5baaa441663cf0ddbff57428b4fd07f24 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Wed, 19 May 2010 10:02:47 -0700
Subject: [PATCH] Dropping the Common features dependency and messing with the
 UI a bit more

--HG--
branch : dev
---
 src/Orchard.Web/Core/Dashboard/Module.txt             |  1 -
 src/Orchard.Web/Core/Feeds/Module.txt                 |  1 -
 src/Orchard.Web/Core/HomePage/Module.txt              |  1 -
 src/Orchard.Web/Core/Navigation/Module.txt            |  1 -
 src/Orchard.Web/Core/Scheduling/Module.txt            |  1 -
 src/Orchard.Web/Core/Settings/Module.txt              |  1 -
 src/Orchard.Web/Core/XmlRpc/Module.txt                |  3 +--
 src/Orchard.Web/Modules/Futures.Widgets/Module.txt    |  1 -
 src/Orchard.Web/Modules/Orchard.Blogs/Module.txt      |  2 +-
 src/Orchard.Web/Modules/Orchard.Comments/Module.txt   |  1 -
 src/Orchard.Web/Modules/Orchard.DevTools/Module.txt   |  1 -
 src/Orchard.Web/Modules/Orchard.Media/Module.txt      |  1 -
 src/Orchard.Web/Modules/Orchard.Modules/Module.txt    |  1 -
 .../Modules/Orchard.Modules/Views/Admin/Features.ascx | 11 ++++++++---
 .../Modules/Orchard.Modules/styles/admin.css          |  6 +++---
 .../Modules/Orchard.MultiTenancy/Module.txt           |  3 +--
 src/Orchard.Web/Modules/Orchard.Pages/Module.txt      |  1 -
 src/Orchard.Web/Modules/Orchard.Roles/Module.txt      |  1 -
 src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt    |  1 -
 src/Orchard.Web/Modules/Orchard.Setup/Module.txt      |  1 -
 src/Orchard.Web/Modules/Orchard.Tags/Module.txt       |  1 -
 src/Orchard.Web/Modules/Orchard.Themes/Module.txt     |  1 -
 src/Orchard.Web/Modules/Orchard.Users/Module.txt      |  1 -
 23 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/Orchard.Web/Core/Dashboard/Module.txt b/src/Orchard.Web/Core/Dashboard/Module.txt
index e646ae5c2..1fb19522a 100644
--- a/src/Orchard.Web/Core/Dashboard/Module.txt
+++ b/src/Orchard.Web/Core/Dashboard/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Dashboard:
         Description: Standard admin dashboard.
-        Dependencies: Common
         Category: Core
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Feeds/Module.txt b/src/Orchard.Web/Core/Feeds/Module.txt
index 1b2ba39c1..eb1f5b157 100644
--- a/src/Orchard.Web/Core/Feeds/Module.txt
+++ b/src/Orchard.Web/Core/Feeds/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Feeds:
         Description: RSS feeds for content items.
-        Dependencies: Common
         Category: Syndication
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/HomePage/Module.txt b/src/Orchard.Web/Core/HomePage/Module.txt
index b4a95af7e..63404f28d 100644
--- a/src/Orchard.Web/Core/HomePage/Module.txt
+++ b/src/Orchard.Web/Core/HomePage/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     HomePage:
         Description: Standard site home page that allows a specified content type or container to *be* the home page.
-        Dependencies: Common
         Category: Core
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Navigation/Module.txt b/src/Orchard.Web/Core/Navigation/Module.txt
index adbfd4438..31ec9b758 100644
--- a/src/Orchard.Web/Core/Navigation/Module.txt
+++ b/src/Orchard.Web/Core/Navigation/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Navigation:
         Description: Menu management.
-        Dependencies: Common
         Category: Core
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Scheduling/Module.txt b/src/Orchard.Web/Core/Scheduling/Module.txt
index 848b44124..e5026374d 100644
--- a/src/Orchard.Web/Core/Scheduling/Module.txt
+++ b/src/Orchard.Web/Core/Scheduling/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Scheduling:
         Description: Scheduled background tasks.
-        Dependencies: Common
         Category: Core
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Settings/Module.txt b/src/Orchard.Web/Core/Settings/Module.txt
index b5cd0527d..5e4f413c7 100644
--- a/src/Orchard.Web/Core/Settings/Module.txt
+++ b/src/Orchard.Web/Core/Settings/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Settings:
         Description: Site settings.
-        Dependencies: Common
         Category: Core
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/XmlRpc/Module.txt b/src/Orchard.Web/Core/XmlRpc/Module.txt
index 5db3d574c..ef43ff281 100644
--- a/src/Orchard.Web/Core/XmlRpc/Module.txt
+++ b/src/Orchard.Web/Core/XmlRpc/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     XmlRpc:
         Description: XML-RPC opt-in implementation.
-        Dependencies: Common
-        Category: Core
\ No newline at end of file
+        Category: Content Management
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Module.txt b/src/Orchard.Web/Modules/Futures.Widgets/Module.txt
index ccc415c58..827ac7017 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Module.txt
+++ b/src/Orchard.Web/Modules/Futures.Widgets/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Futures.Widgets:
         Description: Widgets container with simple inline content editing widget.
-        Dependencies: Common
         Category: Widget
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
index 52f596e33..5ba70c807 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
@@ -7,5 +7,5 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Blogs:
         Description: A simple web log.
-        Dependencies: Common, XmlRpc
+        Dependencies: XmlRpc
         Category: Content
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Module.txt b/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
index 37fe5a54a..d863f49bb 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Comments:
         Description: Standard content item comments.
-        Dependencies: Common
         Category: Social
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt b/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt
index 0d8dbccc9..9d886eed2 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.DevTools:
         Description: An assortment of debuging tools.
-        Dependencies: Common
         Category: Developer
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Module.txt b/src/Orchard.Web/Modules/Orchard.Media/Module.txt
index 4f96e9b36..7a2730d9a 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Media/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Media:
         Description: File system based media upload, storage and management.
-        Dependencies: Common
         Category: Media
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
index 8414688c6..d644877cf 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Modules:
         Description: Standard module and feature management.
-        Dependencies: Common
         Category: Core
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
index c8e348d1b..2c9065d21 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
@@ -13,7 +13,10 @@
         if (featureGroup == featureGroups.First())
             categoryClassName += " first";
         if (featureGroup == featureGroups.Last())
-            categoryClassName += " last"; %>
+            categoryClassName += " last";
+        
+        //temporarily "disable" actions on core features
+        var showActions = categoryName.ToString() != "Core"; %>
     <li class="<%=categoryClassName %>">
         <h2><%=Html.Encode(categoryName) %></h2>
         <ul><%
@@ -42,7 +45,8 @@
                                 "") %>
                         </div><%
                         } %>
-                    </div>
+                    </div><%
+                    if (showActions) { %>
                     <div class="actions"><%
                         if (feature.IsEnabled) {
                         using (Html.BeginFormAntiForgeryPost(string.Format("{0}", Url.Action("Disable", new { area = "Orchard.Modules" })), FormMethod.Post, new {@class = "inline link"})) { %>
@@ -71,7 +75,8 @@
                             <button type="submit"><%=_Encoded("π")%></button><%
                         }
                         } %>
-                    </div>
+                    </div><%
+                    } %>
                 </div>
             </li><%
             } %>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css b/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css
index f6afd126a..3041b4688 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css
@@ -10,7 +10,7 @@
     border:1px solid #EAEAEA;
     display:block;
     float:left;
-    height:6.8em;
+    height:5em;
     margin:0 .5% 1% .5%;
     position:relative;
     width:32.1%;
@@ -57,7 +57,7 @@
 }
 .features .dependencies li {
     display:inline;
-    margin-left:.5ex;
+    margin-left:.5em;
 }
 .features .dependencies li::after {
     content:", ";
@@ -67,7 +67,7 @@
 }
 .features .feature .actions {
     position:absolute;
-    right:.8em;
+    right:.4em;
     top:.6em;
 }
 
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
index 53c124af0..fd00b570b 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.MultiTenancy:
         Description: Configure multiple site tenants.
-        Dependencies: Common
-        Category: Core
\ No newline at end of file
+        Category: Hosting
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Module.txt b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt
index 1ade81120..f7100c9c9 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Pages:
         Description: Simple pages.
-        Dependencies: Common
         Category: Content
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt
index 32fd2408d..30653aa79 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Roles:
         Description: Standard user roles.
-        Dependencies: Common
         Category: Core
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt b/src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt
index 488adb7de..81a3967b7 100644
--- a/src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Sandbox:
         Description: A module to mess around with. Currently wiki-like.
-        Dependencies: Common
         Category: Developer
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Module.txt b/src/Orchard.Web/Modules/Orchard.Setup/Module.txt
index 1d87f1edd..069cdb7e3 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Setup:
         Description: Standard site setup.
-        Dependencies: Common
         Category: Core
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
index 490dc5654..b7bf7e204 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Tags:
         Description: Tag a content item.
-        Dependencies: Common
         Category: Navigation
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Module.txt b/src/Orchard.Web/Modules/Orchard.Themes/Module.txt
index f2c729ec6..393b530ec 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Themes:
         Description: Basic theming capability.
-        Dependencies: Common
         Category: Display
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Module.txt b/src/Orchard.Web/Modules/Orchard.Users/Module.txt
index 7cf61082f..ad2f24f64 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Users/Module.txt
@@ -7,5 +7,4 @@ orchardversion: 0.1.2010.0312
 features:
     Orchard.Users:
         Description: Standard users.
-        Dependencies: Common
         Category: Core
\ No newline at end of file