#8565: Delete and Unpublish buttons in backoffice content edit #8566

AndreaPiovanelli · 2022-06-10T14:18:08Z

Added unpublish and delete buttons to backoffice content edit view.
Adapted Orchard.Blogs and Orchard.Widgets to be in line with the patch, adding a "unpublish-button" css class too (it is identical to "publish-button".
Regarding Orchard.Widgets, I removed previous delete button (Widget_DeleteButton shape, Widget.DeleteButton.cshtml) because it was now redundant and conflicted with the Core/Contents... button (not a terrible conflict, but both were displayed and editing the Placement.info turned to be a unreliable solution).
Modified / added actions to controllers when needed.

sebastienros · 2022-06-16T17:15:07Z

src/Orchard.Web/Core/Contents/Controllers/AdminController.cs

@@ -352,6 +352,18 @@ public class AdminController : ContentControllerBase, IUpdateModel {
            return EditPOST(id, returnUrl, contentItem => _contentManager.Publish(contentItem));
        }

+        [HttpPost, ActionName("Edit")]


Why is this different that the other unpublish/delete actions?

I added delete and unpublish actions referencing specific submits to the controller. There already were unpublish and delete actions (the ones called from the lists), so I called those inside the new actions, specific to the edit form.

src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs

src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj

AndreaPiovanelli · 2022-06-30T13:34:40Z

@sebastienros fixed as requested.

src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs

AndreaPiovanelli · 2022-11-25T14:20:42Z

Modified the code following Sebastien's remarks.

BenedekFarkas

I really like the consolidation for the delete button! Please merge from 1.10.x.

However I'm unsure about adding the Unpublish button in the editor - is that really necessary UX-wise? I feel like it get can get a bit too crowded in the action button row.

Some of the editors I checked have minor styling issues under different circumstances, but some of those might be independent of this PR:

BlogPost, Page, etc., when Draftable is enabled (default configuration) - too much space
BlogPost, when Draftable is disabled - spacing missing:

EDIT: These spacing problems are addressed by my suggestions below.

src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs

src/Orchard.Web/Core/Contents/Views/Content.DeleteButton.cshtml

src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml

src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs

src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml

BenedekFarkas · 2024-04-16T16:52:55Z

src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs

+                if (part.ContentItem.IsPublished()) {
+                    results.Add(ContentShape("Content_UnpublishButton", unpublishButton => unpublishButton));
+                }


Re: the previous comment - shouldn't be just this then, since the template already checks IsPublished?

Suggested change

if (part.ContentItem.IsPublished()) {

results.Add(ContentShape("Content_UnpublishButton", unpublishButton => unpublishButton));

}

results.Add(ContentShape("Content_UnpublishButton", unpublishButton => unpublishButton));

I don't remember right now. I'll check asap.

The Content.UnpublishButton template does check if the item is published.

Managed unpublish and delete button for blogs and widgets.

Condition for delete button visibility now checks for contentItem.Id > 0 instead of IsNew() function

…hape and avoid its duplication or confusing management via Placement.info.

Added comments to clarify how new Unpublish and Delete actions work.

…nly)

…d checked the content is published before showing the unpublish button.

MatteoPiovanelli-Laser · 2024-05-16T07:58:29Z

rebased on 1.10.x and applied some of @BenedekFarkas suggestions

BenedekFarkas · 2024-09-03T17:17:23Z

Sorry for replying just now, I'll be able to review later towards the end of September (after Harvest).

BenedekFarkas · 2024-11-15T11:35:27Z

src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs

Please use remove and sort usings and auto-formatting.

BenedekFarkas · 2024-11-15T11:36:21Z

src/Orchard.Web/Core/Contents/Views/Content.DeleteButton.cshtml

@@ -0,0 +1,9 @@
+@using Orchard.ContentManagement;
+@using Orchard.Core.Contents;
+@using Orchard.Utility.Extensions


Unused using.

BenedekFarkas · 2024-11-15T11:37:12Z

src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml

@@ -0,0 +1,11 @@
+@using Orchard.ContentManagement;
+@using Orchard.Core.Contents;
+@using Orchard.Utility.Extensions;


Unused using.

src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs

