7 files changed, 28 insertions, 25 deletions
diff --git a/app/views/admin_general/timeline.rhtml b/app/views/admin_general/timeline.rhtml
index 39a4b3e36..eecab4823 100644
--- a/app/views/admin_general/timeline.rhtml
+++ b/app/views/admin_general/timeline.rhtml
@@ -65,6 +65,8 @@
             had incoming message deleted by administrator <strong><%=h event.params[:editor] %></strong>.
         <% elsif event.event_type == 'destroy_outgoing' %>
             had outgoing message deleted by administrator <strong><%=h event.params[:editor] %></strong>.
+        <% elsif event.event_type == 'hide' %>
+            was hidden by administrator <strong><%=h event.params[:editor] %></strong>.
         <% elsif event.event_type == 'redeliver_outgoing' %>
             had incoming message redelivered to another request by administrator <strong><%=h event.params[:editor] %></strong>.
          <% elsif event.event_type == 'response' %>
diff --git a/app/views/admin_request/hidden_user_explanation.rhtml b/app/views/admin_request/hidden_user_explanation.rhtml
index aaea49fb6..64387ffee 100644
--- a/app/views/admin_request/hidden_user_explanation.rhtml
+++ b/app/views/admin_request/hidden_user_explanation.rhtml
@@ -2,7 +2,7 @@ Dear <%= name_to %>,
 
 Your request '<%= info_request.title %>' at <%= info_request_url %> has been reviewed by moderators.  
 
-We consider it <% if reason == 'not_foi' %>is not a valid FOI request<% else %>to be vexatious<% end%>, and have therefore hidden it from other users.  Please reply to this email if you would like to discuss this decision further.
+We consider it <% if reason == 'not_foi' %>is not a valid FOI request<% else %>to be vexatious<% end%>, and have therefore hidden it from other users. You will still be able to view it while logged in to the site. Please reply to this email if you would like to discuss this decision further.
 
 Yours,
 
diff --git a/app/views/general/_orglink.rhtml b/app/views/general/_orglink.rhtml
index 7d74dbaac..fbe688d85 100644
--- a/app/views/general/_orglink.rhtml
+++ b/app/views/general/_orglink.rhtml
@@ -1,2 +1,2 @@
-<%-# Put the link to your organisation here, or leave blank -%>
-<%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %> 
+<%# Put the link to your organisation here, or leave blank %>
+<%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %>
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index 65670538d..d85eecbf2 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -13,15 +13,15 @@
 
     <p>
     <strong><%= link_to 'Alaveteli', main_url('/') %> admin:</strong> 
-    <%= link_to 'Summary', admin_general_index_path %>
-    | <%= link_to 'Timeline', admin_timeline_path %>
-    | <%= link_to 'Stats', admin_stats_path %>
-    | <%= link_to 'Debug', admin_debug_path %>
+    <%= link_to 'Summary', admin_url("") %>
+    | <%= link_to 'Timeline', admin_url("timeline") %>
+    | <%= link_to 'Stats', admin_url("stats") %>
+    | <%= link_to 'Debug', admin_url("debug") %>
     <strong>View:</strong>
-    <%= link_to 'Authorities', admin_body_list_path %>
-    | <%= link_to 'Requests', admin_request_list_path %>
-    | <%= link_to 'Users', admin_user_list_path %>
-    | <%= link_to 'Tracks', admin_track_list_path %>
+    <%= link_to 'Authorities', admin_url("body/list") %>
+    | <%= link_to 'Requests', admin_url("request/list") %>
+    | <%= link_to 'Users', admin_url("user/list") %>
+    | <%= link_to 'Tracks', admin_url("track/list") %>
     </p>
     <%= render :partial => 'general/locale_switcher' %>
 
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index bc9dfb02d..ed0a52e85 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -147,7 +147,6 @@
 
     <%= render :partial => 'general/footer' %>
 
-    <%= render :partial => 'general/before_body_end' %>
 </div>
 <div id="other-country-notice"></div>
 <div id="link_box"><span class="close-button">X</span>
@@ -157,18 +156,20 @@
 </div>
     <%
       ga_code = MySociety::Config.get('GA_CODE', '')
-      unless ga_code.empty?
-    %>
-    <script>
-      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script>
-      var pageTracker = _gat._getTracker("<%=ga_code%>");
-      pageTracker._trackPageview();
-    </script>
-    <% end %>
+      
+      unless ga_code.empty? %>
+        <script>
+          var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+          document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+        </script>
+        <script>
+          var pageTracker = _gat._getTracker("<%=ga_code%>");
+          pageTracker._trackPageview();
+        </script>
+        
+      <% end %>
 
+      <%= render :partial => 'general/before_body_end' %>
     </body>
 </html>
 
diff --git a/app/views/request/_bubble.rhtml b/app/views/request/_bubble.rhtml
index 87079e9ea..331c2163e 100644
--- a/app/views/request/_bubble.rhtml
+++ b/app/views/request/_bubble.rhtml
@@ -13,7 +13,7 @@
                                     :file_name => a.display_filename + '.html') 
                         %>
                         <% img_filename = "icon_" + a.content_type.sub('/', '_') + "_large.png"
-                        full_filename = File.join(File.dirname(__FILE__), "../../../public/images", img_filename)
+                        full_filename = File.expand_path(File.join(File.dirname(__FILE__), "../../../public/images", img_filename))
                         if File.exist?(full_filename) %>
                             <a href="<%=attachment_url%>"><img class="attachment_image" alt="Attachment" src="/images/<%=img_filename%>"></a>
                         <% else %>
diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml
index bca142fa9..956b3988b 100644
--- a/app/views/request/_sidebar.rhtml
+++ b/app/views/request/_sidebar.rhtml
@@ -13,7 +13,7 @@
      <% else %>
       <p><%= _('Requests for personal information and vexatious requests are not considered valid for FOI purposes (<a href="/help/about">read more</a>).') %>
        <p><%= ('If you believe this request is not suitable, you can report it for attention by the site administrators') %></p>
-       <%= link_to _("Report this request"), report_path, :class => "link_button_green" %>
+       <%= link_to _("Report this request"), report_path, :class => "link_button_green", :method => "POST" %>
       <% end %>
     <% end %>
     <h2><%= _("Act on what you've learnt") %></h2>