lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Improving content event presentation.

Browse Source
This commit is contained in:
Sipke Schoorstra
2014-07-29 17:22:11 -07:00
parent 07f036d365
commit dff819ae04
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
View File

@@ -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" />

3
src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-content-event.css Normal file
View File

@@ -0,0 +1,3 @@
.audittrail-content-eventmetadata {
margin-bottom: 1em;
}

13
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml
View File

@@ -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>

7
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml
View File

@@ -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 />