6 files changed, 30 insertions, 9 deletions
diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html
index ff0ec2f31..681337844 100644
--- a/templates/web/default/admin/list_updates.html
+++ b/templates/web/default/admin/list_updates.html
@@ -1,3 +1,4 @@
+[% IF updates.size %]
 <h2>[% loc('Updates') %]</h2>
 
 <table cellspacing="0" cellpadding="2" border="1">
@@ -36,3 +37,4 @@
     </tr>
 [% END -%]
 </table>
+[% END %]
diff --git a/templates/web/default/admin/report_blocks.html b/templates/web/default/admin/report_blocks.html
index bb9f34cb9..c2cffc352 100644
--- a/templates/web/default/admin/report_blocks.html
+++ b/templates/web/default/admin/report_blocks.html
@@ -22,3 +22,21 @@
       [% this_date.strftime('%d.%m.%Y') %]
     [% ELSE %][% no_time || '&nbsp;' %][% END %][% no_time = '' %]
 [%- END %]
+
+[% BLOCK sort_link %][% IF order == choice %][% c.uri_with( d => 1 - dir ) %][% ELSE %][% c.uri_with( { o => choice, d => 0 } ) %][% END %][% END %]
+
+[% BLOCK sort_arrow %]
+    [% IF order == choice %]
+        <span style="font-size:50%">
+        [% IF dir %]
+            &#9660;
+        [% ELSE %]
+            &#9650;
+        [% END %]
+        </span>
+    [% ELSE %]
+        <span style="font-size:50%; color: #999;">
+        &#9650;
+        </span>
+    [% END %]
+[% END %]
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html
index 8d0b8df88..91af70d14 100644
--- a/templates/web/default/admin/report_edit.html
+++ b/templates/web/default/admin/report_edit.html
@@ -57,7 +57,6 @@
 [% photo = problem.get_photo_params %]
 <li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% c.cobrand.base_url %][% photo.url %]">
 <br>
-[% IF rotated %]Photo may be cached for a while.<br>[% END %]
 <input type="submit" name="rotate_photo" value="[% loc('Rotate Left') %]">
 <input type="submit" name="rotate_photo" value="[% loc('Rotate Right') %]">
 <br>
diff --git a/templates/web/default/admin/reports.html b/templates/web/default/admin/reports.html
index 600f2b436..fab12cfce 100644
--- a/templates/web/default/admin/reports.html
+++ b/templates/web/default/admin/reports.html
@@ -2,11 +2,10 @@
 [% 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>
 
-
-[% IF searched %]
+[% IF problems.size %]
 <table cellspacing="0" cellpadding="2" border="1">
     <tr>
         <th>[% loc('ID') %]</th>
@@ -25,8 +24,10 @@
     [% INCLUDE 'admin/problem_row.html' %]
 </table>
 
-[% INCLUDE 'admin/list_updates.html' %]
+[% INCLUDE 'pagination.html', admin = 1, param = 'p' IF pager %]
 
 [% END %]
 
+[% INCLUDE 'admin/list_updates.html' %]
+
 [% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/default/admin/timeline.html b/templates/web/default/admin/timeline.html
index 4058f7f06..2c77e3fbd 100644
--- a/templates/web/default/admin/timeline.html
+++ b/templates/web/default/admin/timeline.html
@@ -34,7 +34,7 @@
             [% CASE 'alertSub' %]
                  [% tprintf(loc("Alert %d created for %s, type %s, parameters %s / %s"), item.obj.id, item.obj.user.email, item.obj.alert_type.ref, item.obj.parameter, item.obj.parameter2) | html %]
             [% CASE 'alertDel' %]
-                 [% tprintf(loc("Alert %d disabled (created %s)"), item.obj.id, item.obj.whensubscribed_local.strftime('%H:%M:%S %e %B %Y') ) %]
+                 [% tprintf(loc("Alert %d disabled (created %s)"), item.obj.id, item.obj.whensubscribed.strftime('%H:%M:%S %e %B %Y') ) %]
         [%- END %]
         <br />
     [%- END %] 
diff --git a/templates/web/default/admin/users.html b/templates/web/default/admin/users.html
index de0b74746..70833ff85 100644
--- a/templates/web/default/admin/users.html
+++ b/templates/web/default/admin/users.html
@@ -5,7 +5,7 @@
     <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search"  size="30" id="search" value="[% searched | html %]">
 </form>
 
-[% IF searched %]
+[% IF users.size %]
 
 <table cellspacing="0" cellpadding="2" border="1">
     <tr>
@@ -30,10 +30,11 @@
 [%- END -%]
 </table>
 
-[% ELSE %]
+[% END %]
 
+[% IF NOT searched %]
 <h2>[% loc('Add user') %]</h2>
-[% INCLUDE 'admin/user-form.html' %]
+[% INCLUDE 'admin/user-form.html', user = '' %]
 
 [% END %]