kopia lustrzana https://github.com/wagtail/wagtail
Use dropdown buttons on listings in dashboard panels (#11083)
Co-authored-by: Thibaud Colas <thibaudcolas@gmail.com>pull/11082/head
sage
GitHub
rodzic
78a349bb24
commit
56b14e8f97
|
|
@ -47,6 +47,7 @@ Changelog
|
|||
* Support `Filter` instances as input for `AbstractImage.get_renditions()` (Thibaud Colas)
|
||||
* Improve error messages for image template tags (Thibaud Colas)
|
||||
* Do not render minimap if there are no panel anchors (Sage Abdullah)
|
||||
* Use dropdown buttons on listings in dashboard panels (Sage Abdullah)
|
||||
* Fix: Ensure that StreamField's `FieldBlock`s correctly set the `required` and `aria-describedby` attributes (Storm Heg)
|
||||
* Fix: Avoid an error when the moderation panel (admin dashboard) contains both snippets and private pages (Matt Westcott)
|
||||
* Fix: When deleting collections, ensure the collection name is correctly shown in the success message (LB (Ben) Johnston)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
}
|
||||
|
||||
.w-dropdown__content :where(a, button) {
|
||||
@apply w-bg-transparent w-inline-flex w-items-center w-text-left w-font-bold w-text-text-label-menus-default w-py-3 w-px-6 w-no-underline w-transition w-outline-offset-inside;
|
||||
@apply w-bg-transparent w-inline-flex w-items-center w-text-left w-font-bold w-text-text-label-menus-default w-py-3 w-px-6 w-no-underline w-transition w-outline-offset-inside w-w-full;
|
||||
|
||||
.icon {
|
||||
@apply w-w-4 w-h-4 w-mr-3 w-transition w-opacity-50 w-shrink-0;
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ This feature was developed by Paarth Agarwal and Thibaud Colas as part of the Go
|
|||
* Support `Filter` instances as input for [`AbstractImage.get_renditions()`](image_renditions_multiple) (Thibaud Colas)
|
||||
* Improve error messages for image template tags (Thibaud Colas)
|
||||
* Do not render minimap if there are no panel anchors (Sage Abdullah)
|
||||
* Use dropdown buttons on listings in dashboard panels (Sage Abdullah)
|
||||
|
||||
### Bug fixes
|
||||
|
||||
|
|
|
|||
|
|
@ -31,29 +31,30 @@
|
|||
{% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
|
||||
</div>
|
||||
<ul class="actions">
|
||||
{% if can_remove_locks %}
|
||||
<li>
|
||||
<button
|
||||
class="button button-small button-secondary"
|
||||
data-controller="w-action"
|
||||
data-action="w-action#post"
|
||||
data-w-action-next-value="{% url 'wagtailadmin_home' %}"
|
||||
data-w-action-url-value="{% url 'wagtailadmin_pages:unlock' page.id %}"
|
||||
>
|
||||
{% trans "Unlock" %}
|
||||
</button>
|
||||
</li>
|
||||
{% endif %}
|
||||
<li><a href="{% url 'wagtailadmin_pages:edit' page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
|
||||
{% if page.has_unpublished_changes and page.is_previewable %}
|
||||
<li><a href="{% url 'wagtailadmin_pages:view_draft' page.id %}" class="button button-small button-secondary" target="_blank" rel="noreferrer">{% trans 'Draft' %}</a></li>
|
||||
{% endif %}
|
||||
{% if page.live %}
|
||||
{% pageurl page as page_url %}
|
||||
{% if page_url is not None %}
|
||||
<li><a href="{{ page_url }}" class="button button-small button-secondary" target="_blank" rel="noreferrer">{% trans 'Live' %}</a></li>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<li>
|
||||
{% dropdown toggle_icon="dots-horizontal" toggle_aria_label=_("Actions") %}
|
||||
{% if can_remove_locks %}
|
||||
<button
|
||||
data-controller="w-action"
|
||||
data-action="w-action#post"
|
||||
data-w-action-next-value="{% url 'wagtailadmin_home' %}"
|
||||
data-w-action-url-value="{% url 'wagtailadmin_pages:unlock' page.id %}"
|
||||
>
|
||||
{% trans "Unlock" %}
|
||||
</button>
|
||||
{% endif %}
|
||||
<a href="{% url 'wagtailadmin_pages:edit' page.id %}">{% trans "Edit" %}</a>
|
||||
{% if page.has_unpublished_changes and page.is_previewable %}
|
||||
<a href="{% url 'wagtailadmin_pages:view_draft' page.id %}" target="_blank" rel="noreferrer">{% trans 'Draft' %}</a>
|
||||
{% endif %}
|
||||
{% if page.live %}
|
||||
{% pageurl page as page_url %}
|
||||
{% if page_url is not None %}
|
||||
<a href="{{ page_url }}" target="_blank" rel="noreferrer">{% trans 'Live' %}</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% enddropdown %}
|
||||
</li>
|
||||
</ul>
|
||||
</td>
|
||||
<td>{# Deliberately empty #}</td>
|
||||
|
|
|
|||
|
|
@ -39,23 +39,23 @@
|
|||
</div>
|
||||
<ul class="actions">
|
||||
<li>
|
||||
<form action="{% url 'wagtailadmin_pages:approve_moderation' revision.id %}" method="POST">
|
||||
{% csrf_token %}
|
||||
<input type="submit" class="button button-small button-secondary" value="{% trans 'Approve' %}">
|
||||
</form>
|
||||
{% dropdown toggle_icon="dots-horizontal" toggle_aria_label=_("Actions") %}
|
||||
<form action="{% url 'wagtailadmin_pages:approve_moderation' revision.id %}" method="POST">
|
||||
{% csrf_token %}
|
||||
<button type="submit">{% trans 'Approve' %}</button>
|
||||
</form>
|
||||
<form action="{% url 'wagtailadmin_pages:reject_moderation' revision.id %}" method="POST">
|
||||
{% csrf_token %}
|
||||
<button type="submit">{% trans 'Reject' %}</button>
|
||||
</form>
|
||||
{% if page_perms.can_edit %}
|
||||
<a href="{% url 'wagtailadmin_pages:edit' revision.object_id %}">{% trans 'Edit' %}</a>
|
||||
{% endif %}
|
||||
{% if revision.content_object.is_previewable %}
|
||||
<a href="{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}" target="_blank" rel="noreferrer">{% trans 'Preview' %}</a>
|
||||
{% endif %}
|
||||
{% enddropdown %}
|
||||
</li>
|
||||
<li class="no-border">
|
||||
<form action="{% url 'wagtailadmin_pages:reject_moderation' revision.id %}" method="POST">
|
||||
{% csrf_token %}
|
||||
<input type="submit" class="button button-small no" value="{% trans 'Reject' %}">
|
||||
</form>
|
||||
</li>
|
||||
{% if page_perms.can_edit %}
|
||||
<li><a href="{% url 'wagtailadmin_pages:edit' revision.object_id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
|
||||
{% endif %}
|
||||
{% if revision.content_object.is_previewable %}
|
||||
<li><a href="{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}" class="button button-small button-secondary" target="_blank" rel="noreferrer">{% trans 'Preview' %}</a></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</td>
|
||||
<td valign="top">
|
||||
|
|
|
|||
|
|
@ -31,16 +31,20 @@
|
|||
{% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
|
||||
</div>
|
||||
<ul class="actions">
|
||||
<li><a href="{% url 'wagtailadmin_pages:edit' page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
|
||||
{% if page.has_unpublished_changes and page.is_previewable %}
|
||||
<li><a href="{% url 'wagtailadmin_pages:view_draft' page.id %}" class="button button-small button-secondary" target="_blank" rel="noreferrer">{% trans 'Draft' %}</a></li>
|
||||
{% endif %}
|
||||
{% if page.live %}
|
||||
{% pageurl page as page_url %}
|
||||
{% if page_url is not None %}
|
||||
<li><a href="{{ page_url }}" class="button button-small button-secondary" target="_blank" rel="noreferrer">{% trans 'Live' %}</a></li>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<li>
|
||||
{% dropdown toggle_icon="dots-horizontal" toggle_aria_label=_("Actions") %}
|
||||
<a href="{% url 'wagtailadmin_pages:edit' page.id %}">{% trans "Edit" %}</a>
|
||||
{% if page.has_unpublished_changes and page.is_previewable %}
|
||||
<a href="{% url 'wagtailadmin_pages:view_draft' page.id %}" target="_blank" rel="noreferrer">{% trans 'Draft' %}</a>
|
||||
{% endif %}
|
||||
{% if page.live %}
|
||||
{% pageurl page as page_url %}
|
||||
{% if page_url is not None %}
|
||||
<a href="{{ page_url }}" target="_blank" rel="noreferrer">{% trans 'Live' %}</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% enddropdown %}
|
||||
</li>
|
||||
</ul>
|
||||
</td>
|
||||
<td valign="top">
|
||||
|
|
|
|||
|
|
@ -44,31 +44,25 @@
|
|||
</div>
|
||||
{% if actions %}
|
||||
<ul class="actions">
|
||||
{% for action_name, action_label, modal in actions %}
|
||||
<li>
|
||||
<button class="button button-small button-secondary" data-workflow-action-url="{% url state.workflow_action_url_name obj.pk|admin_urlquote action_name task_state.id %}" {% if modal %}data-launch-modal{% endif %}>{{ action_label }}</button>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% if page_perms.can_edit or not is_page and edit_url %}
|
||||
<li>
|
||||
<a href="{{ edit_url }}" class="button button-small button-secondary">{% trans 'Edit' %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if obj.is_previewable %}
|
||||
<li>
|
||||
<a href="{% url state.workflow_preview_url_name obj.pk|admin_urlquote task_state.task.id %}" class="button button-small button-secondary" target="_blank" rel="noreferrer">{% trans 'Preview' %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if state.live_revision %}
|
||||
<li>
|
||||
<a href="{% url state.revisions_compare_url_name obj.pk|admin_urlquote 'live' revision.id %}" class="button button-small button-secondary">{% trans "Compare with live version" %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if state.previous_revision %}
|
||||
<li>
|
||||
<a href="{% url state.revisions_compare_url_name obj.pk|admin_urlquote state.previous_revision.id revision.id %}" class="button button-small button-secondary">{% trans "Compare with previous version" %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
<li>
|
||||
{% dropdown toggle_icon="dots-horizontal" toggle_aria_label=_("Actions") %}
|
||||
{% for action_name, action_label, modal in actions %}
|
||||
<button data-workflow-action-url="{% url state.workflow_action_url_name obj.pk|admin_urlquote action_name task_state.id %}" {% if modal %}data-launch-modal{% endif %}>{{ action_label }}</button>
|
||||
{% endfor %}
|
||||
{% if page_perms.can_edit or not is_page and edit_url %}
|
||||
<a href="{{ edit_url }}">{% trans 'Edit' %}</a>
|
||||
{% endif %}
|
||||
{% if obj.is_previewable %}
|
||||
<a href="{% url state.workflow_preview_url_name obj.pk|admin_urlquote task_state.task.id %}" target="_blank" rel="noreferrer">{% trans 'Preview' %}</a>
|
||||
{% endif %}
|
||||
{% if state.live_revision %}
|
||||
<a href="{% url state.revisions_compare_url_name obj.pk|admin_urlquote 'live' revision.id %}">{% trans "Compare with live version" %}</a>
|
||||
{% endif %}
|
||||
{% if state.previous_revision %}
|
||||
<a href="{% url state.revisions_compare_url_name obj.pk|admin_urlquote state.previous_revision.id revision.id %}">{% trans "Compare with previous version" %}</a>
|
||||
{% endif %}
|
||||
{% enddropdown %}
|
||||
</li>
|
||||
</ul>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue