Add body deletion to admin interface.

3 files changed, 11 insertions, 7 deletions

diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html
index 3925b9b2c..8bf7954f3 100644
--- a/templates/web/default/admin/bodies.html
+++ b/templates/web/default/admin/bodies.html
@@ -16,15 +16,15 @@
           <th>[% loc('Name') %]</th>
         [% IF c.cobrand.moniker == 'zurich' %]
           <th>[% loc('Email') %]</th>
-          <th>[% loc('Deleted') %]</th>
         [% ELSE %]
           <th>[% loc('Category') %]</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 c.cobrand.moniker == 'zurich' AND body.deleted %] class="muted"[% END %]>
+      <tr[% IF body.deleted %] class="adminhidden"[% END %]>
           <td>
             [% IF c.cobrand.moniker == 'zurich' %]
               [% FILTER repeat(4*body.api_key) %]&nbsp;[% END %]
@@ -40,7 +40,6 @@
           </td>
       [% IF c.cobrand.moniker == 'zurich' %]
           <td>[% body.endpoint %]</td>
-          <td>[% IF body.deleted %][% loc('Yes') %][% END %]</td>
       [% ELSE %]
           <td>
           [% IF counts.$id %]
@@ -55,6 +54,7 @@
           [% END %]
           </td>
       [% END %]
+          <td>[% IF body.deleted %][% loc('Yes') %][% END %]</td>
       </tr>
   [%- END %]
   </table>
diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html
index d334bf401..f2eb505ab 100644
--- a/templates/web/default/admin/body-form.html
+++ b/templates/web/default/admin/body-form.html
@@ -78,6 +78,14 @@
     </p>
 
     <div class="admin-hint">
+      <p>[% loc( "You can mark a body as deleted if you do not want it to be active on the site." ) %]</p>
+    </div>
+    <p>
+        <label for="deleted">[% loc('Flag as deleted') %]</label>
+        <input type="checkbox" name="deleted" id="deleted" value="1"[% ' checked' IF body.deleted %]>
+    </p>
+
+    <div class="admin-hint">
       <p>
         [% loc(
           "The <strong>send method</strong> determines how problem reports will be sent to the body.
diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss
index 5cf76bf87..746da4ece 100644
--- a/web/cobrands/zurich/_zurich.scss
+++ b/web/cobrands/zurich/_zurich.scss
@@ -36,10 +36,6 @@ body.frontpage #zurich-footer-wrapper {
     color: #3c3c3c;
 }
 
-.muted, .muted a {
-    color: #aaa;
-}
-
 #form_sign_in_yes {
     .form-txt-submit-box {
         clear: both;