From f96e73fc4c0729036eb00b45fd34596bddced4a5 Mon Sep 17 00:00:00 2001 From: Daniel Stolt Date: Sat, 5 Jul 2014 17:19:21 +0200 Subject: [PATCH] Refactored resources. Inlined small PNG images. --- .../Modules/Orchard.AuditTrail/AdminMenu.cs | 2 +- .../Orchard.AuditTrail.csproj | 6 +++--- .../Scripts/audittrail-admin.js | 7 ------ .../Scripts/audittrail-disabledcontent.js | 5 +++++ .../Styles/audittrail-admin.css | 20 ------------------ .../Styles/audittrail-disabledcontent.css | 19 +++++++++++++++++ .../{custom-grid.css => audittrail-grid.css} | 0 .../Styles/menu.audit-trail-admin.css | 8 +++---- .../Styles/menu.audit-trail.png | Bin 1104 -> 0 bytes .../Orchard.AuditTrail/Styles/overlay.png | Bin 1146 -> 0 bytes .../Views/Admin/Index.cshtml | 2 +- .../Views/AuditTrailFilter-ContentType.cshtml | 2 +- .../Views/Content/Detail.cshtml | 10 ++++----- 13 files changed, 39 insertions(+), 42 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.AuditTrail/Scripts/audittrail-disabledcontent.js create mode 100644 src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-disabledcontent.css rename src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/{custom-grid.css => audittrail-grid.css} (100%) delete mode 100644 src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/menu.audit-trail.png delete mode 100644 src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/overlay.png diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/AdminMenu.cs index 81f4192bc..83de97663 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/AdminMenu.cs +++ b/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)); diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj index 6ac335f22..8de6c80fe 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj @@ -80,12 +80,12 @@ + + - + - - diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Scripts/audittrail-admin.js b/src/Orchard.Web/Modules/Orchard.AuditTrail/Scripts/audittrail-admin.js index a24963747..5399f17e9 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Scripts/audittrail-admin.js +++ b/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); \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Scripts/audittrail-disabledcontent.js b/src/Orchard.Web/Modules/Orchard.AuditTrail/Scripts/audittrail-disabledcontent.js new file mode 100644 index 000000000..e8957b17e --- /dev/null +++ b/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); +}); \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-admin.css b/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-admin.css index 432c5e283..049504af7 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-admin.css +++ b/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; - } diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-disabledcontent.css b/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-disabledcontent.css new file mode 100644 index 000000000..9e7207c04 --- /dev/null +++ b/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; +} diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/custom-grid.css b/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-grid.css similarity index 100% rename from src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/custom-grid.css rename to src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/audittrail-grid.css diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/menu.audit-trail-admin.css b/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/menu.audit-trail-admin.css index 33d56b7cb..ce4933cdf 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/menu.audit-trail-admin.css +++ b/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; -} \ No newline at end of file + .navicon-audit-trail:hover { + background-position: 0 -30px !important; + } diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/menu.audit-trail.png b/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/menu.audit-trail.png deleted file mode 100644 index a35718a2a6ecd43a030767a5df59dd097c0a9dd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1104 zcmaJ=TWHfz7>+pI7*2&L=)A>LP>0Q>Yn=_NvuRpaU1zPu6+yNvIbE}woS2;2c0LFy zf^UKs_8=3~2Opdu47|?iKtxcy%nRu7!3&B^6vPXP;z?br57xlRx$u48|NZ~@&;DrJ z+M4RRYJwnY!YyJ9&ol90tES@roQ`kpc$$lX3A70&QC2bm;a6Z6Aj6u}4Pro2^4o8M zCW4r}SdAx8BGSssP@^RqL+3ODvk9W9IcG?68X&R@bgR0LdVgt{B2~plwR<9L#0Y?t z+R|%+O}%Y#xi>9)6{>kP*_7k4fCi96=Cp0P#pirfL6^sC`cwC&g1rS+zQggat#c}GA^%^<9K%?&#fdUJ_<)Ol_Vb%Lld#^&PSyX zGI)l`X0vp*fre%`!+E`4hIKJ6mlGqLR$fO^&Z%3DqJju4*;EarLY=e~r7oC3J_99i? ze82<}f@U1TZN(}^QxHKb1r0I~AeXhPx&pJ-@&Y^(;lsLxBwYq!(MMqcT2&R^Ev#&4 zWQ9=B<@a-3ut8WQ3PEmF(Cv2#LSraUcTje{oP&oFfB~y0}-JUUUt#WHh7@b)p-v0#Dw;e#2MYWkh6YmWCEyw^M$o%G_+$4~V5(9iSkip6i9Pxr5# zcY=wo-|Xl+{`T{RiX9h(d}nh0lKLxc2U@p02_VjgaYxw26$@QK0AA1J-E7jB> zeRs;mt34IwK;6!z=3e62&7+RleP6r2>>1f`_WLA%M_L=N7+&{b(5 QTb%YA4+q=CGeYO?UqyFvR{#J2 diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/overlay.png b/src/Orchard.Web/Modules/Orchard.AuditTrail/Styles/overlay.png deleted file mode 100644 index 9524f28bc549a0a8a1a743894885e24e67aa97a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1146 zcmc&zKX21O6u+ucRaFfG5)v>S?gE1Nd`_I$R^2ML6B>y`RT|N3)Uhv()!Jw5D|S1T zKMN9{g#ku}Msz}KjC=tWP`?03oYSOb2wfO>l707{-tWEN`*W{1+Ybv%x0e6_h31Cc z;pcJwEiUl?>6-JIAGcV&$F}HzrA|yh&7*w+n}M@SI>hk~pMD~%0LlUTAR?KF@cJx6kSQiu&RkzDQg%% zfU<;32un!TiWuwVs*WpgA_C7Adjq{=Hzv8bW(Y&ZA|0VLO~te%(s&nPP1BGhBUvtT zk79BdGAApB$;vc>O%gZuBj(c(<`JDfJz$2wnVy#rM6K3E;4qmqink19PK2;1p&-cX z8hajtyJqaw<*dL+YA%tgf5w4{Yz}^N~~_h#9=hCe*M}F Oz@=Gl+i%UC7rz1ckV2IJ diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Admin/Index.cshtml index ba0867ef2..f61981d93 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Admin/Index.cshtml +++ b/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 { new SelectListItem {Text = T("Date (desc)").Text, Value = AuditTrailOrderBy.DateDescending.ToString(), Selected = Model.OrderBy == AuditTrailOrderBy.DateDescending}, diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailFilter-ContentType.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailFilter-ContentType.cshtml index 74fe52719..06a019262 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailFilter-ContentType.cshtml +++ b/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}); }
- @Html.Label("contenttype", T("Content Type:").Text) + @Html.Label("contenttype", T("Content type:").Text) @Html.DropDownList("contenttype", listItems, "")
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Content/Detail.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Content/Detail.cshtml index c60ff6204..86f4cbfa1 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Content/Detail.cshtml +++ b/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); } -
+
@Display(Model) -
+
\ No newline at end of file