Fix all other templates that use an <object>.id directly.

At least, all instances that my grep foo could find
pull/3413/merge
Tom Hendrikx 2017-03-22 16:00:55 +01:00 zatwierdzone przez Matt Westcott
rodzic 12d8161e36
commit e9a53b4c93
9 zmienionych plików z 30 dodań i 16 usunięć

Wyświetl plik

@ -1,23 +1,24 @@
{% load i18n %}
{% load l10n %}
<div class="field boolean_field widget-checkbox_input">
<label for="{{ attrs.id }}-handsontable-header">{% trans 'Row header' %}</label>
<label for="{{ attrs.id|unlocalize }}-handsontable-header">{% trans 'Row header' %}</label>
<div class="field-content">
<div class="input">
<input type="checkbox" id="{{ attrs.id }}-handsontable-header" name="handsontable-header"/>
<input type="checkbox" id="{{ attrs.id|unlocalize }}-handsontable-header" name="handsontable-header"/>
</div>
<p class="help">{% trans 'Display the first row as a header.' %}</p>
</div>
</div>
<br/>
<div class="field boolean_field widget-checkbox_input">
<label for="{{ attrs.id }}-handsontable-col-header">{% trans 'Column header' %}</label>
<label for="{{ attrs.id|unlocalize }}-handsontable-col-header">{% trans 'Column header' %}</label>
<div class="field-content">
<div class="input">
<input type="checkbox" id="{{ attrs.id }}-handsontable-col-header" name="handsontable-col-header"/>
<input type="checkbox" id="{{ attrs.id|unlocalize }}-handsontable-col-header" name="handsontable-col-header"/>
</div>
<p class="help">{% trans 'Display the first column as a header.' %}</p>
</div>
</div>
<br/>
<div id="{{ attrs.id }}-handsontable-container"></div>
<div id="{{ attrs.id|unlocalize }}-handsontable-container"></div>
{{ original_field_html }}

Wyświetl plik

@ -2,6 +2,7 @@
{% load wagtailadmin_tags %}
{% load gravatar %}
{% load i18n %}
{% load l10n %}
{% block titletag %}{% blocktrans with title=page.get_admin_display_title page_type=content_type.model_class.get_verbose_name %}Editing {{ page_type }}: {{ title }}{% endblocktrans %}{% endblock %}
{% block bodyclass %}page-editor {% if page.live %}page-is-live{% endif %} model-{{ content_type.model }} {% if page.locked %}page-locked{% endif %}{% endblock %}
@ -32,7 +33,7 @@
{{ edit_handler.render_form_content }}
{% if is_revision %}
<input type="hidden" name="revision" value="{{ revision.id }}" />
<input type="hidden" name="revision" value="{{ revision.id|unlocalize }}" />
{% endif %}
<footer>

Wyświetl plik

@ -1,4 +1,5 @@
{% load i18n %}
{% load l10n %}
{% load wagtailadmin_tags %}
<table class="listing {% if full_width %}full-width{% endif %} {% block table_classname %}{% endblock %}">
{% if show_ordering_column %}
@ -45,7 +46,7 @@
{% if pages %}
{% for page in pages %}
{% page_permissions page as page_perms %}
<tr {% if ordering == "ord" %}id="page_{{ page.id }}" data-page-title="{{ page.get_admin_display_title }}"{% endif %} class="{% if not page.live %}unpublished{% endif %} {% block page_row_classname %}{% endblock %}">
<tr {% if ordering == "ord" %}id="page_{{ page.id|unlocalize }}" data-page-title="{{ page.get_admin_display_title }}"{% endif %} class="{% if not page.live %}unpublished{% endif %} {% block page_row_classname %}{% endblock %}">
{% if show_ordering_column %}
<td class="ord">{% if orderable and ordering == "ord" %}<div class="handle icon icon-grip text-replace">{% trans 'Drag' %}</div>{% endif %}</td>
{% endif %}

Wyświetl plik

