diff options
Diffstat (limited to 'templates/web/zurich/admin')
| -rw-r--r-- | templates/web/zurich/admin/body.html | 2 | ||||
| -rw-r--r-- | templates/web/zurich/admin/contact-form.html | 10 | ||||
| -rw-r--r-- | templates/web/zurich/admin/index.html | 2 | ||||
| -rw-r--r-- | templates/web/zurich/admin/problem_row.html | 2 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit-sdm.html | 2 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit.html | 6 |
6 files changed, 13 insertions, 11 deletions
diff --git a/templates/web/zurich/admin/body.html b/templates/web/zurich/admin/body.html index cf860990d..468f7adff 100644 --- a/templates/web/zurich/admin/body.html +++ b/templates/web/zurich/admin/body.html @@ -19,7 +19,7 @@ </tr> [% WHILE ( cat = contacts.next ) %] <tr[% IF cat.deleted %] class="is-deleted"[% END %]> - <td><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category %]</a></td> + <td><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category_display %]</a></td> <td>[% cat.email | html %]</td> <td>[% cat.editor %]</td> <td>[% cat.note | html %]</td> diff --git a/templates/web/zurich/admin/contact-form.html b/templates/web/zurich/admin/contact-form.html index dddfc6d01..236b169d0 100644 --- a/templates/web/zurich/admin/contact-form.html +++ b/templates/web/zurich/admin/contact-form.html @@ -1,5 +1,5 @@ <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8" id="category_edit"> - <p><strong>[% loc('Category:') %] </strong>[% contact.category | html %] + <p><strong>[% loc('Category:') %] </strong>[% contact.category_display | html %] <input type="hidden" name="category" value="[% contact.category | html %]" > <input type="hidden" name="token" value="[% csrf_token %]" > @@ -7,9 +7,11 @@ <input type="text" class="form-control" name="email" value="[% contact.email | html %]" size="30"> <p> - <input type="hidden" name="confirmed" value="1"> - <input type="checkbox" name="deleted" value="1" id="deleted"[% ' checked' IF contact.deleted %]> - <label class="inline" for="deleted">[% loc('Deleted') %]</label> + <label for="state">[% loc('State') %]</label> + <select name="state" id="state"> + <option value="confirmed"[% ' selected' IF contact.state == 'confirmed' %]>[% loc('Confirmed') %] + <option value="deleted"[% ' selected' IF contact.state == 'deleted' %]>[% loc('Deleted') %] + </select> <input type="checkbox" name="photo_required" value="1" id="photo_required"[% ' checked' IF contact.get_extra_metadata('photo_required') %]> <label class="inline" for="photo_required">[% loc('Photo required') %]</label> </p> diff --git a/templates/web/zurich/admin/index.html b/templates/web/zurich/admin/index.html index 275f50183..fb3609bb3 100644 --- a/templates/web/zurich/admin/index.html +++ b/templates/web/zurich/admin/index.html @@ -3,7 +3,7 @@ <ul> <li>[% tprintf( loc('<strong>%s</strong> live problems'), total_problems_live ) %]; [% tprintf( loc('from %s different users'), total_problems_users ) %]</li> - <li>[% tprintf( loc('%s council contacts – %s confirmed, %s unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li> + <li>[% tprintf( loc('%s council contacts – %s confirmed, %s unconfirmed'), contacts.total, contacts.confirmed, contacts.unconfirmed) %]</li> </ul> <h2>[% loc('Problem breakdown by state') %]</h2> diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html index acbf17017..a83e22b27 100644 --- a/templates/web/zurich/admin/problem_row.html +++ b/templates/web/zurich/admin/problem_row.html @@ -15,7 +15,7 @@ [% END %] </td> <td>[% PROCESS value_or_nbsp value=problem.title %]</td> - <td>[% PROCESS value_or_nbsp value=problem.category %]</td> + <td>[% PROCESS value_or_nbsp value=problem.category_display %]</td> <td>[% PROCESS format_date this_date=problem.created %]</td> <td>[% PROCESS format_date this_date=problem.lastupdate %]</td> <td> [% states.${problem.state} %][% IF problem.state == 'planned'; diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index 3df9459f9..07f0332d5 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -70,7 +70,7 @@ </dd> <dt>[% loc('Category:') %] <!-- Kategorie --></dt> - <dd>[% problem.category | html %]</dd> + <dd>[% problem.category_display | html %]</dd> <dt class="print-only">[% loc('State:') %] <!-- Status --></dt> <dd class="print-only">[% states.${problem.state} %]</dd> diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index f87dcb5cf..35075a9f0 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -98,7 +98,7 @@ </dd> <dt>[% loc('Category:') %] <!-- Kategorie --></dt> - <dd>[% problem.category | html %]</dd> + <dd>[% problem.category_display | html %]</dd> <dt class="print-only">[% loc('State:') %] <!-- Status --></dt> <dd class="print-only">[% states_trans.${problem.state} %]</dd> @@ -169,8 +169,8 @@ <label for="category">[% loc('Assign to different category:') %]</label> <select class="form-control" name="category" id="category"> <option value="">--</option> - [% FOREACH cat IN categories %] - <option value="[% cat %]">[% cat %]</option> + [% FOREACH cat IN category_options %] + <option value="[% cat.name %]">[% cat.value %]</option> [% END %] </select> </div> |