Adding Uninstall button for modules under Modules/Installed.

src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs

@@ -92,9 +92,13 @@ namespace Orchard.Modules.Controllers {
                 modules = modules.Skip((pager.Page - 1) * pager.PageSize).Take(pager.PageSize);
             }
 
+            // This way we can more or less reliably handle this implicit dependency.
+            var installModules = _featureManager.GetEnabledFeatures().FirstOrDefault(f => f.Id == "PackagingServices") != null;
+
             modules = modules.ToList();
             foreach (ModuleEntry moduleEntry in modules) {
                 moduleEntry.IsRecentlyInstalled = _moduleService.IsRecentlyInstalled(moduleEntry.Descriptor);
+                moduleEntry.CanUninstall = installModules;
 
                 if (_extensionDisplayEventHandler != null) {
                     foreach (string notification in _extensionDisplayEventHandler.Displaying(moduleEntry.Descriptor, ControllerContext.RequestContext)) {
@@ -103,9 +107,10 @@ namespace Orchard.Modules.Controllers {
                 }
             }
 
+
             return View(new ModulesIndexViewModel {
                 Modules = modules,
-                InstallModules = _featureManager.GetEnabledFeatures().FirstOrDefault(f => f.Id == "PackagingServices") != null,
+                InstallModules = installModules,
                 Options = options,
                 Pager = Shape.Pager(pager).TotalItemCount(totalItemCount)
             });

src/Orchard.Web/Modules/Orchard.Modules/Models/ModuleEntry.cs

@@ -32,5 +32,10 @@ namespace Orchard.Modules.Models {
         /// List of module notifications.
         /// </summary>
         public List<string> Notifications { get; set; }
+
+        /// <summary>
+        /// Indicates whether the module can be uninstalled by the user.
+        /// </summary>
+        public bool CanUninstall { get; set; }
     }
 }

src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml

@@ -2,35 +2,44 @@
 @using Orchard.Mvc.Html;
 @using Orchard.Modules.ViewModels;
 @using Orchard.Environment.Extensions.Models;
+@using Orchard.Utility.Extensions;
 
 @{
     Orchard.Modules.Models.ModuleEntry module = Model.Module;
-    string moduleClasses = module.IsRecentlyInstalled ? "recentlyInstalledModule" : string.Empty;
+    var moduleClasses = module.IsRecentlyInstalled ? "class=\"recentlyInstalledModule\"" : String.Empty;
 }
 
 <div class="summary">
     @if (module.Notifications != null && module.Notifications.Count > 0) {
         <div class="notifications">
-            @foreach (string notification in module.Notifications) {
+            @foreach (var notification in module.Notifications) {
                 <h5>@Html.Raw(notification)</h5>
             }
         </div>
     }
     <div class="properties">
-        <h2@{ if(!string.IsNullOrEmpty(moduleClasses)) {<text> class="@moduleClasses" </text> }}>
+        <h2 @Html.Raw(moduleClasses)>
-            @module.Descriptor.Name<span> - @T("Version: {0}", !string.IsNullOrEmpty(module.Descriptor.Version) ? module.Descriptor.Version : T("1.0").ToString())</span></h2>
+            @module.Descriptor.Name<span> - @T("Version: {0}", !String.IsNullOrEmpty(module.Descriptor.Version) ? module.Descriptor.Version : T("1.0").ToString())</span>
+        </h2>
 
-            @if (!string.IsNullOrEmpty(module.Descriptor.Description)) {
+        @Html.ActionLink(
+            T("Uninstall").Text,
+            "UninstallModule",
+            "PackagingServices",
+            new { ModuleId = module.Descriptor.Id, ReturnUrl = Request.ToUrlString(), Area = "Orchard.Packaging" },
+            new { itemprop = "RemoveUrl UnsafeUrl" })
+
+        @if (!String.IsNullOrEmpty(module.Descriptor.Description)) {
             <p>@module.Descriptor.Description</p>
         }
 
         <ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;">
-                @{ IEnumerable<FeatureDescriptor> features = module.Descriptor.Features; }
+            @{ var features = module.Descriptor.Features; }
-                <li>@T("Features: {0}", MvcHtmlString.Create(string.Join(", ", features.Select(f => Html.Link(string.IsNullOrEmpty(f.Name) ? f.Id : f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Id.AsFeatureId(n => T(n)))).ToString()).OrderBy(s => s).ToArray())))</li>
+            <li>@T("Features: {0}", MvcHtmlString.Create(String.Join(", ", features.Select(f => Html.Link(String.IsNullOrEmpty(f.Name) ? f.Id : f.Name, String.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Id.AsFeatureId(n => T(n)))).ToString()).OrderBy(s => s).ToArray())))</li>
-                <li>&nbsp;&#124;&nbsp;@T("Author: {0}", !string.IsNullOrEmpty(module.Descriptor.Author) ? module.Descriptor.Author : T("Unknown").ToString())</li>
+            <li>&nbsp;&#124;&nbsp;@T("Author: {0}", !String.IsNullOrEmpty(module.Descriptor.Author) ? module.Descriptor.Author : T("Unknown").ToString())</li>
             <li>
                 &nbsp;&#124;&nbsp;@T("Website: ")
-                    @if (!string.IsNullOrEmpty(module.Descriptor.WebSite)) { <a href="@module.Descriptor.WebSite">@module.Descriptor.WebSite</a> }
+                @if (!String.IsNullOrEmpty(module.Descriptor.WebSite)) { <a href="@module.Descriptor.WebSite">@module.Descriptor.WebSite</a> }
                 else { @T("Unknown").ToString() }
             </li>
         </ul>