From a1543c964fb1a5b961808f99dc65a0a9a1e77514 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Wed, 1 Dec 2010 16:42:36 -0800
Subject: [PATCH] Delegating theme installation to Orchard.Packaging.

--HG--
branch : dev
---
 .../Controllers/GalleryController.cs          |  4 +++
 .../Orchard.Packaging.csproj                  |  4 ++-
 .../Views/Gallery/AddTheme.cshtml}            |  0
 .../Controllers/AdminController.cs            | 31 +++++++++----------
 .../Orchard.Themes/Orchard.Themes.csproj      |  1 -
 .../ViewModels/ThemesIndexViewModel.cs        |  1 +
 .../Orchard.Themes/Views/Admin/Index.cshtml   |  4 ++-
 7 files changed, 26 insertions(+), 19 deletions(-)
 rename src/Orchard.Web/Modules/{Orchard.Themes/Views/Admin/Install.cshtml => Orchard.Packaging/Views/Gallery/AddTheme.cshtml} (100%)

diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
index 7ad804931..3bf4341b2 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
@@ -143,6 +143,10 @@ namespace Orchard.Packaging.Controllers {
             return RedirectToAction(redirectTo == "Themes" ? "Themes" : "Modules");
         }
 
+        public ActionResult AddTheme(string returnUrl) {
+            return View();
+        }
+
         public ActionResult AddModule(string returnUrl) {
             return View();
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
index d0710b48b..33679069e 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
@@ -120,7 +120,9 @@
   <ItemGroup>
     <Content Include="Views\Gallery\Themes.cshtml" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Views\Gallery\AddTheme.cshtml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/AddTheme.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml
rename to src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/AddTheme.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
index caf2387d1..d1c26ee7d 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
@@ -1,16 +1,13 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using System.Web;
 using System.Web.Mvc;
 using Orchard.Data.Migration;
-using Orchard.DisplayManagement;
 using Orchard.Environment.Descriptor.Models;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Features;
 using Orchard.Localization;
 using Orchard.Reports.Services;
-using Orchard.Security;
 using Orchard.Themes.Preview;
 using Orchard.Themes.Services;
 using Orchard.Themes.ViewModels;
@@ -19,35 +16,36 @@ using Orchard.UI.Notify;
 namespace Orchard.Themes.Controllers {
     [ValidateInput(false)]
     public class AdminController : Controller {
+        private readonly IDataMigrationManager _dataMigrationManager;
+        private readonly IFeatureManager _featureManager;
         private readonly ISiteThemeService _siteThemeService;
-        private readonly IPreviewTheme _previewTheme;
         private readonly IExtensionManager _extensionManager;
         private readonly ShellDescriptor _shellDescriptor;
+        private readonly IPreviewTheme _previewTheme;
         private readonly IThemeService _themeService;
-        private readonly IDataMigrationManager _dataMigrationManager;
         private readonly IReportsCoordinator _reportsCoordinator;
 
         public AdminController(
-            IDataMigrationManager dataMigraitonManager,
-            IReportsCoordinator reportsCoordinator,
             IOrchardServices services,
-            IThemeManager themeManager,
+            IDataMigrationManager dataMigraitonManager,
             IFeatureManager featureManager,
             ISiteThemeService siteThemeService,
-            IPreviewTheme previewTheme,
-            IAuthorizer authorizer,
-            INotifier notifier,
             IExtensionManager extensionManager,
             ShellDescriptor shellDescriptor,
-            IThemeService themeService) {
+            IPreviewTheme previewTheme, 
+            IThemeService themeService,
+            IReportsCoordinator reportsCoordinator) {
             Services = services;
+
             _dataMigrationManager = dataMigraitonManager;
-            _reportsCoordinator = reportsCoordinator;
             _siteThemeService = siteThemeService;
-            _previewTheme = previewTheme;
             _extensionManager = extensionManager;
             _shellDescriptor = shellDescriptor;
+            _featureManager = featureManager;
+            _previewTheme = previewTheme;
             _themeService = themeService;
+            _reportsCoordinator = reportsCoordinator;
+
             T = NullLocalizer.Instance;
         }
 
@@ -68,8 +66,9 @@ namespace Orchard.Themes.Controllers {
                     })
                     .ToArray();
 
-                var model = new ThemesIndexViewModel { CurrentTheme = currentTheme, Themes = themes };
-                return View(model);
+                return View(new ThemesIndexViewModel {
+                    CurrentTheme = currentTheme, Themes = themes,
+                    InstallThemes = _featureManager.GetEnabledFeatures().FirstOrDefault(f => f.Id == "Gallery") != null });
             }
             catch (Exception exception) {
                 Services.Notifier.Error(T("Listing themes failed: " + exception.Message));
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
index 7e66d29d1..a504b7e20 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -71,7 +71,6 @@
     <Content Include="Content\orchard.ico" />
     <Content Include="Styles\orchard-themes-admin.css" />
     <Content Include="Views\Admin\Index.cshtml" />
-    <Content Include="Views\Admin\Install.cshtml" />
     <Content Include="Views\ThemePreview.cshtml" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
index f28ca1309..6d26c07d0 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.Environment.Extensions.Models;
 
 namespace Orchard.Themes.ViewModels {
     public class ThemesIndexViewModel {
+        public bool InstallThemes { get; set; }
         public ExtensionDescriptor 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 d7588f591..bfd026f26 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
@@ -18,7 +18,9 @@
         @Model.CurrentTheme.WebSite
     </p>
 
-    @Html.ActionLink(T("Install a new Theme").ToString(), "Install", null, new { @class = "button primaryAction" })
+    if (Model.InstallThemes) {
+        @Html.ActionLink(T("Install a new Theme").ToString(), "Install", null, new { @class = "button primaryAction" })
+    }
 }
 
 <h2>@T("Available Themes")</h2>