diff options
Diffstat (limited to 'templates/web/base/admin/body.html')
| -rw-r--r-- | templates/web/base/admin/body.html | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index 5e8c6a164..7fa446f44 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -70,7 +70,7 @@ <table cellspacing="0" cellpadding="2" border="1"> <tr> <th>[% loc('Category') %]</th> - <th colspan=2>[% loc('State') %]</th> + <th>[% loc('State') %]</th> <th>[% loc('Last editor') %]</th> <th>[% loc('Note') %]</th> [% IF any_not_confirmed %] @@ -78,20 +78,20 @@ [% END %] </tr> [% WHILE ( cat = contacts.next ) %] - <tr [% IF cat.deleted %]class="is-deleted"[% END %]> - <td class="contact-category"><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category | html %]</a> + <tr [% IF cat.state == 'deleted' %]class="is-deleted"[% END %]> + <td class="contact-category"><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category_display | html %]</a> <br>[% cat.email | html %]</td> <td> - [% loc('Confirmed') %]: - [%- IF cat.confirmed %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] - <br>[% loc('Deleted') %]: - [%- IF cat.deleted %]<strong>[% loc('Yes') %]</strong>[% ELSE %][% loc('No') %][% END %] - </td> - <td> - [% loc('Private') %]: - [%- cat.non_public ? loc('Yes') : loc('No') %] - <br>[% loc('Devolved') %]: - [%- IF body.can_be_devolved AND cat.send_method %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] + [% cat.state %] + [% IF cat.non_public OR (body.can_be_devolved AND cat.send_method) %] + <br><small> + [% IF cat.non_public %][% loc('Private') %][% END %] + [% IF cat.non_public AND (body.can_be_devolved AND cat.send_method) %] + / + [% END %] + [% IF body.can_be_devolved AND cat.send_method %][% loc('Devolved') %][% END %] + </small> + [% END %] </td> <td>[% cat.editor | html %] <br><small>[% PROCESS format_time time=cat.whenedited %]</small></td> @@ -130,9 +130,10 @@ <div class="fms-admin-warning"> [% errors.values.join('<br>') %] </div> + [% INCLUDE 'admin/contact-form.html' translations=contact_translations %] + [% ELSE %] + [% INCLUDE 'admin/contact-form.html' translations={} %] [% END %] - - [% INCLUDE 'admin/contact-form.html' %] </div> [% IF NOT errors and c.user.is_superuser %] |