Refactored resources. Inlined small PNG images.

src/Orchard.Web/Modules/Orchard.AuditTrail/AdminMenu.cs

@@ -6,7 +6,7 @@ namespace Orchard.AuditTrail {
         public string MenuName { get { return "admin"; } }
 
         public void GetNavigation(NavigationBuilder builder) {
-            builder.AddImageSet("audit-trail")
+            builder.AddImageSet("audittrail")
                 .Add(T("Audit Trail"), "12", menuItem => menuItem
                     .Action("Index", "Admin", new { area = "Orchard.AuditTrail" })
                     .Permission(Permissions.ManageAuditTrailSettings));

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

@@ -80,12 +80,12 @@
     <Content Include="Recipes\audit-trail.recipe.xml" />
     <Content Include="Scripts\audittrail-admin.js" />
     <Content Include="Scripts\audittrail-checkall.js" />
+    <Content Include="Scripts\audittrail-disabledcontent.js" />
     <Content Include="Styles\audittrail-admin.css" />
+    <Content Include="Styles\audittrail-disabledcontent.css" />
     <Content Include="Styles\audittrail-settings.css" />
-    <Content Include="Styles\custom-grid.css" />
+    <Content Include="Styles\audittrail-grid.css" />
     <Content Include="Styles\menu.audit-trail-admin.css" />
-    <Content Include="Styles\menu.audit-trail.png" />
-    <Content Include="Styles\overlay.png" />
     <Content Include="Web.config" />
     <Content Include="Scripts\Web.config" />
     <Content Include="Styles\Web.config" />

src/Orchard.Web/Modules/Orchard.AuditTrail/Scripts/audittrail-admin.js

@@ -10,15 +10,8 @@
             });
     };
 
-    var disableContentEditor = function () {
-        $(".content-disabled input").prop("disabled", true);
-        $(".content-disabled textarea").prop("disabled", true);
-        $(".content-disabled button").prop("disabled", true);
-    };
-
     $(function() {
         initExpandoControl();
-        disableContentEditor();
     });
 
 })(jQuery);

src/Orchard.Web/Modules/Orchard.AuditTrail/Scripts/audittrail-disabledcontent.js

@@ -0,0 +1,5 @@
+$(function () {
+    $(".disabled-content-wrapper input").prop("disabled", true);
+    $(".disabled-content-wrapper textarea").prop("disabled", true);
+    $(".disabled-content-wrapper button").prop("disabled", true);
+});

src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-admin.css

