10 files changed, 33 insertions, 16 deletions
diff --git a/app/views/admin_request/edit.html.erb b/app/views/admin_request/edit.html.erb
index 0e9c68aea..552b31bbb 100644
--- a/app/views/admin_request/edit.html.erb
+++ b/app/views/admin_request/edit.html.erb
@@ -33,7 +33,7 @@
    <p><label for="info_request_tag_string"><strong>Tags</strong> <small>(space separated, can use key:value)</small></label><br/>
    <%= text_field 'info_request', 'tag_string', :size => 60  %></p>
 
-   <p><%= submit_tag 'Save changes', :accesskey => 's' %>
+   <p><%= submit_tag 'Save changes', :accesskey => 's', :class => 'btn btn-primary' %>
    </p>
 
   <p><strong>Note:</strong> To edit the actual request body text, click edit
@@ -49,13 +49,17 @@
 
 <hr>
 
+<div class="well">
+
 <%= form_tag admin_request_destroy_path(@info_request) do %>
     <p>
-    <strong>This is permanent and irreversible!</strong> <%= submit_tag 'Destroy request entirely' %>
+    <strong>This is permanent and irreversible!</strong> <%= submit_tag 'Destroy request entirely', :class => 'btn btn-danger' %>
     <br>Use it mainly if someone posts private information, e.g. made a Data Protection request. It
     destroys all responses and tracks as well.
     </p>
 
 <% end %>
 
+</div>
+
 <hr>
diff --git a/app/views/general/_frontpage_bodies_list.html.erb b/app/views/general/_frontpage_bodies_list.html.erb
index 44321f14a..1c35c55ad 100644
--- a/app/views/general/_frontpage_bodies_list.html.erb
+++ b/app/views/general/_frontpage_bodies_list.html.erb
@@ -3,9 +3,10 @@
   <div id="examples_0">
     <h3><%= _("Who can I request information from?") %></h3>
     <%= _("{{site_name}} covers requests to {{number_of_authorities}} authorities, including:",
-        :site_name => site_name, :number_of_authorities => PublicBody.visible.count) %>
+        :site_name => site_name,
+        :number_of_authorities => number_with_delimiter(PublicBody.visible.count)) %>
     <ul>
-        <% for popular_body in popular_bodies %>
+        <% popular_bodies.each do |popular_body| %>
             <li><%=public_body_link(popular_body)%>
              <%= n_('{{count}} request', '{{count}} requests', popular_body.info_requests_count, :count => popular_body.info_requests_count) %>
             </li>
diff --git a/app/views/general/_frontpage_new_request.html.erb b/app/views/general/_frontpage_new_request.html.erb
index 499b60eb5..5b987b320 100644
--- a/app/views/general/_frontpage_new_request.html.erb
+++ b/app/views/general/_frontpage_new_request.html.erb
@@ -4,4 +4,4 @@
   Information<br/>
   request</strong>") %>
 </h1>
-<a class="link_button_green_large" href="<%= select_authority_path %>"><%= _("Start now &raquo;") %></a>
+<a class="link_button_green_large" href="<%= select_authority_path %>"><%= _("Make a request &raquo;") %></a>
diff --git a/app/views/general/_frontpage_requests_list.html.erb b/app/views/general/_frontpage_requests_list.html.erb
index d7d9184c4..39187f3f0 100644
--- a/app/views/general/_frontpage_requests_list.html.erb
+++ b/app/views/general/_frontpage_requests_list.html.erb
@@ -8,9 +8,10 @@
     <% end %>
   </h3>
    <%= _("{{site_name}} users have made {{number_of_requests}} requests, including:",
-    :site_name => site_name, :number_of_requests => InfoRequest.visible.count) %>
+    :site_name => site_name,
+    :number_of_requests => number_with_delimiter(InfoRequest.visible.count)) %>
     <ul>
-      <% for event in @request_events %>
+      <% @request_events.each do |event| %>
         <li>
           <% if @request_events_all_successful %>
             <%= _("{{public_body_link}} answered a request about",
diff --git a/app/views/general/_frontpage_search_box.html.erb b/app/views/general/_frontpage_search_box.html.erb
index 890602416..f77bd97fc 100644
--- a/app/views/general/_frontpage_search_box.html.erb
+++ b/app/views/general/_frontpage_search_box.html.erb
@@ -2,7 +2,8 @@
   <%= _("Search over<br/>
   <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>
   <strong>{{number_of_authorities}} authorities</strong>",
-  :number_of_requests => InfoRequest.visible.count, :number_of_authorities => PublicBody.visible.count) %>
+  :number_of_requests => number_with_delimiter(InfoRequest.visible.count),
+  :number_of_authorities => number_with_delimiter(PublicBody.visible.count)) %>
 </h2>
 <form id="search_form" method="post" action="<%= search_redirect_path %>">
   <div>
