From 944bc0207640ec15f7955812bdb7d6738dfe925f Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Sat, 26 Feb 2011 07:07:16 -0800
Subject: [PATCH] Going back to the inline links for installing a local module
 or theme.

--HG--
branch : dev
---
 .../Orchard.Modules/Controllers/AdminController.cs        | 1 +
 .../Orchard.Modules/ViewModels/ModulesIndexViewModel.cs   | 1 +
 .../Modules/Orchard.Modules/Views/Admin/Index.cshtml      | 6 +++++-
 .../Orchard.Modules/styles/orchard-modules-admin.css      | 8 ++++++++
 src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs    | 6 ++----
 .../Modules/Orchard.Themes/Controllers/AdminController.cs | 1 +
 .../Orchard.Themes/Styles/orchard-themes-admin.css        | 8 ++++++++
 .../Orchard.Themes/ViewModels/ThemesIndexViewModel.cs     | 1 +
 .../Modules/Orchard.Themes/Views/Admin/Index.cshtml       | 4 ++++
 9 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
index 4713b125c..ba9ab98d7 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
@@ -93,6 +93,7 @@ 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 4fd924cb1..a41e0f310 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/ViewModels/ModulesIndexViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/ViewModels/ModulesIndexViewModel.cs
@@ -3,6 +3,7 @@ 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 c0adea78c..d1653fcaf 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
@@ -47,4 +47,8 @@
                          }
 
     @Display(Model.Pager)
-}
\ No newline at end of file
+}
+
+@if (Model.InstallModules) {
+    <p id="otherActionsBar">@Html.ActionLink(T("Upload a module").ToString(), "AddModule", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, null)</p>
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css b/src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
index d0f3bdb2e..f5d3e9a99 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
@@ -4,6 +4,14 @@
 #main .features h3 {
     padding:0 3em 0 0;
 }
+#otherActionsBar {
+    clear: both;
+    border-top-width: thin;
+    border-top-style: solid;
+    border-top-color: #E4E5E6;
+    margin: 10px 0 0;
+    padding: 10px 0 0;
+}
 .pageStatus {
     clear: both;
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
index 5e11bc50c..8154df76d 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
@@ -15,11 +15,9 @@ namespace Orchard.Packaging {
         public void GetNavigation(NavigationBuilder builder) {
             builder
                 .Add(T("Modules"), menu => menu
-                    .Add(T("Gallery"), "3", item => Describe(item, "Modules", "Gallery", true))
-                    .Add(T("Upload"), "9", item => Describe(item, "AddModule", "PackagingServices", true)))
+                    .Add(T("Gallery"), "3", item => Describe(item, "Modules", "Gallery", true)))
                 .Add(T("Themes"), menu => menu
-                    .Add(T("Gallery"), "3", item => Describe(item, "Themes", "Gallery", true))
-                    .Add(T("Upload"), "9", item => Describe(item, "AddTheme", "PackagingServices", true)))
+                    .Add(T("Gallery"), "3", item => Describe(item, "Themes", "Gallery", true)))
                 .Add(T("Settings"), menu => menu
                     .Add(T("Gallery"), "1", item => Describe(item, "Sources", "Gallery", false)));
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
index 8bf7a7361..4f8fd269b 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
@@ -103,6 +103,7 @@ namespace Orchard.Themes.Controllers {
 
                 return View(new ThemesIndexViewModel {
                     CurrentTheme = currentTheme,
+                    InstallThemes = installThemes,
                     Themes = themes
                 });
             } catch (Exception exception) {
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css b/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css
index bad6e3f64..d8edd8638 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css
@@ -10,6 +10,14 @@
     height: 50px;
     margin: 10px 0 10px 0;
 }
+#otherActionsBar {
+    clear: both;
+    border-top-width: thin;
+    border-top-style: solid;
+    border-top-color: #E4E5E6;
+    margin: 10px 0 0;
+    padding: 10px 0 0;
+}
 #installedBar h3 {
     float: left;
     padding-top: 10px;
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
index c6d82fc95..77cd11b48 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
@@ -3,6 +3,7 @@ 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 1fcedb6de..16f8ce77f 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
@@ -30,4 +30,8 @@
             <li>@Display.ThemeEntry(ContentPart: themeEntry)</li>
         }
     </ul>
+}
+
+@if (Model.InstallThemes) {
+    <p id="otherActionsBar">@Html.ActionLink(T("Upload a theme").ToString(), "AddTheme", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, null)</p>
 }
\ No newline at end of file