diff options
| author | Chris Mytton <self@hecticjeff.net> | 2013-09-12 09:57:17 +0100 |
|---|---|---|
| committer | Chris Mytton <self@hecticjeff.net> | 2013-09-12 09:57:17 +0100 |
| commit | 738b1068c8ea9df4a24056f1784ff5846bb8bb6b (patch) | |
| tree | bdbbf99b6c4e4286d9bdf6f380b9df941e663fe4 /templates | |
| parent | 70ee276344b374773902d9a96c84ad81d7bdfafe (diff) | |
| parent | ca4487b3b161b857ef5412f93ecd60646697ff2d (diff) | |
Merge branch 'zurich-mark-external-addresses-deleted'
Conflicts:
t/cobrand/zurich.t
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/default/admin/bodies.html | 4 | ||||
| -rw-r--r-- | templates/web/zurich/admin/body-form.html | 7 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit.html | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index fabaf8923..c0824521e 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -16,6 +16,7 @@ <th>[% loc('Name') %]</th> [% IF c.cobrand.moniker == 'zurich' %] <th>[% loc('Email') %]</th> + <th>[% loc('Deleted') %]</th> [% ELSE %] <th>[% loc('Category') %]</th> [% END %] @@ -23,7 +24,7 @@ [%- 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> + <tr[% IF c.cobrand.moniker == 'zurich' AND body.deleted %] class="muted"[% END %]> <td> [% IF c.cobrand.moniker == 'zurich' %] [% FILTER repeat(4*body.api_key) %] [% END %] @@ -39,6 +40,7 @@ </td> [% IF c.cobrand.moniker == 'zurich' %] <td>[% body.endpoint %]</td> + <td>[% IF body.deleted %]Yes[% END %]</td> [% ELSE %] <td> [% IF counts.$id %] diff --git a/templates/web/zurich/admin/body-form.html b/templates/web/zurich/admin/body-form.html index 5ae8eb8a6..4e570a058 100644 --- a/templates/web/zurich/admin/body-form.html +++ b/templates/web/zurich/admin/body-form.html @@ -10,7 +10,6 @@ <input type="text" name="endpoint" id="email" value="[% body.endpoint %]" size="50"> </p> -[% IF admin_type == 'super' %] <p> <label for="parent">[% loc('Parent') %]</label> <select name="parent" id="parent"> @@ -31,7 +30,11 @@ [% END %] </select> </p> -[% END %] + + <p> + <label for="deleted">[% loc('Flag as deleted') %]</label> + <input type="checkbox" name="deleted" id="deleted" value="1"[% ' checked' IF body.deleted %] /> + </p> <input type="hidden" name="send_method" value="Email"> <input type="hidden" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction %]"> diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 128e74766..723086c46 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -136,7 +136,7 @@ <select name="body_external" id="body_external"> <option value="">--</option> [% FOR body IN bodies %] - [% NEXT IF body.parent OR body.bodies %] + [% NEXT IF body.parent OR body.bodies OR body.deleted %] <option value="[% body.id %]"[% IF body.id == problem.bodies_str %] selected[% END %]>[% body.name %]</option> [% END %] </select> |