diff --git a/wagtail/admin/templates/wagtailadmin/pages/action_menu/page_locked.html b/wagtail/admin/templates/wagtailadmin/pages/action_menu/page_locked.html index b29feb9d38..fbb72083db 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/action_menu/page_locked.html +++ b/wagtail/admin/templates/wagtailadmin/pages/action_menu/page_locked.html @@ -1,5 +1,5 @@ {% load i18n wagtailadmin_tags %} - diff --git a/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html b/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html index 11b7a66ca9..8ada4cc089 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html +++ b/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html @@ -3,7 +3,7 @@ type="submit" name="action-publish" value="action-publish" - class="button button-longrunning {% if is_revision %}warning{% endif %}" + class="button button-longrunning" data-controller="w-progress" data-action="w-progress#activate" data-w-progress-active-value="{% trans 'Publishing…' %}" diff --git a/wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html b/wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html index b3708b2621..792701b9c2 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html +++ b/wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html @@ -1,7 +1,7 @@ {% load i18n wagtailadmin_tags %} diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu_item.html b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu_item.html index 588111b915..bd296f58e4 100644 --- a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu_item.html +++ b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu_item.html @@ -1,6 +1,6 @@ {% load wagtailadmin_tags %} {% if url %} - {% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }} + {% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }} {% else %} - + {% endif %} diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/publish.html b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/publish.html index 0d60d2128e..cb40b32fda 100644 --- a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/publish.html +++ b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/publish.html @@ -3,7 +3,7 @@ type="submit" name="{{ name }}" value="{{ name }}" - class="button action-save button-longrunning{% if is_revision %} warning{% endif %}" + class="button action-save button-longrunning" data-controller="w-progress w-kbd" data-action="w-progress#activate" data-w-kbd-key-value="mod+s" diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/save.html b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/save.html index 4473fe256a..e579efd835 100644 --- a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/save.html +++ b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/save.html @@ -1,7 +1,7 @@ {% load i18n wagtailadmin_tags %}