Feature for default customization in action menu

docs/reference/hooks.rst

@@ -566,12 +566,29 @@ Hooks for customising the way users are directed through the process of creating
 
   Modify the final list of action menu items on the page creation and edit views. The callable passed to this hook receives a list of ``ActionMenuItem`` objects, a request object and a context dictionary as per ``register_page_action_menu_item``, and should modify the list of menu items in-place.
 
+  Can also be used to customize default action menu.
+
   .. code-block:: python
 
     @hooks.register('construct_page_action_menu')
     def remove_submit_to_moderator_option(menu_items, request, context):
         menu_items[:] = [item for item in menu_items if item.name != 'action-submit']
 
+    from wagtail.admin.action_menu import UnpublishMenuItem, DeleteMenuItem, SubmitForModerationMenuItem, SaveDraftMenuItem, PublishMenuItem
+
+    @hooks.register('construct_page_action_menu')
+    def make_publish_default_action(menu_items, request, context):
+        menu_items[:] = [
+                UnpublishMenuItem(order=10),
+                DeleteMenuItem(order=20),
+                SubmitForModerationMenuItem(order=30),
+                SaveDraftMenuItem(order=40),
+                PublishMenuItem(_isDefault=True),
+        ]
+
+
+
+
 .. construct_page_listing_buttons:
 
 ``construct_page_listing_buttons``

wagtail/admin/action_menu.py

@@ -1,5 +1,6 @@
 """Handles rendering of the list of actions in the footer of the page create/edit views."""
 
+from django.core.exceptions import ImproperlyConfigured
 from django.forms import Media, MediaDefiningClass
 from django.template.loader import render_to_string
 from django.urls import reverse
@@ -18,9 +19,10 @@ class ActionMenuItem(metaclass=MediaDefiningClass):
     label = ''
     name = None
 
-    def __init__(self, order=None):
+    def __init__(self, order=None, _isDefault=False):
         if order is not None:
             self.order = order
