Moving Recycle Bin to its own feature.

src/Orchard.Web/Modules/Orchard.AuditTrail/Controllers/RecycleBinController.cs

@@ -7,6 +7,7 @@ using Orchard.AuditTrail.Services;
 using Orchard.AuditTrail.Services.Models;
 using Orchard.AuditTrail.ViewModels;
 using Orchard.ContentManagement;
+using Orchard.Environment.Extensions;
 using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.Mvc;
@@ -16,6 +17,7 @@ using Orchard.UI.Navigation;
 using Orchard.UI.Notify;
 
 namespace Orchard.AuditTrail.Controllers {
+    [OrchardFeature("Orchard.AuditTrail.RecycleBin")]
     [Admin]
     public class RecycleBinController : Controller {
         private readonly IAuthorizer _authorizer;

src/Orchard.Web/Modules/Orchard.AuditTrail/Menus/AuditTrailAdminMenu.cs

@@ -1,7 +1,7 @@
 using Orchard.UI.Navigation;
 
-namespace Orchard.AuditTrail {
+namespace Orchard.AuditTrail.Menus {
-    public class AdminMenu : Component, INavigationProvider {
+    public class AuditTrailAdminMenu : Component, INavigationProvider {
         
         public string MenuName { get { return "admin"; } }
 
@@ -12,9 +12,6 @@ namespace Orchard.AuditTrail {
                     .Permission(Permissions.ManageAuditTrailSettings)
                     .Add(T("History"), "1", history => history
                         .Action("Index", "Admin", new { area = "Orchard.AuditTrail" })
-                        .LocalNav())
-                    .Add(T("Recycle Bin"), "2", history => history
-                        .Action("Index", "RecycleBin", new { area = "Orchard.AuditTrail" })
                         .LocalNav()));
         }
     }

src/Orchard.Web/Modules/Orchard.AuditTrail/Menus/RecycleBinAdminMenu.cs

@@ -0,0 +1,18 @@
+using Orchard.Environment.Extensions;
+using Orchard.UI.Navigation;
+
+namespace Orchard.AuditTrail.Menus {
+    [OrchardFeature("Orchard.AuditTrail.RecycleBin")]
+    public class RecycleBinAdminMenu : Component, INavigationProvider {
+
+        public string MenuName { get { return "admin"; } }
+
+        public void GetNavigation(NavigationBuilder builder) {
+            builder
+                .Add(T("Audit Trail"), "12", auditTrail => auditTrail
+                    .Add(T("Recycle Bin"), "2", history => history
+                        .Action("Index", "RecycleBin", new { area = "Orchard.AuditTrail" })
+                        .LocalNav()));
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt

@@ -34,4 +34,9 @@ Features:
         Name: Audit Trail Content Definition Events
         Description: Provides audit trail support for content definition related events.
         Category: Security
-        Dependencies: Orchard.AuditTrail, Orchard.ContentTypes
+        Dependencies: Orchard.AuditTrail, Orchard.ContentTypes
+    Orchard.AuditTrail.RecycleBin:
+        Name: Recycle Bin
+        Description: Adds a Recycle Bin menu item to the Audit Trail menu, enabling you to recycle removed content items.
+        Category: Content
+        Dependencies: Orchard.AuditTrail

src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj

@@ -187,7 +187,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AdminMenu.cs" />
+    <Compile Include="Menus\AuditTrailAdminMenu.cs" />
+    <Compile Include="Menus\RecycleBinAdminMenu.cs" />
     <Compile Include="ViewModels\RecycleBinCommand.cs" />
     <Compile Include="Controllers\RecycleBinController.cs" />
     <Compile Include="Controllers\ContentController.cs" />

src/Orchard.Web/Modules/Orchard.AuditTrail/Services/RecycleBin.cs

@@ -6,8 +6,10 @@ using Orchard.Collections;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Records;
 using Orchard.Data;
+using Orchard.Environment.Extensions;
 
 namespace Orchard.AuditTrail.Services {
+    [OrchardFeature("Orchard.AuditTrail.RecycleBin")]
     public class RecycleBin : IRecycleBin {
         private readonly ISessionLocator _sessionLocator;
         private readonly IContentManager _contentManager;