Merge branch 'issues/forcouncils/192-unused-categories'

7 files changed, 38 insertions, 39 deletions

diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html
index 5e8c6a164..82032c0c3 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 %]>
+      <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 | html %]</a>
             <br>[% cat.email | html %]</td>
         <td>
-            [% loc('Confirmed') %]:&nbsp;
-            [%- IF cat.confirmed %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]
-            <br>[% loc('Deleted') %]:&nbsp;
-            [%- IF cat.deleted %]<strong>[% loc('Yes') %]</strong>[% ELSE %][% loc('No') %][% END %]
-        </td>
-        <td>
-            [% loc('Private') %]:&nbsp;
-            [%- cat.non_public ? loc('Yes') : loc('No') %]
-            <br>[% loc('Devolved') %]:&nbsp;
-            [%- 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>
diff --git a/templates/web/base/admin/category_edit.html b/templates/web/base/admin/category_edit.html
index 5eb3c943e..ea3fbaa79 100644
--- a/templates/web/base/admin/category_edit.html
+++ b/templates/web/base/admin/category_edit.html
@@ -51,8 +51,7 @@
     <tr>
         <th>[% loc('When edited') %]</th>
         <th>[% loc('Email') %]</th>
-        <th>[% loc('Confirmed') %]</th>
-        <th>[% loc('Deleted') %]</th>
+        <th>[% loc('State') %]</th>
         <th>[% loc('Editor') %]</th>
         <th>[% loc('Note') %]</th>
     </tr>
@@ -61,8 +60,7 @@
     <tr>
         <td>[% contact.whenedited.ymd _ ' ' _ contact.whenedited.hms %]</td>
         <td>[% PROCESS highlightchanged old=prev new=contact value='email' %]</td>
-        <td>[% PROCESS highlightchanged_yesno old=prev new=contact value='confirmed' %]</td>
-        <td>[% PROCESS highlightchanged_yesno old=prev new=contact value='deleted' %]</td>
+        <td>[% PROCESS highlightchanged old=prev new=contact value='state' %]</td>
         <td>[% contact.editor | html %]</td>
         <td>[% contact.note | html %]</td>
     </tr>
diff --git a/templates/web/base/admin/contact-form.html b/templates/web/base/admin/contact-form.html
index 493d8020f..0694459cb 100644
--- a/templates/web/base/admin/contact-form.html
+++ b/templates/web/base/admin/contact-form.html
@@ -38,24 +38,23 @@
 
   <div class="admin-hint">
     <p>
-        [% loc("Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.
-                If you are not sure of the origin or validity of the contact, leave this unchecked.") %]
+        [%
+loc("Use <strong>confirmed</strong> to indicate that this contact has been
+confirmed as correct. If you are not sure of the origin or validity of the
+contact, use <strong>unconfirmed</strong>. <strong>inactive</strong> will
+remove the category from use when reporting problems, but keep it available in
+map filters, and <strong>deleted</strong> will remove the category from there
+as well.") %]
     </p>
   </div>
   <p>
-    <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed OR contact.confirmed == "" %]>
-    <label for="confirmed" class="inline">[% loc('Confirmed') %]</label>
-  </p>
-
-  <div class="admin-hint">
-    <p>
-      [% loc("Check <strong>deleted</strong> to remove the category from use. 
-        It will not appear as an available category in the drop-down menu on the report-a-problem page.") %]
-    </p>
-  </div>
-  <p>
-    <input type="checkbox" name="deleted" value="1" id="deleted"[% ' checked' IF contact.deleted %]>
-    <label for="deleted" class="inline">[% loc('Deleted') %]</label>
+    <label for="state">[% loc('State') %]</label>
+    <select name="state" id="state">
+      <option value="unconfirmed"[% ' selected' IF contact.state == 'unconfirmed' %]>[% loc('Unconfirmed') %]
+      <option value="confirmed"[% ' selected' IF contact.state == 'confirmed' || contact.state == "" %]>[% loc('Confirmed') %]
+      <option value="inactive"[% ' selected' IF contact.state == 'inactive' %]>[% loc('Inactive') %]
+      <option value="deleted"[% ' selected' IF contact.state == 'deleted' %]>[% loc('Deleted') %]
+    </select>
   </p>
 
   <div class="admin-hint">
diff --git a/templates/web/base/admin/council_contacts.txt b/templates/web/base/admin/council_contacts.txt
index 2d1e04bfa..ffab83ab6 100644
--- a/templates/web/base/admin/council_contacts.txt
+++ b/templates/web/base/admin/council_contacts.txt
@@ -1,4 +1,4 @@
 [% WHILE ( contact = contacts.next ) -%]
-[%- NEXT IF contact.deleted || ! contact.confirmed %]
+[%- NEXT IF contact.state != 'confirmed' %]
 [% contact.category %]	[% contact.email %]
 [%- END %]
diff --git a/templates/web/base/status/stats.html b/templates/web/base/status/stats.html
index 0f201920d..02f9de904 100644
--- a/templates/web/base/status/stats.html
+++ b/templates/web/base/status/stats.html
@@ -10,8 +10,8 @@
     questionnaires_1 = questionnaires.1 | format_number;
     total_bodies = bodies.size | format_number;
     contacts_total = contacts.total | format_number;
-    contacts_1 = contacts.1 | format_number;
-    contacts_0 = contacts.0 | format_number;
+    contacts_confirmed = contacts.confirmed | format_number;
+    contacts_unconfirmed = contacts.unconfirmed | format_number;
 -%]
 
 <ul>
@@ -24,5 +24,5 @@
     <li>[% tprintf( loc('%s confirmed alerts, %s unconfirmed'), decode(alerts_1), decode(alerts_0)) %]</li>
     <li>[% tprintf( loc('%s questionnaires sent &ndash; %s answered (%s%%)'), decode(questionnaires_total), decode(questionnaires_1), questionnaires_pc) %]</li>
     <li>[% tprintf( loc('%s bodies'), decode(total_bodies)) %],
-        [% tprintf( loc('%s council contacts &ndash; %s confirmed, %s unconfirmed'), decode(contacts_total), decode(contacts_1), decode(contacts_0)) %]</li>
+        [% tprintf( loc('%s council contacts &ndash; %s confirmed, %s unconfirmed'), decode(contacts_total), decode(contacts_confirmed), decode(contacts_unconfirmed)) %]</li>
 </ul>
diff --git a/templates/web/zurich/admin/contact-form.html b/templates/web/zurich/admin/contact-form.html
index dddfc6d01..aaf7a1797 100644
--- a/templates/web/zurich/admin/contact-form.html
+++ b/templates/web/zurich/admin/contact-form.html
@@ -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 &ndash; %s confirmed, %s unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li>
+    <li>[% tprintf( loc('%s council contacts &ndash; %s confirmed, %s unconfirmed'), contacts.total, contacts.confirmed, contacts.unconfirmed) %]</li>
 </ul>
 
 <h2>[% loc('Problem breakdown by state') %]</h2>