From 9fd6c88afda23e15b136b6bdc4584141882f58a1 Mon Sep 17 00:00:00 2001
From: Daniel Stolt <daniel.stolt@perceptible.net>
Date: Mon, 30 Jun 2014 00:19:17 +0200
Subject: [PATCH] Incremental work.

---
 .../ImportExport/AuditTrailExportHandler.cs     | 12 +++++-------
 .../ImportExport/AuditTrailExportStep.cs        |  7 +++----
 .../ImportExport/AuditTrailImportHandler.cs     |  2 ++
 .../Modules/Orchard.AuditTrail/Module.txt       | 17 +++++++++++------
 .../Orchard.AuditTrail.csproj                   |  4 ++++
 .../Parts.AuditTrail.Comment.cshtml             |  8 +++-----
 src/Orchard.Web/Orchard.Web.csproj              |  2 +-
 7 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailExportHandler.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailExportHandler.cs
index 763b6e31e..8f735bb08 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailExportHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailExportHandler.cs
@@ -4,14 +4,12 @@ using System.Linq;
 using System.Xml.Linq;
 using Orchard.AuditTrail.Models;
 using Orchard.Data;
+using Orchard.Environment.Extensions;
 using Orchard.Events;
+using Orchard.ImportExport.Services;
 
 namespace Orchard.AuditTrail.ImportExport {
-    public interface IExportEventHandler : IEventHandler {
-        void Exporting(dynamic context);
-        void Exported(dynamic context);
-    }
-
+    [OrchardFeature("Orchard.AuditTrail.ImportExport")]
     public class AuditTrailExportEventHandler : IExportEventHandler {
         private readonly IRepository<AuditTrailEventRecord> _auditTrailEventRepository;
 
@@ -19,10 +17,10 @@ namespace Orchard.AuditTrail.ImportExport {
             _auditTrailEventRepository = auditTrailEventRepository;
         }
 
-        public void Exporting(dynamic context) {
+        public void Exporting(ExportContext context) {
         }
 
-        public void Exported(dynamic context) {
+        public void Exported(ExportContext context) {
 
             if (!((IEnumerable<string>)context.ExportOptions.CustomSteps).Contains("AuditTrail")) {
                 return;
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailExportStep.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailExportStep.cs
index 8caba42c4..dc0291953 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailExportStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailExportStep.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
+using Orchard.Environment.Extensions;
 using Orchard.Events;
+using Orchard.ImportExport.Services;
 
 namespace Orchard.AuditTrail.ImportExport {
-    public interface ICustomExportStep : IEventHandler {
-        void Register(IList<string> steps);
-    }
-
+    [OrchardFeature("Orchard.AuditTrail.ImportExport")]
     public class AuditTrailExportStep : ICustomExportStep {
         public void Register(IList<string> steps) {
             steps.Add("AuditTrail");
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailImportHandler.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailImportHandler.cs
index 84dc8e8d7..9fffd5b05 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailImportHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/ImportExport/AuditTrailImportHandler.cs
@@ -2,10 +2,12 @@
 using Orchard.AuditTrail.Models;
 using Orchard.ContentManagement;
 using Orchard.Data;
+using Orchard.Environment.Extensions;
 using Orchard.Recipes.Models;
 using Orchard.Recipes.Services;
 
 namespace Orchard.AuditTrail.ImportExport {
+    [OrchardFeature("Orchard.AuditTrail.ImportExport")]
     public class AuditTrailImportHandler : Component, IRecipeHandler {
         private readonly IRepository<AuditTrailEventRecord> _auditTrailEventRepository;
 
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt b/src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt
index 1d50d3a86..72fb53bbf 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt
@@ -1,18 +1,23 @@
-Name: AuditTrail
+Name: Audit Trail
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
 Version: 1.8.1
 OrchardVersion: 1.8
-Description: Logs user initiated events, such as content changes, providing a trail for auditing.
+Description: Provides a log for recording and viewing back-end changes.
 Features:
     Orchard.AuditTrail:
-        Name: AuditTrail
-        Description: Provides the core audit trail framework.
+        Name: Audit Trail
+        Description: Provides a log for recording and viewing back-end changes.
         Category: Security
         Dependencies: Orchard.Users, Orchard.Roles, Orchard.ContentTypes
+    Orchard.AuditTrail.ImportExport:
+        Name: Audit Trail Import Export
+        Description: Provides import/export functionality for the Audit Trail feature.
+        Category: Security
+        Dependencies: Orchard.AuditTrail, Orchard.ImportExport
     Orchard.AuditTrail.Trimming:
-        Name: AuditTrail Trimming
-        Description: A background task that trims the audit trail.
+        Name: Audit Trail Trimming
+        Description: Provides a background task that regularly deletes old audit trail records.
         Category: Security
         Dependencies: Orchard.AuditTrail
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
index 7c8d43ca5..e0e6a1d14 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
@@ -138,6 +138,10 @@
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Orchard.ImportExport\Orchard.ImportExport.csproj">
+      <Project>{fe5c5947-d2d5-42c5-992a-13d672946135}</Project>
+      <Name>Orchard.ImportExport</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/EditorTemplates/Parts.AuditTrail.Comment.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/EditorTemplates/Parts.AuditTrail.Comment.cshtml
index ea4d776fa..3cb48fcb0 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/EditorTemplates/Parts.AuditTrail.Comment.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/EditorTemplates/Parts.AuditTrail.Comment.cshtml
@@ -1,8 +1,6 @@
 @model Orchard.AuditTrail.Models.AuditTrailPart
 <fieldset>
-	<div>
-		@Html.LabelFor(m => m.Comment, T("Audit Trail Comment"))
-		@Html.TextBoxFor(m => m.Comment, new { @class = "text large" })
-		<span class="hint">@T("Optionally provide a comment about this change. This comment will be stored as part of an audit trail event.")</span>
-	</div>
+	@Html.LabelFor(m => m.Comment, T("Comment"))
+	@Html.TextAreaFor(m => m.Comment)
+	<span class="hint">@T("Optionally provide a comment about this change for the audit trail.")</span>
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index e2183ce23..66e4f2712 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -224,7 +224,7 @@
           <AutoAssignPort>False</AutoAssignPort>
           <DevelopmentServerPort>30321</DevelopmentServerPort>
           <DevelopmentServerVPath>/OrchardLocal</DevelopmentServerVPath>
-          <IISUrl>http://localhost:30321/OrchardLocal</IISUrl>
+          <IISUrl>http://localhost:30322/OrchardLocal</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>