diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html index 3738d1f43..8a24d9c05 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html @@ -14,7 +14,7 @@ {% csrf_token %} {% page_permissions parent_page as parent_page_perms %} - {% include "wagtailadmin/pages/listing/_list_explore.html" with sortable=1 allow_navigation=1 full_width=1 parent_page=parent_page orderable=parent_page_perms.can_reorder_children %} + {% include "wagtailadmin/pages/listing/_list_explore.html" with sortable=1 allow_navigation=1 full_width=1 show_ordering_column=1 parent_page=parent_page orderable=parent_page_perms.can_reorder_children %} {% url 'wagtailadmin_explore' parent_page.id as pagination_base_url %} {% include "wagtailadmin/pages/listing/_pagination.html" with page=pages base_url=pagination_base_url query_params=pagination_query_params only %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html index dfb0c03c3..96c53fa01 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html @@ -1,7 +1,7 @@ {% load i18n %} {% load wagtailadmin_tags %} - {% if orderable %} + {% if show_ordering_column %} {% endif %} @@ -19,7 +19,7 @@ {% if parent_page %} {% page_permissions parent_page as parent_page_perms %} - @@ -46,8 +46,8 @@ {% for page in pages %} {% page_permissions page as page_perms %} - {% if orderable %} - + {% if show_ordering_column %} + {% endif %} - {% if orderable %} + {% if show_ordering_column %} - {% else %} - {% trans 'Order' %} + {% if orderable %} + {% if ordering == "ord" %} + {% trans 'Order' %} + {% else %} + {% trans 'Order' %} + {% endif %} {% endif %} {% endif %}
+ {% block parent_page_title %} {% endblock %}
{% if ordering == "ord" %}
{% trans 'Drag' %}
{% endif %}
{% if orderable and ordering == "ord" %}
{% trans 'Drag' %}
{% endif %}
{% block page_title %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html index 9f2850134..918857185 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html @@ -5,7 +5,8 @@ Table headers for the page listing, when in 'explore' mode. Expects the following variables: sortable: if true, headings are links to wagtailadmin_explore with sort parameters applied. -orderable: if true, an 'ordering' column is added (again with links to wagtailadmin_explore). +show_ordering_column: if true, an 'ordering' column is added. +orderable: if true, the 'ordering' column is populated (again with links to wagtailadmin_explore). If either sortable or orderable is true, the following variables are also required: @@ -15,12 +16,14 @@ ordering: the current sort parameter {% endcomment %}
- {% if ordering == "ord" %} - {% trans 'Order' %}