4 files changed, 17 insertions, 22 deletions
diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html
index d837919ad..4dd0aab3c 100644
--- a/templates/web/zurich/admin/header.html
+++ b/templates/web/zurich/admin/header.html
@@ -1,4 +1,15 @@
 [% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage' %]
+[%
+    states = {
+        'unconfirmed' = loc('Submitted'),
+        'confirmed' = loc('Open'),
+        'in progress' = loc('In progress'),
+        'planned' = loc('Planned'),
+        'fixed - council' = loc('Closed'),
+        'hidden' = loc('Hidden'),
+        'closed' = loc('Closed'),
+    }
+%]
 <style type="text/css">
 dt { clear: left; float: left; font-weight: bold; }
 dd { margin-left: 8em; }
diff --git a/templates/web/zurich/admin/index-sdm.html b/templates/web/zurich/admin/index-sdm.html
index d7277dd7d..0bec32cf9 100644
--- a/templates/web/zurich/admin/index-sdm.html
+++ b/templates/web/zurich/admin/index-sdm.html
@@ -17,6 +17,7 @@
     <tr>
         <th>[% loc('ID') %]</th>
         <th>[% loc('Title') %]</th>
+        <th>[% loc('State') %]</th>
         <th>[% loc('Category') %]</th>
         <th>[% loc('Created') %]</th>
         [% IF NOT no_edit %]
@@ -26,16 +27,6 @@
     <tr class="filter-row">
         <td colspan="6"><input type="text" placeholder="[%= loc('Filter report list') %]" /></td>
     </tr>
-[%- FOR problem IN problems %]
-    <tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]>
-        <td class="record-id">[% problem.id %]</td>
-        <td>[% PROCESS value_or_nbsp value=problem.title %]</td> 
-        <td>[% problem.category %]</td> 
-        <td>[% PROCESS format_date this_date=problem.created %]</td> 
-        [% IF NOT no_edit %]
-        <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
-        [% END %]
-    </tr>
-[%- END -%]
+[% INCLUDE 'admin/problem_row.html' %]
 </table>
 [% END %]
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
index 75cee6002..496bb6c14 100644
--- a/templates/web/zurich/admin/problem_row.html
+++ b/templates/web/zurich/admin/problem_row.html
@@ -1,14 +1,3 @@
-[%
-    states = {
-        'unconfirmed' = loc('Submitted'),
-        'confirmed' = loc('Open'),
-        'in progress' = loc('In progress'),
-        'planned' = loc('Planned'),
-        'fixed - council' = loc('Closed'),
-        'hidden' = loc('Hidden'),
-        'closed' = loc('Closed'),
-    }
-%]
 [%- FOR problem IN problems %]
     [% SET p_body = problem.bodies.values.0 %]
     [% NEXT IF admin_type == 'sdm' AND p_body.id != body.id %]
@@ -23,6 +12,8 @@
         <td>[% states.${problem.state} %]</td>
         <td>[% PROCESS value_or_nbsp value=problem.category %]</td>
         <td>[% PROCESS format_date this_date=problem.created %]</td>
+        [% IF NOT no_edit %]
         <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
+        [% END %]
     </tr>
 [%- END -%]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index 1815ed53e..4efecb52c 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -37,6 +37,8 @@
 <label class="inline" for="publish_photo">[% loc("Publish photo") %]</label></li>
 [% END %]
 
+<li>[% loc('State:') %] [% states.${problem.state} %]</li>
+
 <li><label for="internal_notes">[% loc('Internal notes:') %]</label>
 <textarea name='internal_notes' id='internal_notes' cols=60 rows=5>[% problem.extra.internal_notes | html %]</textarea></li>