mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add consistent whitespace around sortable table headings (#5190) 

Labels for sortable headings need whitespace around them in order for the arrow to be correctly positioned. In addition, some headings had the label outside of the sort link - this is now fixed too.
pull/5149/merge
Matt Westcott 2019-04-04 11:57:24 +01:00 zatwierdzone przez Thibaud Colas
rodzic 2b2c71a4d9
commit 57b72a8e53
6 zmienionych plików z 28 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
CHANGELOG.txt
Wyświetl plik

@ -53,6 +53,7 @@ Changelog
* Fix: Removing rich text links / documents now also works when the text selection is backwards (Thibaud Colas)
* Fix: Prevent the rich text editor from crashing when copy-paste filtering removes all of its content (Thibaud Colas)
* Fix: Page chooser now respects custom `get_admin_display_title` methods on parent page and breadcrumb (Haydn Greatnews)
* Fix: Added consistent whitespace around sortable table headings (Matt Westcott)
2.4 (19.12.2018)

1
docs/releases/2.5.rst
Wyświetl plik

@ -85,6 +85,7 @@ Bug fixes
* Removing rich text links / documents now also works when the text selection is backwards (Thibaud Colas)
* Prevent the rich text editor from crashing when copy-paste filtering removes all of its content (Thibaud Colas)
* Page chooser now respects custom ``get_admin_display_title`` methods on parent page and breadcrumb (Haydn Greatnews)
* Added consistent whitespace around sortable table headings (Matt Westcott)
Upgrade considerations

6
wagtail/admin/templates/wagtailadmin/pages/revisions/list.html
Wyświetl plik

@ -6,7 +6,11 @@
<thead>
<tr>
<th><a href="{% url 'wagtailadmin_pages:revisions_index' page.id %}?ordering={% if ordering == "created_at" %}-{% endif %}created_at" class="icon icon-arrow-{% if ordering == "created_at" %}up-after{% elif ordering == "-created_at" %}down-after{% else %}down-after{% endif %} {% if ordering == "created_at" or ordering == "-created_at" %}teal{% endif %}">{% trans 'Revision date' %}</a></th>
<th>
<a href="{% url 'wagtailadmin_pages:revisions_index' page.id %}?ordering={% if ordering == "created_at" %}-{% endif %}created_at" class="icon icon-arrow-{% if ordering == "created_at" %}up-after{% elif ordering == "-created_at" %}down-after{% else %}down-after{% endif %} {% if ordering == "created_at" or ordering == "-created_at" %}teal{% endif %}">
{% trans 'Revision date' %}
</a>
</th>
</tr>
</thead>
<tbody>

3
wagtail/admin/templatetags/wagtailadmin_tags.py
Wyświetl plik

@ -331,7 +331,8 @@ def table_header_label(context, label=None, sortable=True, ordering=None, sort_c
classname = "icon icon-arrow-down-after"
return format_html(
'<a href="{url}" class="{classname}">{label}</a>',
# need whitespace around label for correct positioning of arrow icon
'<a href="{url}" class="{classname}"> {label} </a>',
url=url, classname=classname, label=label
)

11
wagtail/sites/templates/wagtailsites/index.html
Wyświetl plik

@ -8,11 +8,14 @@
<thead>
<tr>
<th class="hostname">
{% trans "Site" %}
{% if ordering == "site" %}
<a href="{% url 'wagtailsites:index' %}" class="icon icon-arrow-down-after teal"></a>
{% if ordering == "name" %}
<a href="{% url 'wagtailsites:index' %}" class="icon icon-arrow-down-after teal">
{% trans "Site" %}
</a>
{% else %}
<a href="{% url 'wagtailsites:index' %}?ordering=name" class="icon icon-arrow-down-after"></a>
<a href="{% url 'wagtailsites:index' %}?ordering=name" class="icon icon-arrow-down-after">
{% trans "Site" %}
</a>
{% endif %}
</th>
<th class="port">{% trans "Port" %}</th>

18
wagtail/users/templates/wagtailusers/users/list.html
Wyświetl plik

@ -3,19 +3,25 @@
<thead>
<tr>
<th class="name">
{% trans "Name" %}
{% if ordering == "name" %}
<a href="{% url 'wagtailusers_users:index' %}" class="icon icon-arrow-down-after teal"></a>
<a href="{% url 'wagtailusers_users:index' %}" class="icon icon-arrow-down-after teal">
{% trans "Name" %}
</a>
{% else %}
<a href="{% url 'wagtailusers_users:index' %}?ordering=name" class="icon icon-arrow-down-after"></a>
<a href="{% url 'wagtailusers_users:index' %}?ordering=name" class="icon icon-arrow-down-after">
{% trans "Name" %}
</a>
{% endif %}
</th>
<th class="username">
{% trans "Username" %}
{% if ordering == "username" %}
<a href="{% url 'wagtailusers_users:index' %}" class="icon icon-arrow-down-after teal"></a>
<a href="{% url 'wagtailusers_users:index' %}" class="icon icon-arrow-down-after teal">
{% trans "Username" %}
</a>
{% else %}
<a href="{% url 'wagtailusers_users:index' %}?ordering=username" class="icon icon-arrow-down-after"></a>
<a href="{% url 'wagtailusers_users:index' %}?ordering=username" class="icon icon-arrow-down-after">
{% trans "Username" %}
</a>
{% endif %}
</th>
<th class="level">{% trans "Level" %}</th>