4 files changed, 9 insertions, 12 deletions
diff --git a/app/views/admin_general/_admin_navbar.rhtml b/app/views/admin_general/_admin_navbar.rhtml
index 49592c545..5cc740f70 100644
--- a/app/views/admin_general/_admin_navbar.rhtml
+++ b/app/views/admin_general/_admin_navbar.rhtml
@@ -20,5 +20,3 @@
     </div>
   </div>
 </div>
-
-
diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml
index 977af204f..9940434ac 100644
--- a/app/views/admin_general/index.rhtml
+++ b/app/views/admin_general/index.rhtml
@@ -16,6 +16,7 @@
   </div>
 </div>
 
+<hr>
 
 <div class="row">
   <div class="span12">
@@ -36,9 +37,9 @@
               <tr>
                 <td>
                   <% if message.get_body_for_quoting.strip.size == 0 %>
-                      <%= link_to "(no body)", "request/show_raw_email/" + message.raw_email_id.to_s %>
+                      <%= link_to "(no body)", admin_request_show_raw_email_path(message.raw_email_id) %>
                   <% else %>
-                      <%= link_to excerpt(message.get_body_for_quoting, "", 60), "request/show_raw_email/" + message.raw_email_id.to_s %>
+                      <%= link_to excerpt(message.get_body_for_quoting, "", 60), admin_request_show_raw_email_path(message.raw_email_id) %>
                   <% end %>
                 </td>
                 <td class="span2">
diff --git a/app/views/admin_general/stats.rhtml b/app/views/admin_general/stats.rhtml
index 1a8035006..27dc25ee0 100644
--- a/app/views/admin_general/stats.rhtml
+++ b/app/views/admin_general/stats.rhtml
@@ -1,5 +1,4 @@
 <% @title = "Statistics" %>
-
 <div class="hero-unit">
   <h2><%=@public_body_count%> public authorities</h2>
   <h2><%=@info_request_count%> requests, <%=@outgoing_message_count%> outgoing messages, <%=@incoming_message_count%> incoming messages</h2>
diff --git a/app/views/admin_general/timeline.rhtml b/app/views/admin_general/timeline.rhtml
index 9b9f0918e..8fd8875b6 100644
--- a/app/views/admin_general/timeline.rhtml
+++ b/app/views/admin_general/timeline.rhtml
@@ -1,12 +1,12 @@
 <% @title = "Timeline" %>
 <div class="btn-toolbar">
   <div class="btn-group">
-    <a class="btn" href="?hour=1">Hour</a>
-    <a class="btn" href="?day=1">Day</a>
-    <a class="btn" href="?">2 days</a>
-    <a class="btn" href="?week=1">Week</a>
-    <a class="btn" href="?month=1">Month</a>
-    <a class="btn" href="?all=1">All time</a>
+    <%= link_to "Hour", admin_timeline_path(:hour => 1), :class => "btn" %>
+    <%= link_to "Day", admin_timeline_path(:day => 1), :class => "btn" %>
+    <%= link_to "2 days", admin_timeline_path, :class => "btn" %>
+    <%= link_to "Week", admin_timeline_path(:week => 1), :class => "btn" %>
+    <%= link_to "Month", admin_timeline_path(:month => 1), :class => "btn" %>
+    <%= link_to "All time", admin_timeline_path(:all => 1), :class => "btn" %>
   </div>
 </div>
 <div class="row">
@@ -32,7 +32,6 @@
 
     <% if event.is_a? InfoRequestEvent %>
         <%= request_both_links(event.info_request) %>
-
         <% if event.event_type == 'edit' %>
             was edited by administrator <strong><%=h event.params[:editor] %></strong>.
             <% for p in ['title', 'prominence', 'described_state', 'awaiting_description']