diff --git a/app/views/general/_locale_switcher.html.erb b/app/views/general/_locale_switcher.html.erb
index a318f61f3..7d64c9069 100644
--- a/app/views/general/_locale_switcher.html.erb
+++ b/app/views/general/_locale_switcher.html.erb
@@ -1,7 +1,7 @@
- <% if FastGettext.default_available_locales.length > 1 && !params.empty? %>
+ <% if FastGettext.default_available_locales.any? && !params.empty? %>
    <div id="user_locale_switcher">
      <div class="btn-group">
-     <% for possible_locale in FastGettext.default_available_locales %>
+     <% FastGettext.default_available_locales.each do |possible_locale| %>
       <% if possible_locale == FastGettext.locale %>
         <a href="#" class="btn disabled"><%= locale_name(possible_locale) %></a>
       <% else %>
diff --git a/app/views/public_body/_list_sidebar_extra.html.erb b/app/views/public_body/_list_sidebar_extra.html.erb
index 290593d6a..6e683d7a1 100644
--- a/app/views/public_body/_list_sidebar_extra.html.erb
+++ b/app/views/public_body/_list_sidebar_extra.html.erb
@@ -1,3 +1,8 @@
+<% if AlaveteliConfiguration::public_body_statistics_page %>
+  <p>
+    <%= link_to _('Public authority statistics'), public_bodies_statistics_path %>
+  </p>
+<% end %>
 <p>
   <%= link_to _('Are we missing a public authority?'), help_requesting_path + '#missing_body' %>
 </p>
diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index a9c50e657..9352747ea 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -127,7 +127,10 @@
             <% if @xapian_requests.results.empty? %>
                 <p><% _('There were no requests matching your query.') %></p>
             <% else %>
-                  <p> <%= _('Only requests made using {{site_name}} are shown.', :site_name => site_name) %></p>
+                  <p>
+                    <%= _('Only requests made using {{site_name}} are shown.', :site_name => site_name) %>
+                    <%= link_to _('?'), help_about_path %>
+                  </p>
             <% end %>
 
         <% else %>
diff --git a/app/views/public_body/statistics.html.erb b/app/views/public_body/statistics.html.erb
index d935a9e47..0e7e7424e 100644
--- a/app/views/public_body/statistics.html.erb
+++ b/app/views/public_body/statistics.html.erb
@@ -1,6 +1,6 @@
 <% @title = _("Public Body Statistics") %>
 <div id="main_content">
-  <h1>Public Body Statistics</h1>
+  <h1><%= @title %></h1>
 
   <p><%= _("This page of public body statistics is currently \
 experimental, so there are some caveats that should be borne \
@@ -33,6 +33,8 @@ requests to the authority through this site, rather than, \
 say, all requests that have been made to the public body by \
 any means.") %></li>
 
+    <li><%= _("Unclassified or hidden requests are not counted.") %></li>
+
   </ul>
 
   <p><%= _("These graphs were partly inspired by \
@@ -47,7 +49,7 @@ are due to him.") %></p>
         <table border=0>
           <thead>
             <tr>
-              <th>Public Body</th>
+              <th><%= _('Public Body') %></th>
               <th><%= graph_data['y_axis'] %></th>
             </tr>
           </thead>
diff --git a/app/views/request/upload_response.html.erb b/app/views/request/upload_response.html.erb
index f5fd6f000..f07af34d5 100644
--- a/app/views/request/upload_response.html.erb
+++ b/app/views/request/upload_response.html.erb
@@ -9,7 +9,9 @@
 
   <%= foi_error_messages_for :comment %>
 
-  <h1><%= _('Respond to the FOI request')%> '<%=request_link(@info_request)%>'<% _(' made by ')%><%=user_link(@info_request.user) %></h1>
+  <h1><%= _("Respond to the FOI request '{{request}}' made by {{user}}",
+            :request => request_link(@info_request),
+            :user => user_link(@info_request.user)) %></h1>
 
   <p>
       <%= raw(_('Your response will <strong>appear on the Internet</strong>, <a href="{{url}}">read why</a> and answers to other questions.', :url => help_officers_path.html_safe)) %>
@@ -48,5 +50,3 @@
       </p>
   <% end %>
 <% end %>
-
-