BenedekFarkas · 2024-11-15T11:40:30Z

src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml

+@{
+    var contentItem = Model.ContentItem as IContent;
+}


Add empty lines around this block. I pointed this out earlier too and it would be easier if you just accepted my change suggestions in bulk, so that I don't have to go through all of them again to figure out what's fixed and what isn't.

Suggested change

@{

var contentItem = Model.ContentItem as IContent;

}

@{

var contentItem = Model.ContentItem as IContent;

}

BenedekFarkas · 2024-11-15T11:46:07Z

src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs

+                if (part.ContentItem.IsPublished()) {
+                    results.Add(ContentShape("Content_UnpublishButton", unpublishButton => unpublishButton));
+                }


The Content.UnpublishButton template does check if the item is published.

BenedekFarkas · 2024-11-15T12:03:07Z

src/Orchard.Web/Core/Contents/Placement.info

+    <Place Content_UnpublishButton="Sidebar:25"/>
    <Place Content_PublishButton="Sidebar:24"/>
    <Place Content_SaveButton="Sidebar:23"/>
+    <Place Content_DeleteButton="Sidebar:22"/>


Reordered them according to placement. Also Content_DeleteButton shouldn't be the first one, because it will be become the default action (e.g., when you hit enter while editing the title) just by virtue of being the first in the rendered HTML.
SaveButton should come first, then PublishButton (because SaveButton is not rendered if the type is not Draftable).

Suggested change

<Place Content_UnpublishButton="Sidebar:25"/>

<Place Content_PublishButton="Sidebar:24"/>

<Place Content_SaveButton="Sidebar:23"/>

<Place Content_DeleteButton="Sidebar:22"/>

<Place Content_SaveButton="Sidebar:23"/>

<Place Content_PublishButton="Sidebar:24"/>

<Place Content_UnpublishButton="Sidebar:25"/>

<Place Content_DeleteButton="Sidebar:26"/>

BenedekFarkas · 2024-11-15T12:45:43Z

src/Orchard.Web/Themes/TheAdmin/Styles/site.css

    clear:none;
    float:left;
 }
 fieldset.save-button {
    clear:left;
 }
