Zurich admin table styles carried across to default admin templates, and tidy display of admin a bit.

4 files changed, 27 insertions, 35 deletions

diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html
index 5af92a23c..fc8b1fae1 100644
--- a/templates/web/default/admin/flagged.html
+++ b/templates/web/default/admin/flagged.html
@@ -9,14 +9,8 @@
         <th>[% loc('ID') %]</th>
         <th>[% loc('Title') %]</th>
         <th>[% loc('Name') %]</th>
-        <th>[% loc('Email') %]</th>
-        <th>[% loc('Council') %]</th>
-        <th>[% loc('Category') %]</th>
-        <th>[% loc('Anonymous') %]</th>
-        <th>[% loc('Cobrand') %]</th>
-        <th>[% loc('Created') %]</th>
+        <th>[% loc('Body') %]</th>
         <th>[% loc('State') %]</th>
-        <th>[% loc('When sent') %]</th>
         <th>*</th>
     </tr>
     [% INCLUDE 'admin/problem_row.html' %]
diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html
index 93254f5e3..6282bf383 100644
--- a/templates/web/default/admin/header.html
+++ b/templates/web/default/admin/header.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage' %]
+[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin' %]
 <style type="text/css">
 dt { clear: left; float: left; font-weight: bold; }
 dd { margin-left: 8em; }
diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html
index 1533f8dd2..ec8fda6c5 100644
--- a/templates/web/default/admin/problem_row.html
+++ b/templates/web/default/admin/problem_row.html
@@ -1,6 +1,6 @@
 [%- FOR problem IN problems %]
     <tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]>
-        <td>[%- IF problem.is_visible -%]
+        <td class="record-id">[%- IF problem.is_visible -%]
         [%- cobrand_data = problem.cobrand_data %]
         [%- cobrand_data = c.data_for_generic_problem IF !problem.cobrand %]
         <a href="[% c.uri_for_email( '/report', problem.id, cobrand_data ) %]">[% problem.id %]</a>
@@ -8,26 +8,30 @@
         [%- problem.id %]
         [%- END -%]</td> 
         <td>[% PROCESS value_or_nbsp value=problem.title %]</td> 
-        <td>[% PROCESS value_or_nbsp value=problem.name %]</td> 
-        <td>[% PROCESS value_or_nbsp value=problem.user.email %]</td> 
-        <td>[%- IF edit_body_contacts -%]
-          [% FOR body IN problem.bodies.values %]
-            <a href="[% c.uri_for('body', body.id ) %]">[% PROCESS value_or_nbsp value=body.name %]</a>
-          [% END %]
-        [%- ELSE -%]
-            [%- PROCESS value_or_nbsp value=problem.bodies_str -%]
-        [%- END -%]</td>
-        <td>[% PROCESS value_or_nbsp value=problem.category %]</td> 
-        <td>[% IF problem.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> 
-        <td>[% problem.cobrand %]<br>[% problem.cobrand_data | html %]</td> 
-        <td>[% PROCESS format_time time=problem.created %]</td> 
-        <td>[% problem.state %]<small>
-                [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %]&nbsp;[% PROCESS format_time time=problem.confirmed %][% END -%]
-                [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
-                [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
-                [%- IF problem.is_open %]<br>[% loc('Last&nbsp;update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small>
-        </td> 
-        <td>[% PROCESS format_time time=problem.whensent %]</td> 
+        <td>
+            [% PROCESS value_or_nbsp value=problem.name %]
+            <br>[% PROCESS value_or_nbsp value=problem.user.email %]
+            <br>[% loc('Anonymous') %]: [% IF problem.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]
+        </td>
+        <td>
+            [% PROCESS value_or_nbsp value=problem.category %]
+            <br>[%- IF edit_body_contacts -%]
+              [% FOR body IN problem.bodies.values %]
+                <a href="[% c.uri_for('body', body.id ) %]">[% PROCESS value_or_nbsp value=body.name %]</a>
+              [% END %]
+            [%- ELSE -%]
+                [%- PROCESS value_or_nbsp value=problem.bodies_str -%]
+            [%- END -%]
+            <br>[% problem.cobrand %]<br>[% problem.cobrand_data | html %]
+        </td>
+        <td>[% problem.state %]<br><small>
+            [% loc('Created') %]:&nbsp;[% PROCESS format_time time=problem.created %]
+            <br>[% loc('When sent') %]:&nbsp;[% PROCESS format_time time=problem.whensent %]
+            [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %]&nbsp;[% PROCESS format_time time=problem.confirmed %][% END -%]
+            [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
+            [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
+            [%- IF problem.is_open %]<br>[% loc('Last&nbsp;update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
+        </small></td>
         <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
     </tr>
 [%- END -%]
diff --git a/templates/web/default/admin/reports.html b/templates/web/default/admin/reports.html
index fab12cfce..d57b2f53e 100644
--- a/templates/web/default/admin/reports.html
+++ b/templates/web/default/admin/reports.html
@@ -11,14 +11,8 @@
         <th>[% loc('ID') %]</th>
         <th>[% loc('Title') %]</th>
         <th>[% loc('Name') %]</th>
-        <th>[% loc('Email') %]</th>
         <th>[% loc('Body') %]</th>
-        <th>[% loc('Category') %]</th>
-        <th>[% loc('Anonymous') %]</th>
-        <th>[% loc('Cobrand') %]</th>
-        <th>[% loc('Created') %]</th>
         <th>[% loc('State') %]</th>
-        <th>[% loc('When sent') %]</th>
         <th>*</th>
     </tr>
     [% INCLUDE 'admin/problem_row.html' %]