14 files changed, 70 insertions, 36 deletions
diff --git a/app/views/admin_general/debug.rhtml b/app/views/admin_general/debug.rhtml
index 40fe33616..d7bf1c6da 100644
--- a/app/views/admin_general/debug.rhtml
+++ b/app/views/admin_general/debug.rhtml
@@ -7,6 +7,8 @@
 <h2>Version numbers</h2>
 
 <p>
+Alaveteli version: <%= link_to @current_version, @github_origin + @current_version %>
+<br>
 Alaveteli branch: <%= link_to @current_branch, @github_origin + @current_branch %>
 <br>
 Alaveteli commit: <%= link_to @current_commit, @github_origin + @current_commit %>
diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml
index 1a4b8ba96..48bd7f694 100644
--- a/app/views/admin_general/index.rhtml
+++ b/app/views/admin_general/index.rhtml
@@ -46,6 +46,20 @@
     </ul>
 <% end %>
 
+<% if @attention_requests.size > 0 %>
+    <h3>Review requests which have been marked as requiring your attention by users (<%=@error_message_requests.size%> total)</h3>
+
+    <ul>
+    <% for @request in @attention_requests %>
+        <li>
+            <%= request_both_links(@request)%>
+            &ndash; <%=simple_date(@request.get_last_event.created_at)%>
+        </li>
+    <% end %>
+    </ul>
+<% end %>
+
+
 <% if @requires_admin_requests.size > 0 %>
     <h3>These require administrator attention (<%=@requires_admin_requests.size%> total)</h3>
 
diff --git a/app/views/admin_request/_incoming_message_actions.rhtml b/app/views/admin_request/_incoming_message_actions.rhtml
index c23b4060a..569132861 100644
--- a/app/views/admin_request/_incoming_message_actions.rhtml
+++ b/app/views/admin_request/_incoming_message_actions.rhtml
@@ -1,6 +1,6 @@
 <% form_tag '../redeliver_incoming' do %>
   <div>
-      id or url_title of request:
+      id or url_title of request (or a list of requests, comma-separated):
       <% if @info_requests && @info_requests.size == 1 %>
         <%= text_field_tag 'url_title', @info_requests[0].url_title, { :size => 20 } %>
       <% else %>
diff --git a/app/views/admin_request/edit.rhtml b/app/views/admin_request/edit.rhtml
index b659c676d..4026ee712 100644
--- a/app/views/admin_request/edit.rhtml
+++ b/app/views/admin_request/edit.rhtml
@@ -22,20 +22,7 @@
    </p>
 
    <p><label for="info_request_described_state"><strong>Described state</strong></label> 
-   <%= select( 'info_request', "described_state",
-       [ 
-        'waiting_response',
-        'waiting_clarification', 
-        'gone_postal',
-        'not_held',
-        'rejected', 
-        'successful', 
-        'partially_successful',
-        'internal_review',
-        'error_message',
-        'requires_admin',
-        'user_withdrawn'
-    ]) %>;
+   <%= select( 'info_request', "described_state", InfoRequest.enumerate_states ) %>;
     <label for="info_request_awaiting_description"><strong>Awaiting description</strong></label>
    <%= select('info_request', "awaiting_description", [["Yes - needs state updating",true],["No - state is up to date",false]]) %>
    <br/>(don't forget to change 'awaiting description' when you set described state)<br/>
@@ -60,7 +47,7 @@
 
 <hr>
 
-<% form_tag '../fully_destroy/' + @info_request.id.to_s do %>
+<% form_tag '../destroy/' + @info_request.id.to_s do %>
     <p>
     <strong>This is permanent and irreversible!</strong> <%= submit_tag 'Destory request entirely' %>
     <br>Use it mainly if someone posts private information, e.g. made a Data Protection request. It
diff --git a/app/views/admin_request/hidden_user_explanation.rhtml b/app/views/admin_request/hidden_user_explanation.rhtml
new file mode 100644
index 000000000..aaea49fb6
--- /dev/null
+++ b/app/views/admin_request/hidden_user_explanation.rhtml
@@ -0,0 +1,9 @@
+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.
+
+Yours,
+
+The <%= site_name %> team.
diff --git a/app/views/contact_mailer/from_admin_message.rhtml b/app/views/contact_mailer/from_admin_message.rhtml
new file mode 100644
index 000000000..bdb48d580
--- /dev/null
+++ b/app/views/contact_mailer/from_admin_message.rhtml
@@ -0,0 +1,2 @@
+<%= @message.strip %>
+
diff --git a/app/views/general/_locale_switcher.rhtml b/app/views/general/_locale_switcher.rhtml
index 27e492e84..2521b5eb5 100644
--- a/app/views/general/_locale_switcher.rhtml
+++ b/app/views/general/_locale_switcher.rhtml
@@ -1,11 +1,13 @@
-     <% if FastGettext.default_available_locales.length > 1 && !params.empty? %>
-     <div id="user_locale_switcher">
-       <% for possible_locale in FastGettext.default_available_locales %>
-        <% if possible_locale == I18n.locale.to_s %>
-	          <span class="active"><%= locale_name(possible_locale) %></span>
-        <% else %>
-          <a href="<%= locale_switcher(possible_locale, params) %>"><%= locale_name(possible_locale) %></a>
-        <% end %>
-         <% end %>
+ <% if FastGettext.default_available_locales.length > 1 && !params.empty? %>
+   <div id="user_locale_switcher">
+     <div class="btn-group">
+     <% for possible_locale in FastGettext.default_available_locales %>
+      <% if possible_locale == I18n.locale.to_s %>
+        <a href="#" class="btn disabled"><%= locale_name(possible_locale) %></a>
+      <% else %>
+        <a href="<%= locale_switcher(possible_locale, params) %>" class="btn"><%= locale_name(possible_locale) %></a>
+      <% end %>
+       <% end %>
      </div>
-     <% end %>
+   </div>
+ <% end %>
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index 42ca5dbbb..65670538d 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -9,7 +9,7 @@
       <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%>
       <%= stylesheet_link_tag 'admin', :title => "Main", :rel => "stylesheet"  %>
     </head>
-    <body>
+    <body class="admin">
 
     <p>
     <strong><%= link_to 'Alaveteli', main_url('/') %> admin:</strong> 
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 7d36b74a3..bc9dfb02d 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -58,7 +58,7 @@
 
         <%= render :partial => 'general/before_head_end' %>
     </head>
-    <body <%= "class='front'" if params[:action] == 'frontpage' %>>
+    <body class="<%= 'admin' if !session[:using_admin].nil?%> <%= 'front' if params[:action] == 'frontpage' %>">
 
     <!-- XXX: move to a separate file -->
     <% if force_registration_on_new_request && !@user %>
diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml
index 5304ec312..bca142fa9 100644
--- a/app/views/request/_sidebar.rhtml
+++ b/app/views/request/_sidebar.rhtml
@@ -3,9 +3,19 @@
     <h2><%= _('Follow this request') %></h2>
 
     <% follower_count = TrackThing.count(:all, :conditions => ["info_request_id = ?", @info_request.id]) + 1 %>
-    <p class="follow_count"><%= n_("<span id='follow_count'>%d</span> person is following this request", "<span id='follow_count'>%d</span> people are following this request", follower_count) % follower_count %></p>
-     <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user, :location => 'sidebar', :follower_count => follower_count } %>
-  </div>
+    <p><%= n_("There is %d person following this request", "There are %d people following this request", follower_count) % follower_count %></p>
+     <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user, :location => 'sidebar' } %>
+   </div>
+    <% if @info_request.described_state != "attention_requested" %>
+    <h2><%= _('Offensive? Unsuitable?') %></h2>
+     <% if @info_request.attention_requested %>
+       <p><%= ('The site administrators have reviewed this request and consider it to be suitable for the website.') %></p>
+     <% 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" %>
+      <% end %>
+    <% end %>
     <h2><%= _("Act on what you've learnt") %></h2>
 
     <div class="act_link">
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index 611704ebe..27ad0700e 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -74,7 +74,7 @@
         <%= _('normally') %> 
         <% end %>
         <%= _('no later than') %> <strong><%= simple_date(@info_request.date_response_required_by) %></strong>
