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

Double-check if the end-user is using collections or not

pull/4858/head
Janneke Janssen 2018-10-27 15:07:33 +03:00 zatwierdzone przez Matt Westcott
rodzic 743a26819c
commit 109f4e94db
3 zmienionych plików z 8 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
wagtail/documents/templates/wagtaildocs/documents/list.html
Wyświetl plik

@ -15,7 +15,9 @@
{% endif %}
</th>
<th>{% trans "File" %}</th>
<th>{% trans "Collection" %}</th>
{% if collections %}
<th>{% trans "Collection" %}</th>
{% endif %}
<th>
{% if not is_searching %}
<a href="{% url 'wagtaildocs:index' %}{% if not ordering == "-created_at" %}?ordering=-created_at{% endif %}" class="icon icon-arrow-down-after {% if ordering == "-created_at" %}teal{% endif %}">
@ -38,7 +40,9 @@
{% endif %}
</td>
<td><a href="{{ doc.url }}" class="nolink" download>{{ doc.filename }}</a></td>
<td>{{ doc.collection.name }}</td>
{% if collections %}
<td>{{ doc.collection.name }}</td>
{% endif %}
<td><div class="human-readable-date" title="{{ doc.created_at|date:"d M Y H:i" }}">{% blocktrans with time_period=doc.created_at|timesince %}{{ time_period }} ago{% endblocktrans %}</div></td>
</tr>
{% endfor %}

2
wagtail/images/templates/wagtailimages/chooser/results.html
Wyświetl plik

@ -16,7 +16,7 @@
<ul class="listing horiz images chooser">
{% for image in images %}
<li>
<a class="image-choice" title="{{ image.collection.name }} » {{ image.title }}" href="{% if will_select_format %}{% url 'wagtailimages:chooser_select_format' image.id %}{% else %}{% url 'wagtailimages:image_chosen' image.id %}{% endif %}">
<a class="image-choice" title="{% if collections %}{{ image.collection.name }} » {% endif %}{{ image.title }}" href="{% if will_select_format %}{% url 'wagtailimages:chooser_select_format' image.id %}{% else %}{% url 'wagtailimages:image_chosen' image.id %}{% endif %}">
<div class="image">{% image image max-165x165 class="show-transparency" %}</div>
<h3>{{ image.title|ellipsistrim:60 }}</h3>
</a>

2
wagtail/images/templates/wagtailimages/images/results.html
Wyświetl plik

@ -18,7 +18,7 @@
<ul class="listing horiz images">
{% for image in images %}
<li>
<a class="image-choice" title="{{ image.collection.name }} » {{ image.title }}" href="{% url 'wagtailimages:edit' image.id %}">
<a class="image-choice" title="{% if collections %}{{ image.collection.name }} » {% endif %}{{ image.title }}" href="{% url 'wagtailimages:edit' image.id %}">
{% include "wagtailimages/images/results_image.html" %}
<h3>{{ image.title|ellipsistrim:60 }}</h3>
</a>