Tidy up some tab highlighting, search display, date formatting.

4 files changed, 12 insertions, 10 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 08ac82298..7479bdba5 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -485,7 +485,7 @@ sub reports : Path('reports') {
     my ( $self, $c ) = @_;
 
     if (my $search = $c->req->param('search')) {
-        $c->stash->{searched} = 1;
+        $c->stash->{searched} = $search;
 
         my $site_restriction = $c->cobrand->site_restriction;
 
diff --git a/templates/web/zurich/admin/body.html b/templates/web/zurich/admin/body.html
index 143e61f83..dd1b0b844 100644
--- a/templates/web/zurich/admin/body.html
+++ b/templates/web/zurich/admin/body.html
@@ -1,4 +1,5 @@
 [% INCLUDE 'admin/header.html' title=tprintf(loc('Council contacts for %s'), body.name) -%]
+[% PROCESS 'admin/report_blocks.html' %]
 
 [% IF updated %]
 <p>
@@ -21,7 +22,7 @@
                 <td>[% contact.email | html %]</td>
                 <td>[% contact.editor %]</td>
                 <td>[% contact.note | html %]</td>
-                <td>[% contact.whenedited.ymd _ ' ' _ contact.whenedited.hms %]</td>
+                <td>[% PROCESS format_date this_date=contact.whenedited %]</td>
             </tr>
         [% END %]
     </table>
diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html
index 580f04fcf..d0c399a83 100644
--- a/templates/web/zurich/admin/header.html
+++ b/templates/web/zurich/admin/header.html
@@ -22,21 +22,21 @@ select { width: auto; }
     <div class="admin-nav">
         <ul>
             [% pagename = c.req.uri.path %]
-            [% pagename = pagename.replace('/admin/?(\w*)', '$1') %]
+            [% pagename = pagename.replace('/admin/?(\w*).*', '$1') %]
 
             <li [% IF pagename == 'summary' OR pagename == '' %]class="current"[% END %]>
                 <a href="/admin/summary">[% loc('Summary') %]</a>
             </li>
-            <li [% IF pagename == 'reports' %]class="current"[% END %]>
+            <li [% IF pagename == 'reports' OR pagename == 'report_edit' %]class="current"[% END %]>
                 <a href="/admin/reports">[% loc('Reports') %]</a>
             </li>
             [% IF admin_type == 'dm' OR admin_type == 'super' %]
-            <li [% IF pagename == 'bodies' %]class="current"[% END %]>
+            <li [% IF pagename == 'bodies' OR pagename == 'body' %]class="current"[% END %]>
                 <a href="/admin/bodies">[% loc('Bodies') %]</a>
             </li>
             [% END %]
             [% IF admin_type == 'super' %]
-            <li [% IF pagename == 'users' %]class="current"[% END %]>
+            <li [% IF pagename == 'users' OR pagename == 'user_edit' %]class="current"[% END %]>
                 <a href="/admin/users">[% loc('Users') %]</a>
             </li>
             [% END %]
diff --git a/templates/web/zurich/admin/reports.html b/templates/web/zurich/admin/reports.html
index 207083926..f8c022630 100644
--- a/templates/web/zurich/admin/reports.html
+++ b/templates/web/zurich/admin/reports.html
@@ -2,7 +2,7 @@
 [% PROCESS 'admin/report_blocks.html' %]
 
 <form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
-    <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search"  size="30" id="search">
+    <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search"  size="30" id="search" value="[% searched | html %]">
 </form>
 
 
@@ -10,10 +10,11 @@
 <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>*</th>
     </tr>
     [% INCLUDE 'admin/problem_row.html', page = 'search' %]