-        (<%= link_to "details", "/help/requesting#quickly_response" %>).
+        (<%= link_to _("details"), "/help/requesting#quickly_response" %>).
     <% elsif @status == 'waiting_response_overdue' %>
         <%= _('Response to this request is <strong>delayed</strong>.') %>
 		<%= _('By law, {{public_body_link}} should normally have responded <strong>promptly</strong> and',:public_body_link=>public_body_link(@info_request.public_body)) %>
@@ -118,6 +118,12 @@
     <% elsif @status == 'user_withdrawn' %>
         <%= _('This request has been <strong>withdrawn</strong> by the person who made it. 
         	   There may be an explanation in the correspondence below.') %>
+    <% elsif @status == 'attention_requested' %>
+        <%= _('This request has been <strong>reported</strong> as needing administrator attention (perhaps because it is vexatious, or a request for personal information)') %>
+    <% elsif @status == 'vexatious' %>
+        <%= _('This request has been <strong>hidden</strong> from the site, because an administrator considers it vexatious') %>
+    <% elsif @status == 'not_foi' %>
+        <%= _('This request has been <strong>hidden</strong> from the site, because an administrator considers it not to be an FOI request') %>
     <% else %>
         <%= render :partial => 'general/custom_state_descriptions', :locals => { :status => @status } %>
     <% end %>
diff --git a/app/views/request_mailer/not_clarified_alert.rhtml b/app/views/request_mailer/not_clarified_alert.rhtml
index 82d15ba76..2408452b3 100644
--- a/app/views/request_mailer/not_clarified_alert.rhtml
+++ b/app/views/request_mailer/not_clarified_alert.rhtml
@@ -1,5 +1,7 @@
-<%=@info_request.public_body.name%> <%=('has asked you to explain part of your')%> <%=@info_request.law_used_short%> <%= _('request.')%> 
-<%= _('To do this, first click on the link below.')%>
+<%= _('{{public_body}} has asked you to explain part of your {{law_used}} request.', 
+    :public_body => @info_request.public_body.name,
+    :law_used => @info_request.law_used_short ) %> 
+<%= _('To do this, first click on the link below.') %>
 
 <%=@url%>
 
diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml
index 18d4b372a..39f346eff 100644
--- a/app/views/track/_tracking_links.rhtml
+++ b/app/views/track/_tracking_links.rhtml
@@ -14,7 +14,7 @@
 <% elsif track_thing %>
     <div class="feed_link feed_link_<%=location%>">
      <% if defined? follower_count && follower_count > 0 %>
-        <%= link_to _("I want to know, too"), do_track_url(track_thing), :class => "link_button_green" %>
+        <%= link_to _("I like this request"), do_track_url(track_thing), :class => "link_button_green" %>
      <% else %>
         <%= link_to _("Follow"), do_track_url(track_thing), :class => "link_button_green" %>
      <% end %>
diff --git a/app/views/user/rate_limited.rhtml b/app/views/user/rate_limited.rhtml
index 2a770d62e..d5accf114 100644
--- a/app/views/user/rate_limited.rhtml
+++ b/app/views/user/rate_limited.rhtml
@@ -1,4 +1,4 @@
-<% @title = "Too many requests" %>
+<% @title = _("Too many requests") %>
 
 <h1><%=@title%></h1>