From f0155c2698f92c78f3e24c1061ab37bc9ed6cd4d Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli Date: Thu, 23 Jan 2025 12:13:04 +0100 Subject: [PATCH] Several refactoring operations --- .../Core/Contents/Drivers/ContentsDriver.cs | 8 ++- src/Orchard.Web/Core/Contents/Placement.info | 6 +-- .../Views/Content.DeleteButton.cshtml | 1 - .../Views/Content.UnpublishButton.cshtml | 3 +- .../Controllers/BlogPostAdminController.cs | 1 - .../Drivers/WidgetPartDriver.cs | 6 --- .../Themes/TheAdmin/Styles/site.css | 51 ++++++++++++------- 7 files changed, 41 insertions(+), 35 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs b/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs index c722caf8e..cc48580c0 100644 --- a/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs +++ b/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs @@ -23,13 +23,11 @@ namespace Orchard.Core.Contents.Drivers { if (part.TypeDefinition.Settings.GetModel().Draftable) { results.Add(ContentShape("Content_PublishButton", publishButton => publishButton)); - if (part.ContentItem.IsPublished()) { - results.Add(ContentShape("Content_UnpublishButton", unpublishButton => unpublishButton)); - } - } + results.Add(ContentShape("Content_UnpublishButton", unpublishButton => unpublishButton)); + } if (part.Id > 0) { - results.Add(ContentShape("Content_DeleteButton", deleteButton => deleteButton)); + results.Add(ContentShape("Content_DeleteButton", deleteButton => deleteButton)); } return Combined(results.ToArray()); diff --git a/src/Orchard.Web/Core/Contents/Placement.info b/src/Orchard.Web/Core/Contents/Placement.info index 4c409c860..c09b947e3 100644 --- a/src/Orchard.Web/Core/Contents/Placement.info +++ b/src/Orchard.Web/Core/Contents/Placement.info @@ -6,10 +6,10 @@ Parts_Contents_Publish_SummaryAdmin --> - - - + + + diff --git a/src/Orchard.Web/Core/Contents/Views/Content.DeleteButton.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.DeleteButton.cshtml index 106a5d37b..20f1a7871 100644 --- a/src/Orchard.Web/Core/Contents/Views/Content.DeleteButton.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Content.DeleteButton.cshtml @@ -1,6 +1,5 @@ @using Orchard.ContentManagement; @using Orchard.Core.Contents; -@using Orchard.Utility.Extensions @if (Authorizer.Authorize(Permissions.DeleteContent, (IContent)Model.ContentItem)) {
diff --git a/src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml index c9d3e0945..13c885c6f 100644 --- a/src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml @@ -1,9 +1,10 @@ @using Orchard.ContentManagement; @using Orchard.Core.Contents; -@using Orchard.Utility.Extensions; + @{ var contentItem = Model.ContentItem as IContent; } + @if (Authorizer.Authorize(Permissions.PublishContent, contentItem) && contentItem.IsPublished()) {
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs index 742c26440..80aef92bb 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Reflection; using System.Web.Mvc; using Orchard.Blogs.Extensions; using Orchard.Blogs.Models; diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs index c20af20b8..0388c283b 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; -using Orchard.Core.Contents.Settings; using Orchard.Localization; using Orchard.Utility.Extensions; using Orchard.Widgets.Models; @@ -36,11 +35,6 @@ namespace Orchard.Widgets.Drivers { () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.WidgetPart", Model: widgetPart, Prefix: Prefix)) }; - if (widgetPart.Id > 0 && widgetPart.TypeDefinition.Settings.GetModel().Draftable) { - results.Add(ContentShape("Content_UnpublishButton", - unpublishButton => unpublishButton)); - } - return Combined(results.ToArray()); } diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 15fe57899..e95976947 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -1126,24 +1126,27 @@ html.dyn #submit-pager, html.dyn .apply-bulk-actions-auto { display:none; } /* Core Contents and Orchard.PublishLater */ .edit-item-sidebar fieldset { - margin:0; - padding:0; + margin: 0; + padding: 0; + clear: none; + float: left; } -fieldset.publish-button, fieldset.delete-button, fieldset.save-button, fieldset.unpublish-button { - clear:none; - float:left; +.edit-item-sidebar fieldset:not(:first-child) { + margin-left: 12px; } -fieldset.save-button { - clear:left; + +.edit-item-sidebar fieldset:first-child { + clear: left; } + fieldset.publish-button, fieldset.unpublish-button { - margin: 0 12px 0 0; - padding: 0 12px; - border-right:1px solid #ccc; + padding-right: 12px; + border-right: 1px solid #ccc; } + fieldset.delete-button { - margin: 0 0 0 12px; + float: right; } /* Dashboard */ @@ -1495,17 +1498,29 @@ html.dir-rtl { margin-left:inherit; margin-right:10px; } -.dir-rtl fieldset.publish-button, fieldset.delete-button, .dir-rtl fieldset.save-button, .dir-rtl fieldset.unpublish-button { - float:right; + +.dir-rtl .edit-item-sidebar fieldset { + float: right; } -.dir-rtl fieldset.save-button { - clear:right; + +.dir-rtl .edit-item-sidebar fieldset:first-child { + clear: right; } -.dir-rtl fieldset.publish-button, .dir-rtl fieldset.unpublish-button { - margin: 0 0 0 12px ; + +.dir-rtl .edit-item-sidebar fieldset:not(:first-child) { + margin-left: 0; + margin-right: 12px; } + +.dir-rtl fieldset.publish-button, fieldset.unpublish-button { + padding-right: 0; + border-right: none; + padding-left: 12px; + border-left: 1px solid #ccc; +} + .dir-rtl fieldset.delete-button { - margin: 0 12px 0 0; + float: left; } .content-rtl .permalink input.text {