@ -1,3 +1,5 @@
{% load l10n %}
{% comment %}
The title field for a page in the page listing, when in 'choose' mode.
@ -6,7 +8,7 @@ Expects a variable 'page', the page instance.
<h2>
{% if page.can_choose %}
<a class="choose-page" href="#{{ page.id }}" data-id="{{ page.id }}" data-title="{{ page.get_admin_display_title }}" data-url="{{ page.url }}" data-parent-id="{{ page.get_parent.id }}" data-edit-url="{% url 'wagtailadmin_pages:edit' page.id %}">{{ page.get_admin_display_title }}</a>
<a class="choose-page" href="#{{ page.id|unlocalize }}" data-id="{{ page.id|unlocalize }}" data-title="{{ page.get_admin_display_title }}" data-url="{{ page.url }}" data-parent-id="{{ page.get_parent.id|unlocalize }}" data-edit-url="{% url 'wagtailadmin_pages:edit' page.id %}">{{ page.get_admin_display_title }}</a>
{% else %}
{{ page.get_admin_display_title }}
{% endif %}

Wyświetl plik

@ -1,4 +1,5 @@
{% load i18n %}
{% load l10n %}
<li>
<div class="field choice_field select">
@ -8,7 +9,7 @@
<select id="collection_chooser_collection_id" name="collection_id">
<option value="">{% trans "All collections" %}</option>
{% for collection in collections %}
<option value="{{ collection.id }}" {% if collection == current_collection %}selected="selected"{% endif %}>{{ collection.name }}</option>
<option value="{{ collection.id|unlocalize }}" {% if collection == current_collection %}selected="selected"{% endif %}>{{ collection.name }}</option>
{% endfor %}
</select>
<span></span>

Wyświetl plik

@ -1,4 +1,5 @@
{% load i18n %}
{% load l10n %}
{% comment %}
Either the chosen or unchosen div will be shown, depending on the presence
of the 'blank' class on the container.
@ -7,7 +8,7 @@
when clicked.
{% endcomment %}
<div id="{{ attrs.id }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not value %}blank{% endif %}">
<div id="{{ attrs.id|unlocalize }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not value %}blank{% endif %}">
<div class="chosen">
{% block chosen_state_view %}{% endblock %}

Wyświetl plik

@ -1,5 +1,7 @@
{% extends "wagtailadmin/base.html" %}
{% load i18n staticfiles %}
{% load i18n %}
{% load l10n %}
{% load staticfiles %}
{% block titletag %}{% trans "Add multiple documents" %}{% endblock %}
{% block extra_css %}
{{ block.super }}
@ -28,7 +30,7 @@
<div class="field-content">
<select id="id_adddocument_collection" name="collection">
{% for collection in collections %}
<option value="{{ collection.id }}">{{ collection.name }}</option>
<option value="{{ collection.id|unlocalize }}">{{ collection.name }}</option>
{% endfor %}
</select>
</div>

Wyświetl plik

@ -1,5 +1,8 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailimages_tags i18n staticfiles %}
{% load i18n %}
{% load l10n %}
{% load staticfiles %}
{% load wagtailimages_tags %}
{% block titletag %}{% trans "Add multiple images" %}{% endblock %}
{% block extra_css %}
{{ block.super }}
@ -28,7 +31,7 @@
<div class="field-content">
<select id="id_addimage_collection" name="collection">
{% for collection in collections %}
<option value="{{ collection.id }}">{{ collection.name }}</option>
<option value="{{ collection.id|unlocalize }}">{{ collection.name }}</option>
{% endfor %}
</select>
</div>

Wyświetl plik

@ -1,4 +1,6 @@
{% load i18n wagtailadmin_tags %}
{% load i18n %}
{% load l10n %}
{% load wagtailadmin_tags %}
<table class="listing chooser">
<col width="50%"/>
<col width="50%"/>
@ -13,7 +15,7 @@
{% for query in queries %}
<tr>
<td class="title">
<h2><a class="choose-query" href="#{{ query.id }}" data-id="{{ query.id }}" data-querystring="{{ query.query_string }}">{{ query.query_string }}</a></h2>
<h2><a class="choose-query" href="#{{ query.id|unlocalize }}" data-id="{{ query.id|unlocalize }}" data-querystring="{{ query.query_string }}">{{ query.query_string }}</a></h2>
</td>
<td>{{ query.hits }}</td>
</tr>