@@ -9,7 +9,6 @@
 
         .audit-trail-filter fieldset label.inline {
             display: inline;
-            width: auto;
         }
 
 .audit-trail-list .info {
@@ -19,22 +18,3 @@
 .audit-trail-list .event-content .version {
     font-size: 0.8em;
 }
-
-.content-disabled {
-    position: relative;
-}
-
-    .content-disabled .overlay {
-        position: absolute;
-        left: -24px;
-        top: -16px;
-        right: -24px;
-        bottom: -28px;
-        background: url('overlay.png');
-    }
-
-    .content-disabled .edit-item-secondary,
-    .content-disabled .audit-trail.expando-wrapper,
-    .content-disabled .audit-trail-link {
-        display: none;
-    }

src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-disabledcontent.css

@@ -0,0 +1,19 @@
+
+.disabled-content-wrapper {
+    position: relative;
+}
+
+.disabled-content-overlay {
+    position: absolute;
+    left: -24px;
+    top: -16px;
+    right: -24px;
+    bottom: -28px;
+    background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NEE1QTFEQkIwMTgzMTFFNDg4ODhCRjg2N0VEQjAxNTUiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NEE1QTFEQkEwMTgzMTFFNDg4ODhCRjg2N0VEQjAxNTUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjg0Q0EwN0U3RjRCMTExRTM4MDlCRkYyQzE5M0JCODI3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjg0Q0EwN0U4RjRCMTExRTM4MDlCRkYyQzE5M0JCODI3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Xw2MNgAAAO9JREFUeNrs0gENAAAIwzDAv+djg4RWwrJOUvw1EhgAA2AADIABMAAGwAAYAANgAAyAATAABsAAGAADYAAMgAEwAAbAABgAA2AADIABMAAGwAAYAANgAAyAATAABsAAGAADYAAMgAEwAAbAABgAA2AADIABMAAGwAAYAANgAAyAATAABsAAGAADYAAMgAEwAAbAABgAA2AADIABMAAGwAAYAANgAAyAAQwggQEwAAbAABgAA2AADIABMAAGwAAYAANgAAyAATAABsAAGAADYAAMgAEwAAbAABgAA2AADIABMAAGwAAYAANgAAzADSvAAO13A/2zPw4VAAAAAElFTkSuQmCC');
+}
+
+.disabled-content-wrapper .edit-item-secondary,
+.disabled-content-wrapper .audit-trail.expando-wrapper,
+.disabled-content-wrapper .audit-trail-link {
+    display: none;
+}

src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/menu.audit-trail-admin.css

@@ -1,7 +1,7 @@
 .navicon-audit-trail {
-    background-image:url(menu.audit-trail.png) !important;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAwCAYAAAAYX/pXAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo0QjYzNzBCRkUyQUExMUUzQjhEQkUxOEU0QTJCQjdGQyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo0QjYzNzBDMEUyQUExMUUzQjhEQkUxOEU0QTJCQjdGQyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjRCNjM3MEJERTJBQTExRTNCOERCRTE4RTRBMkJCN0ZDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjRCNjM3MEJFRTJBQTExRTNCOERCRTE4RTRBMkJCN0ZDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+a9wktAAAAMVJREFUeNrsllEOwiAMhvcTLqTPegg9qB5Cn/VIdRq3dM0PrcEHXWhCwtbt7wcUCkRkaLGsHwDM/dPlZpVx3G9fHR001dQPuw2eLUxAomqT0T/TUAHjlPP1Luy9/rg0BCHo4g5BRxujL1BLViOYour2TwR2uUJ5YGYcJCq+TpBI+uo1X8zB2+cTTEnk7QMqYNLXNbSeB2lotC7QBbrAagRyrRp7J3KEAN7JnCMVmPhi94PCT7H7AUFfa23sBL9K8FG9fwgwAMe/S7wfx1otAAAAAElFTkSuQmCC') !important;
 }
 
-.navicon-audit-trail:hover {
-    background-position:0 -30px !important;
-}
+    .navicon-audit-trail:hover {
+        background-position: 0 -30px !important;
+    }

src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Admin/Index.cshtml

@@ -1,8 +1,8 @@
 @using Orchard.AuditTrail.Services.Models
 @model Orchard.AuditTrail.ViewModels.AuditTrailViewModel
 @{
-    Style.Include("custom-grid.css");
     Style.Include("audittrail-admin.css");
+    Style.Include("audittrail-grid.css");
     var orderBy = Model.OrderBy;
     var orderByItems = new List<SelectListItem> {
         new SelectListItem {Text = T("Date (desc)").Text, Value = AuditTrailOrderBy.DateDescending.ToString(), Selected = Model.OrderBy == AuditTrailOrderBy.DateDescending},

src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailFilter-ContentType.cshtml

@@ -5,6 +5,6 @@
     var listItems = contentTypes.Select(x => new SelectListItem {Text = x.DisplayName, Value = x.Name, Selected = x.Name == currentContentType});
 }
 <fieldset>
-    @Html.Label("contenttype", T("Content Type:").Text)
+    @Html.Label("contenttype", T("Content type:").Text)
     @Html.DropDownList("contenttype", listItems, "")
 </fieldset>

src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Content/Detail.cshtml

@@ -1,14 +1,14 @@
 @using Orchard.ContentManagement
 @{
-    Style.Include("audittrail-admin.css");
+    Style.Include("audittrail-disabledcontent.css");
     Script.Require("ShapesBase");
     Script.Include("~/Themes/TheAdmin/scripts/admin.js").AtFoot();
-    Script.Include("audittrail-admin.js").AtFoot();
+    Script.Include("audittrail-disabledcontent.js").AtFoot();
 
     var contentItem = (ContentItem)Model.ContentItem;
-    Layout.Title = T("{0} - (version {1})", contentItem.ContentType, contentItem.Version);
+    Layout.Title = T("{0} - {1} (version {2})", contentItem.ContentType, Html.ItemDisplayText(contentItem), contentItem.Version);
 }
-<div class="content-disabled">
+<div class="disabled-content-wrapper">
     @Display(Model)
-    <div class="overlay"></div>
+    <div class="disabled-content-overlay"></div>
 </div>