From dff819ae04d09e63ca302bdeccc74711633f1c61 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@orchardpros.net>
Date: Tue, 29 Jul 2014 17:22:11 -0700
Subject: [PATCH] Improving content event presentation.

---
 .../Orchard.AuditTrail/Orchard.AuditTrail.csproj    |  1 +
 .../Styles/audittrail-content-event.css             |  3 +++
 .../AuditTrailEvent-Content.SummaryAdmin.cshtml     | 13 +++++++++----
 .../Views/AuditTrailEvent-Content.cshtml            |  7 +++++--
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-content-event.css

diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
index 6e8555c31..0d8dd7d4b 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
@@ -81,6 +81,7 @@
     <Content Include="Scripts\audittrail-expando.js" />
     <Content Include="Scripts\audittrail-checkall.js" />
     <Content Include="Scripts\audittrail-disabledcontent.js" />
+    <Content Include="Styles\audittrail-content-event.css" />
     <Content Include="Styles\audittrail-display.css" />
     <Content Include="Styles\audittrail-disabledcontent.css" />
     <Content Include="Styles\audittrail-part.css" />
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-content-event.css b/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-content-event.css
new file mode 100644
index 000000000..e560ab35c
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-content-event.css
@@ -0,0 +1,3 @@
+.audittrail-content-eventmetadata {
+    margin-bottom: 1em;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml
index 93bdb3549..f94e25ae1 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml
@@ -1,17 +1,22 @@
 @using Orchard.AuditTrail.Helpers
+@using Orchard.AuditTrail.Services.Models
 @using Orchard.ContentManagement
 @{
+    var descriptor = (AuditTrailEventDescriptor)Model.Descriptor;
     var eventData = (IDictionary<string, object>) Model.EventData;
     var contentItem = (ContentItem) Model.ContentItem;
     var contentItemId = contentItem.Id;
     var eventVersionNumber = eventData.Get<int>("VersionNumber");
     var eventIsPublished = eventData.Get<bool>("Published");
     var contentType = contentItem.ContentType;
+    var isLatest = contentItem.VersionRecord.Number == eventVersionNumber;
 }
 <section class="audittrail-content-eventsummary">
-    @T("{0} - {1} (version {2})", contentType, Html.ItemEditLink(contentItem), eventVersionNumber)
-    @if (eventIsPublished) {
-        @T(" - ")
-        <a href="@Url.Action("Detail", "Content", new { area = "Orchard.AuditTrail", id = contentItemId, version = eventVersionNumber })">@T("View")</a>
+    @if (eventIsPublished || isLatest) {
+        @T("{2} of the {0} {1} was {3}.", contentType.ToLower(), Html.ItemEditLink(contentItem), Html.ActionLink(T("Version {0}", eventVersionNumber).Text, "Detail", "Content", new { area = "Orchard.AuditTrail", id = contentItemId, version = eventVersionNumber }, null), descriptor.Name.Text.ToLower())
+    }
+    else {
+        @T("{0} - {1}", contentType, Html.ItemEditLink(contentItem))
+        
     }
 </section>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml
index e8c6a8974..433297470 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml
@@ -1,6 +1,9 @@
 @using Orchard.AuditTrail.Models
 @using Orchard.AuditTrail.Providers.Content
 @using Orchard.ContentManagement
+@{
+    Style.Include("audittrail-content-event.css");
+}
 @{
     var record = (AuditTrailEventRecord)Model.Record;
     var contentItem = (ContentItem)Model.ContentItem;
@@ -13,8 +16,8 @@
 }
 <section class="audittrail-content-eventmetadata">
     @T("ID:") <strong>@contentItem.Id</strong><br />
-    @contentItem.ContentType: <strong>@Html.ItemEditLink(contentItem)</strong><br />
-    @T("Version:") <strong>@contentItem.Version</strong>
+    @contentItem.ContentType: @Html.ItemEditLink(contentItem)<br />
+    @Html.ActionLink(T("Version {0}", contentItem.Version).Text, "Detail", "Content", new { area = "Orchard.AuditTrail", id = contentItem.Id, version = contentItem.Version }, null)
     @if (!String.IsNullOrWhiteSpace(record.Comment)) {
         <br />
         @T("Comment:")<br />