From ce5b7fe31779b76a3549db1bcfb00feaae67fdd0 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Thu, 29 Apr 2010 13:06:18 -0700
Subject: [PATCH 1/3] A little cleanup in the Orchard.Modules module

- removed unused DisplayTemplates views folders

--HG--
branch : dev
---
 .../Modules/Orchard.Modules/Orchard.Modules.csproj            | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
index a1206df0f..dcb8cfc04 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -93,10 +93,6 @@
     <Content Include="Views\Admin\Edit.ascx" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Views\DisplayTemplates\Items\" />
-    <Folder Include="Views\DisplayTemplates\Parts\" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From e8b8a8895fbfedc0c3ef650988a1b9db4ba4d1c6 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Thu, 29 Apr 2010 14:03:24 -0700
Subject: [PATCH 2/3] Some work on the installed modules page.

- representing more of the module info and linking in to contained features

--HG--
branch : dev
---
 .../Orchard.Modules/Views/Admin/Features.ascx |  9 ++-----
 .../Orchard.Modules/Views/Admin/Index.ascx    | 24 ++++++++++++-------
 2 files changed, 17 insertions(+), 16 deletions(-)

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 b604c24c6..d4f4474b0 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
@@ -23,7 +23,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
                 <h2><%=Html.Encode(featureGroup.First().Descriptor.Category ?? T("General")) %></h2>
                 <ul><%
                     foreach (var feature in featureGroup) {%>
-                    <li<%=feature == featureGroup.Last() ? " class=\"last\"" : "" %>>
+                    <li<%=feature == featureGroup.Last() ? " class=\"last\"" : "" %> id="<%=Html.Encode(feature.Descriptor.Name) %>">
                         <div class="summary">
                             <div class="properties">
                                 <input type="checkbox" name="selection" value="<%=Html.Encode(feature.Descriptor.Name) %>" />
@@ -40,12 +40,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
                                     </li><%
                                     //dependencies
                                     if (feature.Descriptor.Dependencies.Count() > 0) { %>
-                                    <li>&nbsp;&#124;&nbsp;<%=_Encoded("Depends on: ") %><%
-                                        foreach (var dependency in feature.Descriptor.Dependencies) {
-                                            %><% if (dependency != feature.Descriptor.Dependencies.First()) { %><%=_Encoded(", ") %><% }
-                                            %><%=Html.Encode(dependency) %><%
-                                        } %>
-                                    </li><%
+                                    <li>&nbsp;&#124;&nbsp;<%=T("Depends on: {0}", string.Join(", ", feature.Descriptor.Dependencies.Select(s => Html.Encode(s)).OrderBy(s => s).ToArray())) %></li><%
                                     } %>
                                 </ul>
                             </div>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
index ca0588562..c54567b93 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
@@ -1,22 +1,28 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ModulesIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Modules.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Manage Modules").ToString()) %></h1>
-<div class="manage"><%=Html.ActionLink(T("Install a module").ToString(), "Features", new { }, new { @class = "button primaryAction" })%></div>
-<h2><%=T("Installed Modules") %></h2>
+<h1><%=Html.TitleForPage(T("Installed Modules").ToString()) %></h1>
+<%--<div class="manage"><%=Html.ActionLink(T("Install a module").ToString(), "Features", new { }, new { @class = "button primaryAction" })%></div>--%>
+<%--<h2><%=T("Installed Modules") %></h2>--%>
 <% if (Model.Modules.Count() > 0) { %>
-<fieldset class="pageList">
-<ul class="contentItems blogs"><%
+<fieldset class="">
+<ul class="contentItems"><%
     foreach (var module in Model.Modules.OrderBy(m => m.DisplayName)) { %>
     <li>
         <div class="summary">
             <div class="properties">
                 <h3><%=Html.Encode(module.DisplayName) %></h3>
-                <div class="related">
-                    <%=Html.ActionLink(T("Edit").ToString(), "edit", new {moduleName = module.ModuleName, area = "Orchard.Modules"}) %><%=_Encoded(" | ")%>
-                    <a href="#">Delete</a>
-                </div>
+                <ul class="pageStatus" style="color:#666">
+                    <li><%=T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? Html.Encode(module.Version) : T("1.0")) %></li>
+                    <li>&nbsp;&#124;&nbsp;<%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(Html.Encode(f.Name), string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), Html.Encode(f.Name)) )).OrderBy(s => s).ToArray())) %></li>
+                    <li>&nbsp;&#124;&nbsp;<%=T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? Html.Encode(module.Author) : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %></li><%-- very efficient, I know --%>
+                    <li>&nbsp;&#124;&nbsp;<%=T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? Html.Encode(module.HomePage) : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>"))%></li>
+                </ul>
             </div>
+            <%--<div class="related">
+                <%=Html.ActionLink(T("Edit").ToString(), "edit", new {moduleName = module.ModuleName, area = "Orchard.Modules"}) %><%=_Encoded(" | ")%>
+                <a href="#">Delete</a>
+            </div>--%>
         </div><%
         if (!string.IsNullOrEmpty(module.Description)) { %>
         <p><%=Html.Encode(module.Description) %></p><%

From 06f91a17413d5ab8da67137ed31fa795f9c116fd Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Thu, 29 Apr 2010 14:09:56 -0700
Subject: [PATCH 3/3] A little more module management UI work

- linked feature deps to features
- fixed a test

--HG--
branch : dev
---
 src/Orchard.Specs/Modules.feature                               | 2 +-
 src/Orchard.Specs/Modules.feature.cs                            | 2 +-
 src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs            | 2 +-
 .../Modules/Orchard.Modules/Views/Admin/Features.ascx           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Specs/Modules.feature b/src/Orchard.Specs/Modules.feature
index dcb4980fe..31482a274 100644
--- a/src/Orchard.Specs/Modules.feature
+++ b/src/Orchard.Specs/Modules.feature
@@ -6,7 +6,7 @@
 Scenario: Installed modules are listed
 	Given I have installed Orchard
 	When I go to "admin/modules"
-	Then I should see "<h2>Installed Modules</h2>"
+	Then I should see "<h1>Installed Modules</h1>"
 	    And I should see "<h3>Themes</h3>"
 	    And the status should be 200 OK
 
diff --git a/src/Orchard.Specs/Modules.feature.cs b/src/Orchard.Specs/Modules.feature.cs
index 57e342153..53c113344 100644
--- a/src/Orchard.Specs/Modules.feature.cs
+++ b/src/Orchard.Specs/Modules.feature.cs
@@ -62,7 +62,7 @@ this.ScenarioSetup(scenarioInfo);
 #line 8
  testRunner.When("I go to \"admin/modules\"");
 #line 9
- testRunner.Then("I should see \"<h2>Installed Modules</h2>\"");
+ testRunner.Then("I should see \"<h1>Installed Modules</h1>\"");
 #line 10
      testRunner.And("I should see \"<h3>Themes</h3>\"");
 #line 11
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs
index fc8439236..9db153432 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs
@@ -9,7 +9,7 @@ namespace Orchard.Modules {
                         menu => menu
                                     .Add("Manage Features", "1.0", item => item.Action("Features", "Admin", new { area = "Orchard.Modules" })
                                         .Permission(Permissions.ManageFeatures))
-                                    .Add("Manage Modules", "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Modules" })
+                                    .Add("Installed Modules", "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Modules" })
                                         .Permission(Permissions.ManageModules)));
         }
     }
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 d4f4474b0..dd762aeed 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
@@ -40,7 +40,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
                                     </li><%
                                     //dependencies
                                     if (feature.Descriptor.Dependencies.Count() > 0) { %>
-                                    <li>&nbsp;&#124;&nbsp;<%=T("Depends on: {0}", string.Join(", ", feature.Descriptor.Dependencies.Select(s => Html.Encode(s)).OrderBy(s => s).ToArray())) %></li><%
+                                    <li>&nbsp;&#124;&nbsp;<%=T("Depends on: {0}", string.Join(", ", feature.Descriptor.Dependencies.Select(s => Html.Link(Html.Encode(s), string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), Html.Encode(s)))).OrderBy(s => s).ToArray())) %></li><%
                                     } %>
                                 </ul>
                             </div>