+        self._isDefault = _isDefault
 
     def is_shown(self, request, context):
         """
@@ -56,6 +58,7 @@ def render_html(self, request, parent_context):
 
 
 class PublishMenuItem(ActionMenuItem):
+    label = "Publish"
     name = 'action-publish'
     template = 'wagtailadmin/pages/action_menu/publish.html'
 
@@ -99,6 +102,7 @@ def is_shown(self, request, context):
         )
 
     def get_url(self, request, context):
+        print(self.is_shown(request, context), self._isDefault)
         return reverse('wagtailadmin_pages:unpublish', args=(context['page'].id,))
 
 
@@ -117,6 +121,17 @@ def get_url(self, request, context):
         return reverse('wagtailadmin_pages:delete', args=(context['page'].id,))
 
 
+class SaveDraftMenuItem(ActionMenuItem):
+    name = 'action-save-draft'
+    label = ('Save Draft')
+    template = 'wagtailadmin/pages/action_menu/save_draft.html'
+
+    def get_context(self, request, parent_context):
+        context = super().get_context(request, parent_context)
+        context['is_revision'] = (context['view'] == 'revisions_revert')
+        return context
+
+
 BASE_PAGE_ACTION_MENU_ITEMS = None
 
 
@@ -147,27 +162,43 @@ def __init__(self, request, **kwargs):
         self.request = request
         self.context = kwargs
         self.context['user_page_permissions'] = UserPagePermissionsProxy(self.request.user)
+        self.default_item = SaveDraftMenuItem(_isDefault=True)
 
         self.menu_items = [
             menu_item
             for menu_item in _get_base_page_action_menu_items()
             if menu_item.is_shown(self.request, self.context)
         ]
 
-        self.menu_items.sort(key=lambda item: item.order)
+
+        self.menu_items.sort(key=lambda item: (item._isDefault, item.order))
 
         for hook in hooks.get_hooks('construct_page_action_menu'):
             hook(self.menu_items, self.request, self.context)
 
+        # Chcek improperly configured default menu_itmes
+        default_count = 0
+        for menu_item in self.menu_items:
+            if menu_item._isDefault:
+                self.default_item = menu_item
+                default_count += 1
+
+            if default_count > 1:
+                raise ImproperlyConfigured("Only one menu item can be default")
+
     def render_html(self):
         return render_to_string(self.template, {
             'show_menu': bool(self.menu_items),
             'rendered_menu_items': [
                 menu_item.render_html(self.request, self.context)
                 for menu_item in self.menu_items
-            ]
+                if not menu_item._isDefault and menu_item.is_shown(self.request, self.context)
+            ],
         }, request=self.request)
 
+    def render_default_html(self):
+        return self.default_item.render_html(self.request, self.context)
+
     @cached_property
     def media(self):
         media = Media()

wagtail/admin/templates/wagtailadmin/pages/action_menu/menu.html

@@ -1,6 +1,10 @@
 {% if show_menu %}
     <div class="dropdown-toggle icon icon-arrow-up"></div>
     <ul>
-        {% for item in rendered_menu_items %}{{ item }}{% endfor %}
+        {% for item in rendered_menu_items %}
+            <li>
+                 {{ item }}
+            </li>
+        {% endfor %}
     </ul>
 {% endif %}

wagtail/admin/templates/wagtailadmin/pages/action_menu/menu_item.html

@@ -1,7 +1,5 @@
-<li>
-    {% if url %}
-        <a href="{{ url }}">{{ label }}</a>
-    {% else %}
-        <input type="submit" name="{{ name }}" value="{{ label }}" class="button" />
-    {% endif %}
-</li>
+{% if url %}
+    <a class="button" href="{{ url }}">{{ label }}</a>
+{% else %}
+    <input type="submit" name="{{ name }}" value="{{ label }}" class="button" />
+{% endif %}

wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html

@@ -1,4 +1,2 @@
 {% load i18n %}
-<li>
-    <button type="submit" name="action-publish" value="action-publish" class="button button-longrunning {% if is_revision %}warning{% endif %}" data-clicked-text="{% trans 'Publishing…' %}"><span class="icon icon-spinner"></span><em>{% if is_revision %}{% trans 'Publish this revision' %}{% else %}{% trans 'Publish' %}{% endif %}</em></button>
-</li>
+<button type="submit" name="action-publish" value="action-publish" class="button button-longrunning {% if is_revision %}warning{% endif %}" data-clicked-text="{% trans 'Publishing…' %}"><span class="icon icon-spinner"></span><em>{% if is_revision %}{% trans 'Publish this revision' %}{% else %}{% trans 'Publish' %}{% endif %}</em></button>

wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html

@@ -0,0 +1,2 @@
+{% load i18n %}
+<button type="submit" class="button action-save button-longrunning {% if is_revision %}warning{% endif %}" data-clicked-text="{% trans 'Saving…' %}" {% if page.locked %}disabled {% endif %}><span class="icon icon-spinner"></span><em>{% if page.locked %}{% trans 'Page locked' %}{% else %}{% if is_revision %}{% trans 'Replace current draft' %}{% else %}{% trans 'Save draft' %}{% endif %}{% endif %}</em></button>

wagtail/admin/templates/wagtailadmin/pages/create.html

@@ -26,12 +26,13 @@ <h1 class="icon icon-doc-empty-inverse">
         <footer role="contentinfo">
             <nav aria-label="{% trans 'Actions' %}">
                 <ul>
-                    <li class="actions">
-                        <div class="dropdown dropup dropdown-button match-width">
-                            <button type="submit" class="button action-save button-longrunning" data-clicked-text="{% trans 'Saving…' %}"><span class="icon icon-spinner"></span><em>{% trans 'Save draft' %}</em></button>
-                            {{ action_menu.render_html }}
-                        </div>
-                    </li>
+                  <li class="actions">
+                      <div class="dropdown dropup dropdown-button match-width {% if is_revision %}warning{% endif %}">
+                          {{ action_menu.render_default_html }}
+
+                          {{ action_menu.render_html }}
+                      </div>
+                  </li>
 
                     <li class="preview">
                         {% trans 'Preview' as preview_label %}

wagtail/admin/templates/wagtailadmin/pages/edit.html

@@ -39,7 +39,7 @@ <h1 class="icon icon-doc-empty-inverse">
                 <ul>
                     <li class="actions">
                         <div class="dropdown dropup dropdown-button match-width {% if is_revision %}warning{% endif %}">
-                            <button type="submit" class="button action-save button-longrunning {% if is_revision %}warning{% endif %}" data-clicked-text="{% trans 'Saving…' %}" {% if page.locked %}disabled {% endif %}><span class="icon icon-spinner"></span><em>{% if page.locked %}{% trans 'Page locked' %}{% else %}{% if is_revision %}{% trans 'Replace current draft' %}{% else %}{% trans 'Save draft' %}{% endif %}{% endif %}</em></button>
+                            {{ action_menu.render_default_html }}
 
                             {{ action_menu.render_html }}
                         </div>

wagtail/admin/tests/test_pages_views.py

@@ -20,6 +20,9 @@
 from django.utils.dateparse import parse_date
 from freezegun import freeze_time
 
+from wagtail.admin.action_menu import (
+    DeleteMenuItem, PublishMenuItem, SaveDraftMenuItem, SubmitForModerationMenuItem,
+    UnpublishMenuItem)
 from wagtail.admin.views.home import RecentEditsPanel
 from wagtail.admin.views.pages import PreviewOnEdit
 from wagtail.core.models import GroupPagePermission, Page, PageRevision, Site
@@ -2102,6 +2105,41 @@ def hook_func(request, page):
         # page should be edited
         self.assertEqual(Page.objects.get(id=self.child_page.id).title, "I've been edited!")
 
+    def test_construct_page_action_menu_hook(self):
+        def hook_func(menu_items, request, context):
+            menu_items[:] = [
+                UnpublishMenuItem(order=10),
+                DeleteMenuItem(order=20),
+                SubmitForModerationMenuItem(order=30),
+                SaveDraftMenuItem(order=40),
+                PublishMenuItem(_isDefault=True),
+            ]
+
+        default_item = '<button type="submit" name="action-publish" value="action-publish" class="button button-longrunning " data-clicked-text="Publishing…"><span class="icon icon-spinner"></span><em>Publish</em></button>'
+        menu_items_html = '''
+        <ul>
+            <li>
+                <a class="button" href="/admin/pages/6/unpublish/">Unpublish</a>
+            </li>
+            <li>
+                <a class="button" href="/admin/pages/6/delete/">Delete</a>
+            </li>
+            <li>
+                <input type="submit" name="action-submit" value="Submit for moderation" class="button" />
+            </li>
+            <li>
+                <button type="submit" class="button action-save button-longrunning " data-clicked-text="Saving…" ><span class="icon icon-spinner"></span><em>Save draft</em></button>
+            </li>
+        </ul>
+        '''
+        with self.register_hook('construct_page_action_menu', hook_func):
+            response = self.client.get(reverse('wagtailadmin_pages:edit',
+                                       args=(self.single_event_page.id, )))
+
+        self.assertContains(response, default_item, html=True)
+        self.assertContains(response, menu_items_html, html=True)
+
+
 
 class TestPageEditReordering(TestCase, WagtailTestUtils):
     def setUp(self):