-fieldset.publish-button {
+fieldset.publish-button, fieldset.unpublish-button {
    margin: 0 12px 0 0;
    padding: 0 12px;
    border-right:1px solid #ccc;


This styling was overcomplicated to begin with, but we don't need to complicate it further. You can apply this to the whole section between lines 1128 and 1147, so we don't need to care about how many items are rendered and in what order:

.edit-item-sidebar fieldset { margin: 0; padding: 0; clear: none; float: left; } .edit-item-sidebar fieldset:not(:first-child) { margin-left: 12px; } .edit-item-sidebar fieldset:first-child { clear: left; } fieldset.publish-button, fieldset.unpublish-button { padding-right: 12px; border-right: 1px solid #ccc; } fieldset.delete-button { float: right; }

BenedekFarkas · 2024-11-15T12:47:24Z

src/Orchard.Web/Themes/TheAdmin/Styles/site.css

@@ -1495,13 +1495,13 @@ html.dir-rtl {
    margin-left:inherit;
    margin-right:10px;
 }
-.dir-rtl fieldset.publish-button, fieldset.delete-button, .dir-rtl fieldset.save-button {


Same as above, RTL version for lines 1498-1509:

.dir-rtl .edit-item-sidebar fieldset { float: right; } .dir-rtl .edit-item-sidebar fieldset:first-child { clear: right; } .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 { float: left; }

BenedekFarkas · 2024-11-15T13:07:14Z

src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs

+            if (widgetPart.Id > 0 && widgetPart.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable) {
+                results.Add(ContentShape("Content_UnpublishButton",
+                    unpublishButton => unpublishButton));
+            }


This is already rendered by ContentsDriver.

Suggested change

if (widgetPart.Id > 0 && widgetPart.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable) {

results.Add(ContentShape("Content_UnpublishButton",

unpublishButton => unpublishButton));

}

sebastienros reviewed Jun 16, 2022

View reviewed changes

sebastienros approved these changes Jul 7, 2022

View reviewed changes

sebastienros approved these changes Oct 20, 2022

View reviewed changes

sebastienros reviewed Nov 17, 2022

View reviewed changes

src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs Outdated Show resolved Hide resolved

sebastienros reviewed Nov 17, 2022

View reviewed changes

src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs Outdated Show resolved Hide resolved

sebastienros approved these changes Dec 1, 2022

View reviewed changes

BenedekFarkas linked an issue Apr 16, 2024 that may be closed by this pull request

Unpublish and Delete buttons in backoffice content edit page #8565

Open

BenedekFarkas requested changes Apr 16, 2024

View reviewed changes

BenedekFarkas changed the title ~~Delete and Unpublish buttons in backoffice content edit~~ #8565: Delete and Unpublish buttons in backoffice content edit Apr 18, 2024

AndreaPiovanelli and others added 13 commits May 16, 2024 09:39

Added publish and delete buttons to backoffice content edit.

7721655

Corrected condition for content unpublishing.

b5e5430

Managed unpublish and delete button for blogs and widgets.

Some little code refactoring

7da93e4

Added css classes for unpublish-button.

a6d8f46

Condition for delete button visibility now checks for contentItem.Id > 0 instead of IsNew() function

Removed UnpublishButton from Widget Editor.

10ce4fa

Removed Widget_DeleteButton to use the generic Content_DeleteButton s…

67cdc3a

…hape and avoid its duplication or confusing management via Placement.info.

Removed Widget_UnpublishButton shape

e16b84e

Removed unpublish button show/hide logic from driver.

644fc21

Added comments to clarify how new Unpublish and Delete actions work.

EOL fix to Orchard.Widgets.csproj.

72d2a23

Added unpublish button to edit widget (shown if widget is draftable o…

af22105

…nly)

Hide Content edit delete button at frontend

b884b99

ContentsDriver: removed AdminFilter check to display delete button an…

ee42f43

…d checked the content is published before showing the unpublish button.

Applied some of the proposed formatting changes

18a7f37

MatteoPiovanelli-Laser force-pushed the 8565_DeleteUnpublishButtons branch from e2d564e to 18a7f37 Compare May 16, 2024 07:58

BenedekFarkas requested changes Nov 15, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#8565: Delete and Unpublish buttons in backoffice content edit #8566

#8565: Delete and Unpublish buttons in backoffice content edit #8566

AndreaPiovanelli commented Jun 10, 2022 •

edited by BenedekFarkas

Loading

sebastienros Jun 16, 2022

AndreaPiovanelli Jun 17, 2022

AndreaPiovanelli commented Jun 30, 2022

AndreaPiovanelli commented Nov 25, 2022

BenedekFarkas left a comment •

edited

Loading

BenedekFarkas Apr 16, 2024 •

edited

Loading

MatteoPiovanelli-Laser May 16, 2024

BenedekFarkas Nov 15, 2024

MatteoPiovanelli-Laser commented May 16, 2024

BenedekFarkas commented Sep 3, 2024

BenedekFarkas Nov 15, 2024

BenedekFarkas Nov 15, 2024

BenedekFarkas Nov 15, 2024

BenedekFarkas Nov 15, 2024

BenedekFarkas Nov 15, 2024

BenedekFarkas Nov 15, 2024

BenedekFarkas Nov 15, 2024

BenedekFarkas Nov 15, 2024

BenedekFarkas Nov 15, 2024

#8565: Delete and Unpublish buttons in backoffice content edit #8566

Are you sure you want to change the base?

#8565: Delete and Unpublish buttons in backoffice content edit #8566

Conversation

AndreaPiovanelli commented Jun 10, 2022 • edited by BenedekFarkas Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AndreaPiovanelli commented Jun 30, 2022

AndreaPiovanelli commented Nov 25, 2022

BenedekFarkas left a comment • edited Loading

Choose a reason for hiding this comment

BenedekFarkas Apr 16, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MatteoPiovanelli-Laser commented May 16, 2024

BenedekFarkas commented Sep 3, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AndreaPiovanelli commented Jun 10, 2022 •

edited by BenedekFarkas

Loading

BenedekFarkas left a comment •

edited

Loading

BenedekFarkas Apr 16, 2024 •

edited

Loading