Merge branch '191z-admin-tables' into zurich

Conflicts:
	templates/web/zurich/admin/header.html
	templates/web/zurich/admin/problem_row.html

5 files changed, 22 insertions, 10 deletions

diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html
index 4dd0aab3c..113839a65 100644
--- a/templates/web/zurich/admin/header.html
+++ b/templates/web/zurich/admin/header.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage' %]
+[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin' %]
 [%
     states = {
         'unconfirmed' = loc('Submitted'),
diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html
index eb111418a..18842d6e5 100644
--- a/templates/web/zurich/admin/index-dm.html
+++ b/templates/web/zurich/admin/index-dm.html
@@ -15,17 +15,19 @@
 [% INCLUDE 'admin/footer.html' %]
 
 [% BLOCK list %]
-<table cellspacing="0" cellpadding="2" border="1" class="admin">
+<table cellspacing="0" cellpadding="2" border="1">
     <tr>
         <th>[% loc('ID') %]</th>
-        <th>[% loc('Title') %]</th>
-        <th>[% loc('State') %]</th>
+        <th>[% loc('Description') %]</th>
         <th>[% loc('Category') %]</th>
-        <th>[% loc('Created') %]</th>
+        <th>[% loc('Submitted') %]</th>
+        <th>[% loc('Updated') %]</th>
+        <th>[% loc('Status') %]</th>
+        <th>[% loc('Subdivision') %]</th>
         <th>*</th>
     </tr>
     <tr class="filter-row">
-        <td colspan="6"><input type="text" placeholder="[%= loc('Filter report list') %]" /></td>
+        <td colspan="9"><input type="text" placeholder="[%= loc('Filter report list') %]" /></td>
     </tr>
 [% INCLUDE 'admin/problem_row.html' %]
 </table>
diff --git a/templates/web/zurich/admin/index-sdm.html b/templates/web/zurich/admin/index-sdm.html
index f05cbe0a0..11276115a 100644
--- a/templates/web/zurich/admin/index-sdm.html
+++ b/templates/web/zurich/admin/index-sdm.html
@@ -13,7 +13,7 @@
 [% INCLUDE 'admin/footer.html' %]
 
 [% BLOCK list %]
-<table cellspacing="0" cellpadding="2" border="1" class="admin">
+<table cellspacing="0" cellpadding="2" border="1">
     <tr>
         <th>[% loc('ID') %]</th>
         <th>[% loc('Title') %]</th>
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
index c31ada598..7fddddf8e 100644
--- a/templates/web/zurich/admin/problem_row.html
+++ b/templates/web/zurich/admin/problem_row.html
@@ -11,11 +11,21 @@
         [%- problem.id %]
         [%- END -%]</td>
         <td>[% PROCESS value_or_nbsp value=problem.title %]</td>
-        <td>[% states.${problem.state} %]</td>
         <td>[% PROCESS value_or_nbsp value=problem.category %]</td>
         <td>[% PROCESS format_date this_date=problem.created %]</td>
+        <td>[% PROCESS format_date this_date=problem.lastupdate %]</td>
+        <td>[% states.${problem.state} %]</td>
+        [% IF admin_type != 'sdm' %]
+            <td>
+                [%- IF p_body.parent.id AND p_body.parent.parent.id -%][%# ...it's a subdivision %]
+                    [% PROCESS value_or_nbsp value=p_body.name %]
+                [%- ELSE -%]
+                    &nbsp;
+                [%- END -%]
+            </td>
+        [% END %]
         [% IF NOT no_edit %]
-        <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
+            <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
         [% END %]
     </tr>
 [%- END -%]
diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss
index 715cf6e97..a0c26a1cf 100644
--- a/web/cobrands/zurich/_zurich.scss
+++ b/web/cobrands/zurich/_zurich.scss
@@ -31,7 +31,7 @@ a:hover {
     color: #3c3c3c;
 }
 
-table.admin {
+.admin table {
   width: 100%;
   font-size: 0.9em;
   border: 1px solid $table_border_color;