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

Merge pull request #1882 from gasman/pagination-fixes 

Fix regressions in page chooser navigation
pull/1888/head
Karl Hobley 2015-11-02 11:52:31 +00:00
rodzic ed920aff7f 20655941e9
commit bdf52d5439
5 zmienionych plików z 11 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
wagtail/wagtailadmin/templates/wagtailadmin/chooser/_link_types.html
Wyświetl plik

@ -1,22 +1,22 @@
{% load i18n %}
{% load i18n wagtailadmin_tags %}
{% if allow_external_link or allow_email_link or current == 'external' or current == 'email' %}
<p class="link-types">
{% if current == 'internal' %}
<b>{% trans "Internal link" %}</b>
{% else %}
<a href="{% url 'wagtailadmin_choose_page' %}?{{ querystring }}">{% trans "Internal link" %}</a>
<a href="{% url 'wagtailadmin_choose_page' %}{% querystring p=None %}">{% trans "Internal link" %}</a>
{% endif %}
{% if current == 'external' %}
| <b>{% trans "External link" %}</b>
{% elif allow_external_link %}
| <a href="{% url 'wagtailadmin_choose_page_external_link' %}?{{ querystring }}">{% trans "External link" %}</a>
| <a href="{% url 'wagtailadmin_choose_page_external_link' %}{% querystring p=None %}">{% trans "External link" %}</a>
{% endif %}
{% if current == 'email' %}
| <b>{% trans "Email link" %}</b>
{% elif allow_email_link %}
| <a href="{% url 'wagtailadmin_choose_page_email_link' %}?{{ querystring }}">{% trans "Email link" %}</a>
| <a href="{% url 'wagtailadmin_choose_page_email_link' %}{% querystring p=None %}">{% trans "Email link" %}</a>
{% endif %}
</p>
{% endif %}

2
wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html
Wyświetl plik

@ -5,7 +5,7 @@
<div class="nice-padding">
{% include 'wagtailadmin/chooser/_link_types.html' with current='email' %}
<form action="{% url 'wagtailadmin_choose_page_email_link' %}?{% querystring %}" method="post">
<form action="{% url 'wagtailadmin_choose_page_email_link' %}{% querystring %}" method="post">
{% csrf_token %}
<ul class="fields">
{% for field in form %}

2
wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html
Wyświetl plik

@ -5,7 +5,7 @@
<div class="nice-padding">
{% include 'wagtailadmin/chooser/_link_types.html' with current='external' %}
<form action="{% url 'wagtailadmin_choose_page_external_link' %}?{% querystring %}" method="post">
<form action="{% url 'wagtailadmin_choose_page_external_link' %}{% querystring %}" method="post">
{% csrf_token %}
<ul class="fields">
{% for field in form %}

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html
Wyświetl plik

@ -6,6 +6,6 @@ Navigation controls for the page listing in 'choose' mode
<td class="{% if allow_navigation and page.can_descend %}children{% endif %}">
{% if allow_navigation and page.can_descend %}
<a href="{% url 'wagtailadmin_choose_page_child' page.id %}?{% querystring page=None %}" class="icon text-replace icon-arrow-right navigate-pages" title="{% blocktrans with title=page.title %}Explore subpages of '{{ title }}'{% endblocktrans %}">{% trans 'Explore' %}</a>
<a href="{% url 'wagtailadmin_choose_page_child' page.id %}{% querystring p=None %}" class="icon text-replace icon-arrow-right navigate-pages" title="{% blocktrans with title=page.title %}Explore subpages of '{{ title }}'{% endblocktrans %}">{% trans 'Explore' %}</a>
{% endif %}
</td>

8
wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html
Wyświetl plik

@ -1,14 +1,14 @@
{% load i18n %}
{% load i18n wagtailadmin_tags %}
<ul class="breadcrumb">
{% for page in page.get_ancestors %}
{% if page.is_root %}
<li class="home"><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}{% else %}{% url 'wagtailadmin_explore_root' %}{% endif %}" class="{% if choosing %}navigate-pages{% endif %} icon icon-home text-replace">{% trans 'Home' %}</a></li>
<li class="home"><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}{% querystring p=None %}{% else %}{% url 'wagtailadmin_explore_root' %}{% endif %}" class="{% if choosing %}navigate-pages{% endif %} icon icon-home text-replace">{% trans 'Home' %}</a></li>
{% else %}
<li><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}{% else %}{% url 'wagtailadmin_explore' page.id %}{% endif %}" {% if choosing %}class="navigate-pages"{% endif %}>{{ page.title }}</a></li>
<li><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}{% querystring p=None %}{% else %}{% url 'wagtailadmin_explore' page.id %}{% endif %}" {% if choosing %}class="navigate-pages"{% endif %}>{{ page.title }}</a></li>
{% endif %}
{% endfor %}
{% if include_self %}
<li><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}{% else %}{% url 'wagtailadmin_explore' page.id %}{% endif %}" {% if choosing %}class="navigate-pages"{% endif %}>{{ page.title }}</a></li>
<li><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}{% querystring p=None %}{% else %}{% url 'wagtailadmin_explore' page.id %}{% endif %}" {% if choosing %}class="navigate-pages"{% endif %}>{{ page.title }}</a></li>
{% endif %}
</ul>