From 4923c121264a9285056d83b3e7106534630ff9c0 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Wed, 23 Feb 2011 12:25:30 -0800
Subject: [PATCH] Theme and module install links from inline linke in installed
 page to an "Install" tab (LocalNav)

--HG--
branch : dev
---
 .../Controllers/AdminController.cs               |  1 -
 .../ViewModels/ModulesIndexViewModel.cs          |  1 -
 .../Orchard.Modules/Views/Admin/Index.cshtml     |  4 ----
 .../Modules/Orchard.Packaging/AdminMenu.cs       | 16 ++++++++++++----
 .../Controllers/AdminController.cs               |  3 +--
 .../ViewModels/ThemesIndexViewModel.cs           |  1 -
 .../Orchard.Themes/Views/Admin/Index.cshtml      |  4 ----
 7 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
index ba9ab98d7..4713b125c 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
@@ -93,7 +93,6 @@ namespace Orchard.Modules.Controllers {
 
             return View(new ModulesIndexViewModel {
                 Modules = modules,
-                InstallModules = _featureManager.GetEnabledFeatures().FirstOrDefault(f => f.Id == "PackagingServices") != null,
                 Options = options,
                 Pager = Shape.Pager(pager).TotalItemCount(totalItemCount)
             });
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/ViewModels/ModulesIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.Modules/ViewModels/ModulesIndexViewModel.cs
index a41e0f310..4fd924cb1 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/ViewModels/ModulesIndexViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/ViewModels/ModulesIndexViewModel.cs
@@ -3,7 +3,6 @@ using Orchard.Modules.Models;
 
 namespace Orchard.Modules.ViewModels {
     public class ModulesIndexViewModel {
-        public bool InstallModules { get; set; }
         public IEnumerable<ModuleEntry> Modules { get; set; }
 
         public ModulesIndexOptions Options { get; set; }
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
index 7676c12fb..c0adea78c 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
@@ -34,10 +34,6 @@
         <input type="text" id="searchText" name="@Html.NameOf(m => m.Options.SearchText)" value="@Model.Options.SearchText" />
 
         <button type="submit">@T("Search").ToString()</button>
-
-        @if (Model.InstallModules) {
-            @Html.ActionLink(T("Install a module").ToString(), "AddModule", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, new { @class = "button primaryAction" })
-        }
     </fieldset>
 
                          if (Model.Modules.Count() > 0) {
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
index 0a39467d8..330cab834 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
@@ -21,18 +21,26 @@ namespace Orchard.Packaging {
         public AdminMenu() {}
 
         public void GetNavigation(NavigationBuilder builder) {
-            builder.Add(T("Themes"), "25", menu => menu
+            builder.Add(T("Themes"), menu => menu
                 .Add(T("Available"), "1", item => item.Action("Themes", "Gallery", new { area = "Orchard.Packaging" })
                     .Permission(StandardPermissions.SiteOwner).LocalNav()));
 
-            builder.Add(T("Modules"), "20", menu => menu
+            builder.Add(T("Modules"), menu => menu
                 .Add(T("Available"), "2", item => item.Action("Modules", "Gallery", new { area = "Orchard.Packaging" })
                     .Permission(StandardPermissions.SiteOwner).LocalNav()));
 
-            builder.Add(T("Configuration"), "50", menu => menu
-                .Add(T("Feeds"), "25", item => item.Action("Sources", "Gallery", new { area = "Orchard.Packaging" })
+            builder.Add(T("Settings"), menu => menu
+                .Add(T("Gallery"), "1", item => item.Action("Sources", "Gallery", new { area = "Orchard.Packaging" })
                     .Permission(StandardPermissions.SiteOwner)));
 
+            builder.Add(T("Modules"), menu => menu
+                .Add(T("Install"), "99", item => item.Action("AddModule", "PackagingServices", new { area = "Orchard.Packaging" })
+                    .Permission(StandardPermissions.SiteOwner).LocalNav()));
+
+            builder.Add(T("Themes"), menu => menu
+                .Add(T("Install"), "99", item => item.Action("AddTheme", "PackagingServices", new { area = "Orchard.Packaging" })
+                    .Permission(StandardPermissions.SiteOwner).LocalNav()));
+
             if (_backgroundPackageUpdateStatus != null) {
                 // Only available if feature is enabled
 
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
index 36e4afd23..8bf7a7361 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
@@ -103,8 +103,7 @@ namespace Orchard.Themes.Controllers {
 
                 return View(new ThemesIndexViewModel {
                     CurrentTheme = currentTheme,
-                    Themes = themes,
-                    InstallThemes = installThemes
+                    Themes = themes
                 });
             } catch (Exception exception) {
                 this.Error(exception, T("Listing themes failed: {0}", exception.Message), Logger, Services.Notifier);
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
index 77cd11b48..c6d82fc95 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
@@ -3,7 +3,6 @@ using Orchard.Themes.Models;
 
 namespace Orchard.Themes.ViewModels {
     public class ThemesIndexViewModel {
-        public bool InstallThemes { get; set; }
         public ThemeEntry CurrentTheme { get; set; }
         public IEnumerable<ThemeEntry> Themes { get; set; }
     }
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
index 6685e1b16..f5ed4c6e2 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
@@ -20,10 +20,6 @@
 
 <div id="installedBar">
     <h3>@T("Installed")</h3>
-
-    @if (Model.InstallThemes) {
-        <p>@Html.ActionLink(T("Install theme").ToString(), "AddTheme", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, new { @class = "primaryAction" })</p>
-    }
 </div>
 
 @if (Model.Themes == null || Model.Themes.Count() <= 0) {