diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2014-10-09 11:05:42 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2014-10-09 11:05:42 +0100 |
| commit | c752ce0ce1b466429c68ec60a4f74d74d3d4c939 (patch) | |
| tree | 8f5a43dc0421d83b5dd70054a8a11e9145309ec5 | |
| parent | cb02a3b83beba71be672795bac8f90c61c1156f4 (diff) | |
| parent | 19d7d2d6699a3875c81166b3165b7fb603345f89 (diff) | |
Merge remote-tracking branch 'origin/issues/516-body-warning'
| -rw-r--r-- | templates/web/base/admin/bodies.html | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html index 8bf7954f3..02208898d 100644 --- a/templates/web/base/admin/bodies.html +++ b/templates/web/base/admin/bodies.html @@ -17,14 +17,15 @@ [% IF c.cobrand.moniker == 'zurich' %] <th>[% loc('Email') %]</th> [% ELSE %] - <th>[% loc('Category') %]</th> + <th>[% loc('Summary') %]</th> [% END %] <th>[% loc('Deleted') %]</th> </tr> [%- FOREACH body IN bodies %] [%- SET id = body.id %] [% NEXT IF c.cobrand.moniker == 'zurich' AND admin_type == 'dm' AND (body.parent OR body.bodies) %] - <tr[% IF body.deleted %] class="adminhidden"[% END %]> + <tr[% IF body.deleted %] class="adminhidden"[% END %] + [% IF NOT counts.$id OR counts.$id.deleted == counts.$id.c %] class="is-deleted"[% END %]> <td> [% IF c.cobrand.moniker == 'zurich' %] [% FILTER repeat(4*body.api_key) %] [% END %] @@ -43,14 +44,17 @@ [% ELSE %] <td> [% IF counts.$id %] - [% tprintf( loc('%d addresses'), counts.$id.c) IF c.cobrand.moniker != 'emptyhomes' %] - [% IF counts.$id.deleted %] - (1+ deleted) - [% ELSIF counts.$id.confirmed != counts.$id.c %] - (some unconfirmed) + [% tprintf( nget('%d address', '%d addresses', counts.$id.c), counts.$id.c) %] + [% IF counts.$id.deleted == counts.$id.c %] + (all deleted; reports will not be sent) + [% ELSIF counts.$id.deleted %] + ([% counts.$id.deleted %] deleted) + [% END %] + [% IF counts.$id.confirmed != counts.$id.c %] + ([% counts.$id.c-counts.$id.confirmed %] unconfirmed) [% END %] [% ELSE %] - no categories + No categories, reports will not be sent [% END %] </td> [% END %] |