From ff05ced215bf40f1f504cb27a930009a12998b70 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 26 Jun 2014 15:06:34 +0100
Subject: Change wording from 'select' to 'find'

---
 app/views/request/select_authorities.html.erb | 4 ++--
 app/views/request/select_authority.html.erb   | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/request/select_authorities.html.erb b/app/views/request/select_authorities.html.erb
index e16bcc191..cfbc21a28 100644
--- a/app/views/request/select_authorities.html.erb
+++ b/app/views/request/select_authorities.html.erb
@@ -1,5 +1,5 @@
-<% @title = _("Select the authorities to write to")  %>
-<h1><%= _('1. Select authorities') %></h1>
+<% @title = _("Find the authorities to write to")  %>
+<h1><%= _('Find the authorities') %></h1>
 
 <p>
   <%= _("Search for the authorities you'd like information from:") %>
diff --git a/app/views/request/select_authority.html.erb b/app/views/request/select_authority.html.erb
index 9a5d565b6..dea3a8558 100644
--- a/app/views/request/select_authority.html.erb
+++ b/app/views/request/select_authority.html.erb
@@ -10,16 +10,15 @@
     });
 </script>
 
-<% @title = _("Select the authority to write to")  %>
+<% @title = _("Find an authority")  %>
 
-<h1 style="clear: left"><%= _('1. Select an authority') %></h1>
+<h1 style="clear: left"><%= _('Find an authority') %></h1>
 
 <div id="authority_selection">
   <%= form_tag select_authority_path, { :id => 'search_form', :method => 'get' } do %>
     <div>
       <p>
-        <%= _(%Q(First, type in the <strong>name of the public authority</strong> you'd
-        like information from.)) %>
+        <%= _('Start by typing the name of the UK public authority your request is for') %>
         <% if AlaveteliConfiguration.authority_must_respond %>
             <%= _(%Q(<strong>By law, they have to respond</strong> (<a href="{{url}}">why?</a>).),
                   :url => (help_about_path(:anchor => 'whybother_them')).html_safe) %>
-- 
cgit v1.2.3


From 910992a6717dcf6ab439c9ae352568d7d3db7392 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 26 Jun 2014 15:33:56 +0100
Subject: remove inline css

---
 app/views/request/select_authority.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/request/select_authority.html.erb b/app/views/request/select_authority.html.erb
index dea3a8558..5678e5aaa 100644
--- a/app/views/request/select_authority.html.erb
+++ b/app/views/request/select_authority.html.erb
@@ -12,7 +12,7 @@
 
 <% @title = _("Find an authority")  %>
 
-<h1 style="clear: left"><%= _('Find an authority') %></h1>
+<h1><%= _('Find an authority') %></h1>
 
 <div id="authority_selection">
   <%= form_tag select_authority_path, { :id => 'search_form', :method => 'get' } do %>
-- 
cgit v1.2.3


From 4d52cd0cdf3ea5e95f8bb1eee01a2fd3e9a9138b Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 26 Jun 2014 15:34:29 +0100
Subject: Tweak wording

---
 app/views/public_body/_search_ahead.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/public_body/_search_ahead.html.erb b/app/views/public_body/_search_ahead.html.erb
index b06ed5efa..430e2be44 100644
--- a/app/views/public_body/_search_ahead.html.erb
+++ b/app/views/public_body/_search_ahead.html.erb
@@ -1,9 +1,9 @@
 
  <% if !@xapian_requests.nil? %>
   <% if @xapian_requests.results.size > 0 %>
-    <h3><%= _('Top search results:') %></h3>
+    <p><%= _('Matching authorities') %></p>
   <% else %>
-    <h3><%= _('No results found.') %></h3>
+    <p><%= _('No results found.') %></p>
   <% end %>
   <div id="authority_search_ahead_results">
     <% for result in @xapian_requests.results %>
-- 
cgit v1.2.3


From a5a0e3f6c407c28d17fe73d5bec6ede5aceeaa1d Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Mon, 30 Jun 2014 16:08:16 +0100
Subject: minor wording updates, results list now split in two columns on
 authority search

---
 .../responsive/_new_request_layout.scss            | 39 +++++++++++++++++++++-
 app/views/public_body/_search_ahead.html.erb       | 18 +++++-----
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index 55c72b8e3..49e247b2a 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -4,7 +4,6 @@
 #authority_selection {
   @include grid-column($columns: 12, $collapse: true);
   @include respond-min( $main_menu-mobile_menu_cutoff ){
-    @include grid-column($columns: 6, $collapse: true);
     @include ie8{
       padding-right: 0.9375em;
     }
@@ -15,6 +14,17 @@
       width: 80%;
     }
   }
+  .authority_search_ahead_results_container {
+    @include respond-min( $main_menu-mobile_menu_cutoff ){
+      @include grid-row($behavior: nest);
+    }
+  }
+  #authority_search_ahead_results,
+  .cant_find_results {
+    @include respond-min( $main_menu-mobile_menu_cutoff ){
+      @include grid-column(6);
+    }
+  }
 }
 
 .new_info_request{
@@ -32,6 +42,33 @@
       width: 26.188em;
     }
   }
+
+  /* Hide some elements of the public body that aren't appropriate in this
+  context */
+  #list-filter, h2.foi_results, .public-body-name-prefix {
+    display: none;
+  }
+
+  /* Compact request list for viewing in authority preview column */
+  .request_left, #header_left {
+    @include grid-column(12, $collapse: true);
+  }
+
+  .request_right {
+    @include grid-column(12, $collapse: true);
+  }
+
+  span.desc {
+    background:none;
+    line-height:18px;
+    padding: 0;
+  }
+
+  .typeahead_response {
+    @include grid-row($behavior: nest);
+  }
+
+
 }
 
 /* /new/[body_name] page */
diff --git a/app/views/public_body/_search_ahead.html.erb b/app/views/public_body/_search_ahead.html.erb
index 430e2be44..e1465bb15 100644
--- a/app/views/public_body/_search_ahead.html.erb
+++ b/app/views/public_body/_search_ahead.html.erb
@@ -5,12 +5,14 @@
   <% else %>
     <p><%= _('No results found.') %></p>
   <% end %>
-  <div id="authority_search_ahead_results">
-    <% for result in @xapian_requests.results %>
-      <%= render :partial => 'public_body/body_listing_single',
-                 :locals => { :public_body => result[:model],
-                              :request_link => true } %>
-    <% end %>
-  </div>
-  <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_requests.matches_estimated), :params => {:controller=>"request", :action => "select_authority"} %>
+  <div class="authority_search_ahead_results_container">
+    <div id="authority_search_ahead_results">
+      <% for result in @xapian_requests.results %>
+        <%= render :partial => 'public_body/body_listing_single',
+                   :locals => { :public_body => result[:model],
+                                :request_link => true } %>
+      <% end %>
+    </div>
+    <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_requests.matches_estimated), :params => {:controller=>"request", :action => "select_authority"} %>
+ </div>
  <% end %>
-- 
cgit v1.2.3


From ae7e294bc3dfd6737aec930e24110ef269f77c71 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Tue, 1 Jul 2014 16:39:47 +0100
Subject: Improved layout, moved help text to the right, so the form has less
 clutter. TODO: Visual styling

---
 .../responsive/_new_request_layout.scss            |  4 +
 app/views/request/new.html.erb                     | 90 +++++++++++-----------
 2 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index 49e247b2a..2e0c4b029 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -99,6 +99,10 @@
   float: right;
 }
 
+.request_body {
+  @include grid-row($behavior: nest);
+}
+
 /* Advice sits on right hand side */
 #request_advice {
 
diff --git a/app/views/request/new.html.erb b/app/views/request/new.html.erb
index 688d9e87b..e05969888 100644
--- a/app/views/request/new.html.erb
+++ b/app/views/request/new.html.erb
@@ -36,7 +36,7 @@
 <% else %>
   <% @title = _("Make an {{law_used_short}} request to '{{public_body_name}}'",:law_used_short=>h(@info_request.law_used_short),:public_body_name=>h(@info_request.public_body.name))  %>
 <% end %>
-    <h1><%= _('2. Ask for Information') %></h1>
+    <h1><%= _('Make a request') %></h1>
 
     <% if @existing_request %>
       <div class="errorExplanation" id="errorExplanation"><ul>
@@ -61,9 +61,8 @@
 
     <div id="request_header">
         <div id="request_header_body">
-            <label class="form_label"><%= _('To:') %></label>
-
             <% if @batch %>
+                <label class="form_label"><%= _('To:') %></label>
                 <span id="to_public_body">
                   <%= _("Your selected authorities") %>
                   <span class="batch_public_body_toggle" data-hidetext="<%= _("(hide)") %>" data-showtext="<%= _("(show)") %>"><a class="toggle-message"></a></span>
@@ -78,23 +77,14 @@
                 </div>
 
             <% else %>
-              <span id="to_public_body">
+              <p id="to_public_body"><span class="to_public_body_label">To:</span>
                 <%=h(@info_request.public_body.name)%>
-              </span>
+              </p>
             <% end %>
 
             <% unless @batch %>
-              <div class="form_item_note">
-                  <% if @info_request.public_body.info_requests.size > 0 %>
-                      <%= _("Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name), :url=>public_body_path(@info_request.public_body)) %>
-                  <% else %>
-                      <%= _("Browse <a href='{{url}}'>other requests</a> for examples of how to word your request.", :url=>request_list_url) %>
-                  <% end %>
-              </div>
-
               <% if @info_request.public_body.has_notes? %>
                 <div id="request_header_text">
-                  <h3><%= _('Special note for this authority!') %></h3>
                   <p><%= @info_request.public_body.notes_as_html.html_safe %></p>
                 </div>
               <% end %>
@@ -130,6 +120,48 @@
             <% end %>
           <% end %>
         </div>
+    </div>
+
+
+    <div id="request_advice">
+      <p>
+        <% if @info_request.public_body.info_requests.size > 0 %>
+            <%= _("Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name), :url=>public_body_path(@info_request.public_body)) %>
+        <% else %>
+            <%= _("Browse <a href='{{url}}'>other requests</a> for examples of how to word your request.", :url=>request_list_url) %>
+        <% end %>
+      </p>
+      <% unless @batch %>
+        <% if !@user %>
+          <p>
+            <%= raw(_('Everything that you enter on this page, including <strong>your name</strong>,
+            will be <strong>displayed publicly</strong> on
+            this website <a href="{{url}}">forever</a>', :url => (help_privacy_path+"#public_request").html_safe)) %>.
+          </p>
+          <p>
+            <%= raw(_('<a href="{{url}}">Thinking of using a pseudonym?</a>.', :url => (help_privacy_path+"#real_name").html_safe)) %>
+          </p>
+        <% else %>
+          <p>
+            <%= raw(_('Everything that you enter on this page
+            will be <strong>displayed publicly</strong> on
+            this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %>
+          </p>
+      <% end %>
+
+        <p>
+          <%= raw(_("<strong> Can I request information about myself?</strong>\n" +
+          "\t\t\t<a href=\"{{url}}\">No! (Click here for details)</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %>
+        </p>
+        <ul>
+          <% end %>
+          <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li>
+          <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li>
+          <li><%= _('Keep it <strong>focused</strong>, you\'ll be more likely to get what you want (<a href="{{url}}">why?</a>).', :url => (help_requesting_path + '#focused').html_safe) %></li>
+        </ul>
+    </div>
+
+    <div id="request_form">
 
         <div id="request_header_subject">
             <p>
@@ -144,17 +176,7 @@
 
         <div id="typeahead_response">
         </div>
-    </div>
 
-    <div id="request_advice">
-        <ul>
-        <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li>
-        <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li>
-        <li><%= _('Keep it <strong>focused</strong>, you\'ll be more likely to get what you want (<a href="{{url}}">why?</a>).', :url => (help_requesting_path + '#focused').html_safe) %></li>
-        </ul>
-    </div>
-
-    <div id="request_form">
         <%= fields_for :outgoing_message do |o| %>
         <p>
             <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label>
@@ -162,27 +184,7 @@
         </p>
         <% end %>
 
-        <% if !@user %>
-            <p class="form_note">
 
-                <%= raw(_('Everything that you enter on this page, including <strong>your name</strong>,
-                will be <strong>displayed publicly</strong> on
-                this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %>
-                <%= raw(_('If you are thinking of using a pseudonym,
-                please <a href="{{url}}">read this first</a>.', :url => (help_privacy_path+"#real_name").html_safe)) %>
-            </p>
-        <% else %>
-            <p class="form_note">
-                <%= raw(_('Everything that you enter on this page
-                will be <strong>displayed publicly</strong> on
-                this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %>
-            </p>
-        <% end %>
-
-        <p class="form_note">
-            <%= raw(_("<strong> Can I request information about myself?</strong>\n" +
-            "\t\t\t<a href=\"{{url}}\">No! (Click here for details)</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %>
-        </p>
 
         <div class="form_button">
             <% if @batch %>
-- 
cgit v1.2.3


From 6d0b629b3610f7a38a30869b40dd270bbb66a392 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Tue, 1 Jul 2014 17:19:35 +0100
Subject: WIP styling of new request/make a request page

---
 .../stylesheets/responsive/_new_request_style.scss | 36 ++++++++++++++++++----
 app/views/request/new.html.erb                     | 14 +++++----
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss
index e07ecb55c..f6d4f6a42 100644
--- a/app/assets/stylesheets/responsive/_new_request_style.scss
+++ b/app/assets/stylesheets/responsive/_new_request_style.scss
@@ -26,18 +26,28 @@
 
 }
 
+
+
 #to_public_body {
   font-weight: bold;
   font-size: 1.3em;
+  margin-bottom: 0.5em;
+}
+
+.to_public_body_label {
+  color: #777;
+  font-weight: normal;
+}
+
+#request_header {
+  border-bottom: 1px solid #ccc; //Unsupported browsers will ignore the rgba declaration below
+  border-color: rgba(0,0,0,0.1);
+  margin-bottom: 2em;
 }
 
 #request_header_text {
-  border-radius:3px;
-  background-color: lighten(#62b356, 23%);
-  padding:0 1em;
-  margin-bottom: 1.5em;
-  margin-top: 1.5em;
   overflow: hidden;
+  font-size: 0.875em;
   h3 {
    font-size: 1em;
   }
@@ -47,13 +57,27 @@
 #request_advice {
   ul {
     margin:0 auto;
-
+    list-style: none outside none;
+    padding-left: 0;
     li {
       margin:0 0 1em;
     }
   }
 }
 
+.advice-panel {
+  background-color: darken(#f7eee1, 5%);
+  padding: 1.5em;
+  margin-top: 1em;
+}
+
+
+
+.advice-panel {
+  background-color: darken(#f7eee1, 5%);
+  padding: 1.5em;
+  margin-top: 1em;
+}
 
 /* Batch request page */
 
diff --git a/app/views/request/new.html.erb b/app/views/request/new.html.erb
index e05969888..6c85554f1 100644
--- a/app/views/request/new.html.erb
+++ b/app/views/request/new.html.erb
@@ -153,12 +153,14 @@
           <%= raw(_("<strong> Can I request information about myself?</strong>\n" +
           "\t\t\t<a href=\"{{url}}\">No! (Click here for details)</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %>
         </p>
-        <ul>
-          <% end %>
-          <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li>
-          <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li>
-          <li><%= _('Keep it <strong>focused</strong>, you\'ll be more likely to get what you want (<a href="{{url}}">why?</a>).', :url => (help_requesting_path + '#focused').html_safe) %></li>
-        </ul>
+        <div class="advice-panel">
+          <ul>
+            <% end %>
+            <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li>
+            <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li>
+            <li><%= _('Keep it <strong>focused</strong>, you\'ll be more likely to get what you want (<a href="{{url}}">why?</a>).', :url => (help_requesting_path + '#focused').html_safe) %></li>
+          </ul>
+        </div>
     </div>
 
     <div id="request_form">
-- 
cgit v1.2.3


From 9287b5ffe5e0eec28828448e81538d2babc9a865 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 2 Jul 2014 10:38:49 +0100
Subject: tidied up language and help text

---
 app/views/request/new.html.erb | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/views/request/new.html.erb b/app/views/request/new.html.erb
index 6c85554f1..214e7f522 100644
--- a/app/views/request/new.html.erb
+++ b/app/views/request/new.html.erb
@@ -19,11 +19,11 @@
                       // When following links in typeahead results, open new
                       // tab/window
                       $("#typeahead_response a").attr("target","_blank");
-                      
+
                       // Update the public body site search link
                       $("#body-site-search-link").attr("href", "http://www.google.com/#q="+encodeURI($("#typeahead_search").val())+
                                                       "+site:<%= @info_request.public_body.calculated_home_page %>");
-                      
+
                       $('.close-button').click(function() { $(this).parent().hide() });
                   }
               });
@@ -122,7 +122,6 @@
         </div>
     </div>
 
-
     <div id="request_advice">
       <p>
         <% if @info_request.public_body.info_requests.size > 0 %>
@@ -151,14 +150,14 @@
 
         <p>
           <%= raw(_("<strong> Can I request information about myself?</strong>\n" +
-          "\t\t\t<a href=\"{{url}}\">No! (Click here for details)</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %>
+          "\t\t\t<a href=\"{{url}}\">No!</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %>
         </p>
         <div class="advice-panel">
           <ul>
             <% end %>
             <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li>
             <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li>
-            <li><%= _('Keep it <strong>focused</strong>, you\'ll be more likely to get what you want (<a href="{{url}}">why?</a>).', :url => (help_requesting_path + '#focused').html_safe) %></li>
+            <li><%= _('<a href="{{url}}">Keep it <strong>focused</strong></a>, you\'ll be more likely to get what you want.', :url => (help_requesting_path + '#focused').html_safe) %></li>
           </ul>
         </div>
     </div>
@@ -171,8 +170,8 @@
                 <%= f.text_field :title, :size => 50, :id =>"typeahead_search" %>
             </p>
             <div class="form_item_note">
-                (<%= _("a one line summary of the information you are requesting, \n\t\t\te.g.") %>
-                  <%= render :partial => "summary_suggestion" %>)
+                <%= _("A one line summary of the information you are requesting, \n\t\t\te.g.") %>
+                  <%= render :partial => "summary_suggestion" %>
             </div>
         </div>
 
@@ -186,8 +185,6 @@
         </p>
         <% end %>
 
-
-
         <div class="form_button">
             <% if @batch %>
               <% params[:public_body_ids].each do |public_body_id| %>
-- 
cgit v1.2.3


From 28d4003557f97e0ad72d65cbce99121d562c1598 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 2 Jul 2014 10:39:46 +0100
Subject: tidied up display of sidebar

---
 app/assets/stylesheets/responsive/_new_request_style.scss | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss
index f6d4f6a42..bf157788d 100644
--- a/app/assets/stylesheets/responsive/_new_request_style.scss
+++ b/app/assets/stylesheets/responsive/_new_request_style.scss
@@ -55,6 +55,11 @@
 }
 
 #request_advice {
+  margin-bottom: 1.5em;
+  font-size: 0.875em;
+  @include respond-min( $main_menu-mobile_menu_cutoff ){
+    font-size: 1em;
+  }
   ul {
     margin:0 auto;
     list-style: none outside none;
@@ -68,7 +73,7 @@
 .advice-panel {
   background-color: darken(#f7eee1, 5%);
   padding: 1.5em;
-  margin-top: 1em;
+  margin-top: 1.5em;
 }
 
 
@@ -76,7 +81,7 @@
 .advice-panel {
   background-color: darken(#f7eee1, 5%);
   padding: 1.5em;
-  margin-top: 1em;
+  margin-top: 1.5em;
 }
 
 /* Batch request page */
-- 
cgit v1.2.3


From 5e19f70d6609c666b65263345a5858f70e3dde1d Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 2 Jul 2014 12:16:23 +0100
Subject: improved styling of request_search_ahead_results

---
 .../stylesheets/responsive/_new_request_style.scss | 22 +++++++++++++++++++---
 app/views/request/_search_ahead.html.erb           |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss
index bf157788d..8537e7d26 100644
--- a/app/assets/stylesheets/responsive/_new_request_style.scss
+++ b/app/assets/stylesheets/responsive/_new_request_style.scss
@@ -26,8 +26,6 @@
 
 }
 
-
-
 #to_public_body {
   font-weight: bold;
   font-size: 1.3em;
@@ -76,7 +74,15 @@
   margin-top: 1.5em;
 }
 
-
+#request_search_ahead_results {
+   background-color: darken(#f7eee1, 5%);
+   padding: 1.5em;
+   margin-bottom: 1.5em;
+   h2 {
+    font-size: 1em;
+    font-weight: normal;
+   }
+}
 
 .advice-panel {
   background-color: darken(#f7eee1, 5%);
@@ -84,6 +90,16 @@
   margin-top: 1.5em;
 }
 
+#request_search_ahead_results {
+   background-color: darken(#f7eee1, 5%);
+   padding: 1.5em;
+   margin-bottom: 1.5em;
+   h2 {
+    font-size: 1em;
+    font-weight: normal;
+   }
+}
+
 /* Batch request page */
 
 .batch_public_body_toggle {
diff --git a/app/views/request/_search_ahead.html.erb b/app/views/request/_search_ahead.html.erb
index 4fbe06ebc..29e971e3d 100644
--- a/app/views/request/_search_ahead.html.erb
+++ b/app/views/request/_search_ahead.html.erb
@@ -2,7 +2,7 @@
   <div id="request_search_ahead_results">
     <% if @xapian_requests.results.any? %>
       <span class="close-button">X</span>
-      <h3><%= _("Possibly related requests:") %></h3> 
+      <h2><%= _("Possible duplicate requests") %></h2>
 
       <% @xapian_requests.results.each do |result| %>
         <%= render :partial => 'request/request_listing_short_via_event',
-- 
cgit v1.2.3


From 455dfee84a96500c47f7646341b7feece8f87382 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 2 Jul 2014 16:33:20 +0100
Subject: removed some padding set in _global_style.scss

It's causing some cascace problems on the preview screen, I can't see what it does, but this commit might need reversing if it messes something up that  I can't see
---
 app/assets/stylesheets/responsive/_global_style.scss | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_global_style.scss b/app/assets/stylesheets/responsive/_global_style.scss
index ef755c01e..771fc9d88 100644
--- a/app/assets/stylesheets/responsive/_global_style.scss
+++ b/app/assets/stylesheets/responsive/_global_style.scss
@@ -191,15 +191,6 @@ form input[type=text],form input[type=password] {
   padding:0.5em;
 }
 
-#preview_form ul {
-  margin:0;
-  padding:1px 32px 10px;
-}
-
-#preview_form ul li {
-  margin:10px 0;
-}
-
 label small{
   text-transform: none;
 }
-- 
cgit v1.2.3


From ca4663c4e82a93820fd61aafc1717639e710ee18 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 2 Jul 2014 17:03:13 +0100
Subject: Message preview screen now has an improved layout

---
 .../responsive/_new_request_layout.scss            |  24 ++++-
 .../stylesheets/responsive/_new_request_style.scss |  41 ++++----
 .../stylesheets/responsive/_request_style.scss     |  21 +++-
 app/views/request/preview.html.erb                 | 112 +++++++++++----------
 4 files changed, 120 insertions(+), 78 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index 2e0c4b029..a381eab94 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -76,7 +76,7 @@
   @include grid-row;
 
   /* Restrict width of form elements on wide screens */
-    #request_header_body, #request_header_subject, #typeahead_response  {
+    #request_header_body, #request_header_subject, #typeahead_response {
     @include grid-column(12);
     @include respond-min( $main_menu-mobile_menu_cutoff ){
       @include grid-column($columns:8, $last-column:true);
@@ -104,7 +104,7 @@
 }
 
 /* Advice sits on right hand side */
-#request_advice {
+#request_advice, .preview-advice {
 
   @include grid-column(12);
   @include respond-min( $main_menu-mobile_menu_cutoff ){
@@ -119,7 +119,6 @@
 }
 
 #request_form {
-
   @include grid-column(12);
   @include respond-min( $main_menu-mobile_menu_cutoff ){
     @include grid-column($columns:8, $pull: 4);
@@ -133,10 +132,28 @@
 
 }
 
+/* Message preview */
+.message-preview {
+  @include grid-row($behavior: nest);
+}
+
 #preview_form {
   @include grid-column(12);
 }
 
+.preview-pane {
+    @include grid-column(12);
+    @include respond-min( $main_menu-mobile_menu_cutoff ){
+      @include grid-column($columns:8, $pull:4);
+      @include ie8{
+        padding-right: 0.9375em;
+      }
+      @include lte-ie7 {
+        width: 36.813em;
+      }
+    }
+  }
+
 
 /* Batch request page*/
 
@@ -205,7 +222,6 @@ div.batch_public_body_toggle {
   margin-left: 110px;
 }
 
-
 /* Request sent page */
 .request-sent-message {
   margin-top: 1em;
diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss
index 8537e7d26..a056e8b43 100644
--- a/app/assets/stylesheets/responsive/_new_request_style.scss
+++ b/app/assets/stylesheets/responsive/_new_request_style.scss
@@ -58,24 +58,26 @@
   @include respond-min( $main_menu-mobile_menu_cutoff ){
     font-size: 1em;
   }
+  .advice-panel {
+      margin-top: 1.5em;
+  }
+}
+
+.advice-panel {
+  background-color: #f4f4f4;
+  padding: 1.5em;
   ul {
     margin:0 auto;
     list-style: none outside none;
-    padding-left: 0;
+    padding: 0;
     li {
       margin:0 0 1em;
     }
   }
 }
 
-.advice-panel {
-  background-color: darken(#f7eee1, 5%);
-  padding: 1.5em;
-  margin-top: 1.5em;
-}
-
 #request_search_ahead_results {
-   background-color: darken(#f7eee1, 5%);
+   background-color: #f4f4f4;
    padding: 1.5em;
    margin-bottom: 1.5em;
    h2 {
@@ -84,20 +86,17 @@
    }
 }
 
-.advice-panel {
-  background-color: darken(#f7eee1, 5%);
-  padding: 1.5em;
-  margin-top: 1.5em;
-}
 
-#request_search_ahead_results {
-   background-color: darken(#f7eee1, 5%);
-   padding: 1.5em;
-   margin-bottom: 1.5em;
-   h2 {
-    font-size: 1em;
-    font-weight: normal;
-   }
+input#reedit_button {
+  background-color: transparent;
+  color: #2688dc;
+  text-decoration: underline;
+    &:hover,
+    &:active,
+    &:focus {
+        color: #333333;
+    }
+    border: none;
 }
 
 /* Batch request page */
diff --git a/app/assets/stylesheets/responsive/_request_style.scss b/app/assets/stylesheets/responsive/_request_style.scss
index c33688793..e6f36674a 100644
--- a/app/assets/stylesheets/responsive/_request_style.scss
+++ b/app/assets/stylesheets/responsive/_request_style.scss
@@ -3,7 +3,10 @@
 div.correspondence {
   border: 1px solid #ccc;
   margin: 0 0 1em;
-  padding: 0.5em 1em 0 0.5em;
+  padding: 1em;
+  @include respond-min( $main_menu-mobile_menu_cutoff ){
+    padding: 1.5em;
+  }
 
   h2 {
     text-align:right;
@@ -11,6 +14,20 @@ div.correspondence {
   }
 }
 
+.preview_subject,
+.preview_to {
+  font-weight: bold;
+  strong {
+    font-weight: normal;
+    display: block;
+    color: #777;
+  }
+}
+
+.preview_subject {
+  margin-bottom: 1.5em;
+}
+
 div.comment_in_request {
   border: 1px dotted #ccc;
   margin:0 0 1em 3em;
@@ -30,7 +47,7 @@ div.comment_in_request {
   margin-bottom: 1em;
 }
 
-.correspondence_text,.comment_in_request_text {
+.comment_in_request_text {
   margin:0 1.2em 0 0.9em;
 }
 
diff --git a/app/views/request/preview.html.erb b/app/views/request/preview.html.erb
index ddd5ab30c..3a5b8ae87 100644
--- a/app/views/request/preview.html.erb
+++ b/app/views/request/preview.html.erb
@@ -5,58 +5,68 @@
 <% end %>
 <%= form_for(@info_request, :url => (@batch ? new_batch_path : new_request_path), :html => { :id => 'preview_form' }  ) do |f| %>
 
-    <h1><%= _('3. Now check your request') %></h1>
-    <ul>
-    <li><%= _('Check you haven\'t included any <strong>personal information</strong>.') %></li>
-    <li><%= raw(_('Your name, request and any responses will appear in <strong>search engines</strong>
-        (<a href="{{url}}">details</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %>
-    </li>
-    </ul>
-
-    <%= fields_for :outgoing_message do |o| %>
-
-        <div class="correspondence" id="outgoing-0">
-            <p class="preview_subject">
-                <strong><%= _('To:') %></strong>
-                <% if @batch %>
-                  <%= _("Your selected authorities")%>
-                <% else %>
-                  <%=h(@info_request.public_body.name)%>
-                <% end %>
-                <br><strong><%= _('Subject:') %></strong> <%= @info_request.email_subject_request %>
-            </p>
-
-            <div class="correspondence_text">
-                <p><%= @outgoing_message.get_body_for_html_display %></p>
-                <%= o.hidden_field(:body) %>
-            </div>
+    <h1><%= _('Preview your request') %></h1>
+    <div class="message-preview">
+        <div class="preview-advice">
+            <div class="advice-panel">
+                <ul>
+                    <li><%= _('Check you haven\'t included any <strong>personal information</strong>.') %></li>
+                    <li><%= raw(_('Your name, request and any responses will appear in <strong>search engines</strong>
+                        (<a href="{{url}}">details</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %>
+                    </li>
+                    <li><%= _('<a href="{{url}}">Do you want to request private information about yourself?</a>', :url => (help_requesting_path+"#data_protection").html_safe) %></li>
+                </ul>
 
-            <p class="event_actions">
-            </p>
+            </div>
         </div>
-    <% end %>
-
-    <p><%= _('<strong>Privacy note:</strong> If you want to request private information about
-    yourself then <a href="{{url}}">click here</a>.', :url => (help_requesting_path+"#data_protection").html_safe) %>
-
-    <p>
-    <%= f.hidden_field(:title) %>
-    <% if @batch %>
-      <% params[:public_body_ids].each do |public_body_id| %>
-        <%= hidden_field_tag("public_body_ids[]", public_body_id)%>
-      <% end %>
-    <% else %>
-      <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %>
-    <% end %>
-    <%= f.hidden_field(:tag_string) %>
-    <%= hidden_field_tag(:submitted_new_request, 1) %>
-    <%= hidden_field_tag(:preview, 0 ) %>
-    <%= submit_tag _("Edit this request"), :name => 'reedit', :id => 'reedit_button' %>
-    <%= submit_tag _("Send request"), :name => 'submit', :id => 'submit_button' %>
-    </p>
-
-    <% if !@info_request.tag_string.empty? %>
-        <p><strong><%= _('Tags:') %></strong> <%=h @info_request.tag_string %></p>
-    <% end %>
+        <div class="preview-pane">
+        <%= fields_for :outgoing_message do |o| %>
+
+            <div class="correspondence" id="outgoing-0">
+                <p class="preview_to">
+                    <strong><%= _('To') %></strong>
+                    <% if @batch %>
+                      <%= _("Your selected authorities")%>
+                    <% else %>
+                      <%=h(@info_request.public_body.name)%>
+                    <% end %>
 
+                </p>
+                <p class="preview_subject">
+                 <strong><%= _('Subject') %></strong> <%= @info_request.email_subject_request %>
+                </p>
+
+                <div class="correspondence_text">
+                    <p><%= @outgoing_message.get_body_for_html_display %></p>
+                    <%= o.hidden_field(:body) %>
+                </div>
+
+                <p class="event_actions">
+                </p>
+            </div>
+        <% end %>
+
+
+
+        <p>
+        <%= f.hidden_field(:title) %>
+        <% if @batch %>
+          <% params[:public_body_ids].each do |public_body_id| %>
+            <%= hidden_field_tag("public_body_ids[]", public_body_id)%>
+          <% end %>
+        <% else %>
+          <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %>
+        <% end %>
+        <%= f.hidden_field(:tag_string) %>
+        <%= hidden_field_tag(:submitted_new_request, 1) %>
+        <%= hidden_field_tag(:preview, 0 ) %>
+        <%= submit_tag _("Edit your request"), :name => 'reedit', :id => 'reedit_button' %>
+        <%= submit_tag _("Send request"), :name => 'submit', :id => 'submit_button' %>
+        </p>
+
+        <% if !@info_request.tag_string.empty? %>
+            <p><strong><%= _('Tags:') %></strong> <%=h @info_request.tag_string %></p>
+        <% end %>
+        </div>
+    </div>
 <% end %>
-- 
cgit v1.2.3


From ea42035346aaa98a6aadfb3c5aba468bce31b677 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 2 Jul 2014 17:13:30 +0100
Subject: add margin to advice panels on mobile

---
 app/assets/stylesheets/responsive/_new_request_style.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss
index a056e8b43..574c98c9e 100644
--- a/app/assets/stylesheets/responsive/_new_request_style.scss
+++ b/app/assets/stylesheets/responsive/_new_request_style.scss
@@ -66,6 +66,10 @@
 .advice-panel {
   background-color: #f4f4f4;
   padding: 1.5em;
+  margin-bottom: 1.5em;
+  @include respond-min( $main_menu-mobile_menu_cutoff ){
+    margin-bottom: 0;
+  }
   ul {
     margin:0 auto;
     list-style: none outside none;
-- 
cgit v1.2.3


From 754bbd533f645f2035e668a12753f679bd3b26b3 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 3 Jul 2014 11:08:47 +0100
Subject: refactored grid layout to solve problems with nested columns

---
 .../responsive/_new_request_layout.scss            |  16 +--
 app/views/request/new.html.erb                     | 157 +++++++++++----------
 2 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index a381eab94..16d215dd2 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -28,7 +28,7 @@
 }
 
 .new_info_request{
- @include grid-row($behavior: nest);
+ @include grid-row();
 }
 
 #select_authority_help {
@@ -73,7 +73,7 @@
 
 /* /new/[body_name] page */
 #request_header {
-  @include grid-row;
+  @include grid-row($behavior: nest);
 
   /* Restrict width of form elements on wide screens */
     #request_header_body, #request_header_subject, #typeahead_response {
@@ -97,6 +97,9 @@
 
 #typeahead_response .close-button {
   float: right;
+
+.request_body {
+  @include grid-row($behavior: nest);
 }
 
 .request_body {
@@ -105,10 +108,9 @@
 
 /* Advice sits on right hand side */
 #request_advice, .preview-advice {
-
   @include grid-column(12);
   @include respond-min( $main_menu-mobile_menu_cutoff ){
-    @include grid-column($columns:4, $push: 8);
+    @include grid-column($columns:4, $push:8, $last-column:true);
     @include ie8{
       padding-left: 0.9375em;
     }
@@ -121,7 +123,7 @@
 #request_form {
   @include grid-column(12);
   @include respond-min( $main_menu-mobile_menu_cutoff ){
-    @include grid-column($columns:8, $pull: 4);
+    @include grid-column($columns:8, $pull:4);
     @include ie8{
       padding-right: 0.9375em;
     }
@@ -137,10 +139,6 @@
   @include grid-row($behavior: nest);
 }
 
-#preview_form {
-  @include grid-column(12);
-}
-
 .preview-pane {
     @include grid-column(12);
     @include respond-min( $main_menu-mobile_menu_cutoff ){
diff --git a/app/views/request/new.html.erb b/app/views/request/new.html.erb
index 214e7f522..74dbec84b 100644
--- a/app/views/request/new.html.erb
+++ b/app/views/request/new.html.erb
@@ -121,93 +121,96 @@
           <% end %>
         </div>
     </div>
-
-    <div id="request_advice">
-      <p>
-        <% if @info_request.public_body.info_requests.size > 0 %>
-            <%= _("Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name), :url=>public_body_path(@info_request.public_body)) %>
-        <% else %>
-            <%= _("Browse <a href='{{url}}'>other requests</a> for examples of how to word your request.", :url=>request_list_url) %>
-        <% end %>
-      </p>
-      <% unless @batch %>
-        <% if !@user %>
-          <p>
-            <%= raw(_('Everything that you enter on this page, including <strong>your name</strong>,
-            will be <strong>displayed publicly</strong> on
-            this website <a href="{{url}}">forever</a>', :url => (help_privacy_path+"#public_request").html_safe)) %>.
-          </p>
-          <p>
-            <%= raw(_('<a href="{{url}}">Thinking of using a pseudonym?</a>.', :url => (help_privacy_path+"#real_name").html_safe)) %>
-          </p>
-        <% else %>
-          <p>
-            <%= raw(_('Everything that you enter on this page
-            will be <strong>displayed publicly</strong> on
-            this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %>
-          </p>
-      <% end %>
-
+    <div class="request_body">
+      <div id="request_advice">
         <p>
-          <%= raw(_("<strong> Can I request information about myself?</strong>\n" +
-          "\t\t\t<a href=\"{{url}}\">No!</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %>
+          <% if @info_request.public_body.info_requests.size > 0 %>
+              <%= _("Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name), :url=>public_body_path(@info_request.public_body)) %>
+          <% else %>
+              <%= _("Browse <a href='{{url}}'>other requests</a> for examples of how to word your request.", :url=>request_list_url) %>
+          <% end %>
         </p>
-        <div class="advice-panel">
-          <ul>
-            <% end %>
-            <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li>
-            <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li>
-            <li><%= _('<a href="{{url}}">Keep it <strong>focused</strong></a>, you\'ll be more likely to get what you want.', :url => (help_requesting_path + '#focused').html_safe) %></li>
-          </ul>
-        </div>
-    </div>
-
-    <div id="request_form">
-
-        <div id="request_header_subject">
+        <% unless @batch %>
+          <% if !@user %>
             <p>
-                <label class="form_label" for="typeahead_search"><%= _('Summary:') %></label>
-                <%= f.text_field :title, :size => 50, :id =>"typeahead_search" %>
+              <%= raw(_('Everything that you enter on this page, including <strong>your name</strong>,
+              will be <strong>displayed publicly</strong> on
+              this website <a href="{{url}}">forever</a>', :url => (help_privacy_path+"#public_request").html_safe)) %>.
+            </p>
+            <p>
+              <%= raw(_('<a href="{{url}}">Thinking of using a pseudonym?</a>.', :url => (help_privacy_path+"#real_name").html_safe)) %>
+            </p>
+          <% else %>
+            <p>
+              <%= raw(_('Everything that you enter on this page
+              will be <strong>displayed publicly</strong> on
+              this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %>
             </p>
-            <div class="form_item_note">
-                <%= _("A one line summary of the information you are requesting, \n\t\t\te.g.") %>
-                  <%= render :partial => "summary_suggestion" %>
-            </div>
-        </div>
-
-        <div id="typeahead_response">
-        </div>
-
-        <%= fields_for :outgoing_message do |o| %>
-        <p>
-            <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label>
-            <%= o.text_area :body, :rows => 20, :cols => 60 %>
-        </p>
         <% end %>
 
-        <div class="form_button">
-            <% if @batch %>
-              <% params[:public_body_ids].each do |public_body_id| %>
-                <%= hidden_field_tag("public_body_ids[]", public_body_id)%>
+          <p>
+            <%= raw(_("<strong> Can I request information about myself?</strong>\n" +
+            "\t\t\t<a href=\"{{url}}\">No!</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %>
+          </p>
+          <div class="advice-panel">
+            <ul>
               <% end %>
-            <% else %>
-              <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %>
-            <% end %>
-            <%= hidden_field_tag(:submitted_new_request, 1 ) %>
-            <%= hidden_field_tag(:preview, 1 ) %>
-            <%= submit_tag _("Preview your public request") %>
-        </div>
+              <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li>
+              <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li>
+              <li><%= _('<a href="{{url}}">Keep it <strong>focused</strong></a>, you\'ll be more likely to get what you want.', :url => (help_requesting_path + '#focused').html_safe) %></li>
+            </ul>
+          </div>
+      </div>
+
+      <div id="request_form">
+
+          <div id="request_header_subject">
+              <p>
+                  <label class="form_label" for="typeahead_search"><%= _('Summary:') %></label>
+                  <%= f.text_field :title, :size => 50, :id =>"typeahead_search" %>
+              </p>
+              <div class="form_item_note">
+                  <%= _("A one line summary of the information you are requesting, \n\t\t\te.g.") %>
+                    <%= render :partial => "summary_suggestion" %>
+              </div>
+          </div>
 
-        <% if !@info_request.tag_string.empty? %>
-            <p class="form_note">
-                <!-- <label class="form_label" for="info_request_tag_string"><%= _("Tags (separated by a space):") %></label>
-                <%= f.text_field :tag_string, :size => 50 %> -->
+          <div id="typeahead_response">
+          </div>
 
-                <%= f.hidden_field(:tag_string) %>
-                <strong>Tags:</strong> <%=h @info_request.tag_string %>
-            </p>
-        <% end %>
+          <%= fields_for :outgoing_message do |o| %>
+          <p>
+              <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label>
+              <%= o.text_area :body, :rows => 20, :cols => 60 %>
+          </p>
+          <% end %>
+
+
+
+          <div class="form_button">
+              <% if @batch %>
+                <% params[:public_body_ids].each do |public_body_id| %>
+                  <%= hidden_field_tag("public_body_ids[]", public_body_id)%>
+                <% end %>
+              <% else %>
+                <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %>
+              <% end %>
+              <%= hidden_field_tag(:submitted_new_request, 1 ) %>
+              <%= hidden_field_tag(:preview, 1 ) %>
+              <%= submit_tag _("Preview your public request") %>
+          </div>
+
+          <% if !@info_request.tag_string.empty? %>
+              <p class="form_note">
+                  <!-- <label class="form_label" for="info_request_tag_string"><%= _("Tags (separated by a space):") %></label>
+                  <%= f.text_field :tag_string, :size => 50 %> -->
+
+                  <%= f.hidden_field(:tag_string) %>
+                  <strong>Tags:</strong> <%=h @info_request.tag_string %>
+              </p>
+          <% end %>
 
+          </div>
         </div>
 <% end %>
 <% if @batch %>
-- 
cgit v1.2.3


From 04de71381907c6c04c1b12d7b15e70cc406b5dcc Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 2 Jul 2014 12:11:27 +0100
Subject: request_search_ahead_results will now longer flash up an empty
 conatiner div

---
 app/views/request/_search_ahead.html.erb | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/views/request/_search_ahead.html.erb b/app/views/request/_search_ahead.html.erb
index 29e971e3d..eb6bd6670 100644
--- a/app/views/request/_search_ahead.html.erb
+++ b/app/views/request/_search_ahead.html.erb
@@ -1,20 +1,19 @@
 <% unless @xapian_requests.nil? %>
-  <div id="request_search_ahead_results">
     <% if @xapian_requests.results.any? %>
-      <span class="close-button">X</span>
-      <h2><%= _("Possible duplicate requests") %></h2>
+        <div id="request_search_ahead_results">
+            <span class="close-button">X</span>
+            <h2><%= _("Possible duplicate requests") %></h2>
+            <% @xapian_requests.results.each do |result| %>
+              <%= render :partial => 'request/request_listing_short_via_event',
+                         :locals => { :event => result[:model],
+                                      :info_request => result[:model].info_request } %>
+            <% end %>
 
-      <% @xapian_requests.results.each do |result| %>
-        <%= render :partial => 'request/request_listing_short_via_event',
-                   :locals => { :event => result[:model],
-                                :info_request => result[:model].info_request } %>
-      <% end %>
-
-      <p>
-          <a id="body-site-search-link">
-            <%= _("Search in their website for this information &rarr;") %>
-          </a>
-      </p>
+            <p>
+                <a id="body-site-search-link">
+                  <%= _("Search in their website for this information &rarr;") %>
+                </a>
+            </p>
+        </div>
     <% end %>
-  </div>
 <% end %>
-- 
cgit v1.2.3


From 3fc0d03da4f51f4ce473a039834cbfadad2d7b4e Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Mon, 8 Dec 2014 17:05:30 +0000
Subject: Laid out select_authority screen

---
 app/assets/stylesheets/responsive/_new_request_layout.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index 16d215dd2..f702dd112 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -3,6 +3,7 @@
 /* /select_authority page */
 #authority_selection {
   @include grid-column($columns: 12, $collapse: true);
+  @include grid-column(8);
   @include respond-min( $main_menu-mobile_menu_cutoff ){
     @include ie8{
       padding-right: 0.9375em;
@@ -22,7 +23,7 @@
   #authority_search_ahead_results,
   .cant_find_results {
     @include respond-min( $main_menu-mobile_menu_cutoff ){
-      @include grid-column(6);
+      @include grid-column(12);
     }
   }
 }
@@ -34,7 +35,7 @@
 #select_authority_help {
   @include grid-column(12);
   @include respond-min( $main_menu-mobile_menu_cutoff ) {
-    @include grid-column(6);
+    @include grid-column(4);
     @include ie8 {
       padding-right: 0.9375em;
     }
-- 
cgit v1.2.3


From 517277f06ed4ae37996e4109b85b06e00ddfbf3c Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 11 Dec 2014 12:24:30 +0000
Subject: move to: field to become a more obvious part of the form

---
 .../responsive/_new_request_layout.scss            |   4 +
 app/views/request/new.html.erb                     | 148 +++++++++++----------
 2 files changed, 79 insertions(+), 73 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index f702dd112..4a9e824d0 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -107,6 +107,10 @@
   @include grid-row($behavior: nest);
 }
 
+#request_body_header {
+  @include grid-column(12);
+}
+
 /* Advice sits on right hand side */
 #request_advice, .preview-advice {
   @include grid-column(12);
diff --git a/app/views/request/new.html.erb b/app/views/request/new.html.erb
index 74dbec84b..27c578481 100644
--- a/app/views/request/new.html.erb
+++ b/app/views/request/new.html.erb
@@ -36,92 +36,94 @@
 <% else %>
   <% @title = _("Make an {{law_used_short}} request to '{{public_body_name}}'",:law_used_short=>h(@info_request.law_used_short),:public_body_name=>h(@info_request.public_body.name))  %>
 <% end %>
-    <h1><%= _('Make a request') %></h1>
-
-    <% if @existing_request %>
+  <div id="request_header">
+    <div id="request_header_body">
+      <h1><%= _('Make a request') %></h1>
+
+      <% if @existing_request %>
+        <div class="errorExplanation" id="errorExplanation"><ul>
+        <li>
+         <%= _('{{existing_request_user}} already
+        created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>,
+        or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_path(@existing_request)) %>
+        </li>
+        </ul></div>
+      <% end %>
+      <% if @existing_batch %>
       <div class="errorExplanation" id="errorExplanation"><ul>
       <li>
-       <%= _('{{existing_request_user}} already
-      created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>,
-      or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_path(@existing_request)) %>
+       <%= _('You already created the same batch of requests on {{date}}.   You can either view the <a href="{{existing_batch}}">existing batch</a>, or edit the details below to make a new but similar batch of requests.', :date=>simple_date(@existing_batch.created_at), :existing_batch=>info_request_batch_path(@existing_batch)) %>
       </li>
       </ul></div>
-    <% end %>
-    <% if @existing_batch %>
-    <div class="errorExplanation" id="errorExplanation"><ul>
-    <li>
-     <%= _('You already created the same batch of requests on {{date}}.   You can either view the <a href="{{existing_batch}}">existing batch</a>, or edit the details below to make a new but similar batch of requests.', :date=>simple_date(@existing_batch.created_at), :existing_batch=>info_request_batch_path(@existing_batch)) %>
-    </li>
-    </ul></div>
-    <% end %>
-
-    <%= foi_error_messages_for :info_request, :outgoing_message %>
-
-    <%= form_for(@info_request, :url => (@batch ? new_batch_path : new_request_path), :html => { :id => 'write_form' }  ) do |f| %>
-
-    <div id="request_header">
-        <div id="request_header_body">
-            <% if @batch %>
-                <label class="form_label"><%= _('To:') %></label>
-                <span id="to_public_body">
-                  <%= _("Your selected authorities") %>
-                  <span class="batch_public_body_toggle" data-hidetext="<%= _("(hide)") %>" data-showtext="<%= _("(show)") %>"><a class="toggle-message"></a></span>
-                </span>
-
-                <div class="batch_public_body_list">
-                  <ul>
-                  <% @public_bodies.each do |public_body| %>
-                    <li><%= public_body.name %></li>
-                  <% end %>
-                  </ul>
-                </div>
-
-            <% else %>
-              <p id="to_public_body"><span class="to_public_body_label">To:</span>
-                <%=h(@info_request.public_body.name)%>
-              </p>
-            <% end %>
+      <% end %>
 
-            <% unless @batch %>
-              <% if @info_request.public_body.has_notes? %>
-                <div id="request_header_text">
-                  <p><%= @info_request.public_body.notes_as_html.html_safe %></p>
-                </div>
-              <% end %>
-
-              <% if @info_request.public_body.override_request_email %>
-                <div class="warning">
-                  <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => @info_request.public_body.override_request_email) %>
-                </div>
-              <% end %>
+      <%= foi_error_messages_for :info_request, :outgoing_message %>
 
-              <% if @info_request.public_body.eir_only? %>
-                <h3><%= _('Please ask for environmental information only') %></h3>
+      <%= form_for(@info_request, :url => (@batch ? new_batch_path : new_request_path), :html => { :id => 'write_form' }  ) do |f| %>
+      </div>
+    </div>
+    <div class="request_body">
+        <div id="request_body_header">
+          <% if @info_request.public_body.override_request_email %>
+            <div class="warning">
+              <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => @info_request.public_body.override_request_email) %>
+            </div>
+          <% end %>
 
-                <p><%= _('The Freedom of Information Act <strong>does not apply</strong> to') %> <%=h(@info_request.public_body.name)%>.
-                <%= _('However, you have the right to request environmental
-            information under a different law') %> (<a href="/help/requesting#eir">explanation</a>).
-                <%= _('This covers a very wide spectrum of information about the state of
-            the <strong>natural and built environment</strong>, such as:') %>
+          <% if @batch %>
+              <label class="form_label"><%= _('To:') %></label>
+              <span id="to_public_body">
+                <%= _("Your selected authorities") %>
+                <span class="batch_public_body_toggle" data-hidetext="<%= _("(hide)") %>" data-showtext="<%= _("(show)") %>"><a class="toggle-message"></a></span>
+              </span>
 
+              <div class="batch_public_body_list">
                 <ul>
-                <li><%= _('Air, water, soil, land, flora and fauna (including how these effect
-            human beings)') %></li>
-                <li><%= _('Information on emissions and discharges (e.g. noise, energy,
-            radiation, waste materials)') %></li>
-                <li><%= _('Human health and safety') %></li>
-                <li><%= _('Cultural sites and built structures (as they may be affected by the
-            environmental factors listed above)') %></li>
-                <li><%= _('Plans and administrative measures that affect these matters') %></li>
+                <% @public_bodies.each do |public_body| %>
+                  <li><%= public_body.name %></li>
+                <% end %>
                 </ul>
+              </div>
 
-                <p><%= _('Please only request information that comes under those categories, <strong>do not waste your
-            time</strong> or the time of the public authority by requesting unrelated information.') %></p>
+          <% else %>
+            <p id="to_public_body"><span class="to_public_body_label">To:</span>
+              <%=h(@info_request.public_body.name)%>
+            </p>
+          <% end %>
+
+          <% unless @batch %>
+            <% if @info_request.public_body.has_notes? %>
+              <div id="request_header_text">
+                <p><%= @info_request.public_body.notes_as_html.html_safe %></p>
+              </div>
             <% end %>
+
+            <% if @info_request.public_body.eir_only? %>
+              <h3><%= _('Please ask for environmental information only') %></h3>
+
+              <p><%= _('The Freedom of Information Act <strong>does not apply</strong> to') %> <%=h(@info_request.public_body.name)%>.
+              <%= _('However, you have the right to request environmental
+          information under a different law') %> (<a href="/help/requesting#eir">explanation</a>).
+              <%= _('This covers a very wide spectrum of information about the state of
+          the <strong>natural and built environment</strong>, such as:') %>
+
+              <ul>
+              <li><%= _('Air, water, soil, land, flora and fauna (including how these effect
+          human beings)') %></li>
+              <li><%= _('Information on emissions and discharges (e.g. noise, energy,
+          radiation, waste materials)') %></li>
+              <li><%= _('Human health and safety') %></li>
+              <li><%= _('Cultural sites and built structures (as they may be affected by the
+          environmental factors listed above)') %></li>
+              <li><%= _('Plans and administrative measures that affect these matters') %></li>
+              </ul>
+
+              <p><%= _('Please only request information that comes under those categories, <strong>do not waste your
+          time</strong> or the time of the public authority by requesting unrelated information.') %></p>
           <% end %>
-        </div>
-    </div>
-    <div class="request_body">
+        <% end %>
+      </div>
+
       <div id="request_advice">
         <p>
           <% if @info_request.public_body.info_requests.size > 0 %>
-- 
cgit v1.2.3


From 1edbf2de973755700ab7e628adde1a297cf9ab3d Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 11 Dec 2014 12:25:16 +0000
Subject: layout tweaks to select_authority

---
 app/assets/stylesheets/responsive/_new_request_layout.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index 4a9e824d0..dc2d43900 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -3,8 +3,9 @@
 /* /select_authority page */
 #authority_selection {
   @include grid-column($columns: 12, $collapse: true);
-  @include grid-column(8);
+
   @include respond-min( $main_menu-mobile_menu_cutoff ){
+    @include grid-column(8, $collapse: true);
     @include ie8{
       padding-right: 0.9375em;
     }
@@ -33,7 +34,7 @@
 }
 
 #select_authority_help {
-  @include grid-column(12);
+  @include grid-column(12, $collapse: true);
   @include respond-min( $main_menu-mobile_menu_cutoff ) {
     @include grid-column(4);
     @include ie8 {
-- 
cgit v1.2.3


From bc1e3a2f1443a20d107a50e15833232a986e5773 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 11 Dec 2014 12:25:50 +0000
Subject: WIP commit of public body page redesign

---
 .../responsive/_public_body_layout.scss            |  49 +++++++
 .../stylesheets/responsive/_public_body_style.scss |  35 ++---
 app/controllers/public_body_controller.rb          |   3 +
 app/models/track_thing.rb                          |   3 +-
 app/views/public_body/show.html.erb                | 148 ++++++++++++---------
 5 files changed, 160 insertions(+), 78 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss
index 39d42e213..bed6b56c7 100644
--- a/app/assets/stylesheets/responsive/_public_body_layout.scss
+++ b/app/assets/stylesheets/responsive/_public_body_layout.scss
@@ -8,3 +8,52 @@
     @include grid-column(12);
     margin-top: 0.5em;
 }
+
+.authority__header {
+    margin-bottom: 1em;
+    padding-bottom: 1em;
+    @include grid-column(12);
+}
+
+.authority__body {
+    .request_left,
+    .request_right {
+        float: none;
+        width: auto;
+    }
+    .desc {
+        padding-left: 0;
+    }
+    .request_listing .bottomline {
+        padding-bottom: 0.5em;
+    }
+}
+
+.authority__body__foi-results {
+    @include grid-column(12);
+    @include respond-min( $main_menu-mobile_menu_cutoff ){
+        @include grid-column(8);
+    }
+}
+
+.authority__body__sidebar {
+    @include grid-column(12);
+    @include respond-min( $main_menu-mobile_menu_cutoff ){
+        @include grid-column(4);
+    }
+}
+
+.authority__header__action-bar {
+    font-size: 0;
+    padding: 8px 0;
+}
+
+.action-bar__make-request,
+.action-bar__follow,
+.action-bar__follow-button,
+.action-bar__follower-count {
+    display: inline-block;
+    vertical-align: top;
+    font-size: 16px;
+    margin-right: 1em;
+}
diff --git a/app/assets/stylesheets/responsive/_public_body_style.scss b/app/assets/stylesheets/responsive/_public_body_style.scss
index 4040198b3..3876ef40a 100644
--- a/app/assets/stylesheets/responsive/_public_body_style.scss
+++ b/app/assets/stylesheets/responsive/_public_body_style.scss
@@ -1,24 +1,27 @@
 /* Style for public body pages */
 
 .back-to-results {
-  .message {
-    margin-top: 0.5em;
-    padding: 0.5em 0.8em;
-    background-color: #fff;
-    background-color: rgba(0,0,0,0.1);
-  }
+    .message {
+        margin-top: 0.5em;
+        padding: 0.5em 0.8em;
+        background-color: #fff;
+        background-color: rgba(0,0,0,0.1);
+    }
 }
 
-.public-body-name-prefix {
-  color:#888;
-  font-size: 1.3em;
-  position: relative;
-  top: 1em;
+.authority__header {
+    border-bottom: 1px solid #e9e9e9;
 }
 
-#follow_count {
-  font-weight: bold;
-  font-size: 3em;
-  position: relative;
-  top: 0.25em;
+.authority__header__action-bar {
+    border-top: 1px solid #e9e9e9;
+}
+
+.authority__body__sidebar {
+    h2 {
+        font-size: 1.2em;
+    }
+    h3 {
+        font-size: 1em;
+    }
 }
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb
index 2e540d198..cc3d0b64a 100644
--- a/app/controllers/public_body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -58,6 +58,9 @@ class PublicBodyController < ApplicationController
             flash.keep(:search_params)
 
             @track_thing = TrackThing.create_track_for_public_body(@public_body)
+            if @user
+                @existing_track = TrackThing.find_existing(@user, @track_thing)
+            end
             @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ]
 
             respond_to do |format|
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index 5819876ff..cd90c4a9e 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -231,8 +231,7 @@ class TrackThing < ActiveRecord::Base
         { # Website
           :verb_on_page => _("Follow requests to {{public_body_name}}",
                              :public_body_name => public_body.name),
-          :verb_on_page_already => _("You are already following requests to {{public_body_name}}",
-                                     :public_body_name => public_body.name),
+          :verb_on_page_already => _("Following"),
           # Email
           :title_in_email => _("{{foi_law}} requests to '{{public_body_name}}'",
                                :foi_law => public_body.law_only_short,
diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index e7c5fa2b6..d9b89ea1d 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -1,65 +1,96 @@
 <% @title = h(@public_body.name) + _(" - view and make Freedom of Information requests") %>
-<div id="main_content">
-
-    <% if flash[:search_params] %>
-      <div class="back-to-results">
-        <div class="message">
-          <%= link_to select_authority_path(flash[:search_params]) do %>
-            <%= _('« Back to search results') %>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
-
-    <div id="header_right">
-      <h2><%= _('Follow this authority')%></h2>
-
-      <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
-      <p>
-        <%= n_("{{count}} person is following this authority",
-                "{{count}} people are following this authority",
-                follower_count,
-                :count => content_tag(:span, follower_count, :id => "follow_count")) %>
-      </p>
 
-        <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
-        <%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'sidebar' } %>
-        <%= render :partial => 'more_info', :locals => { :public_body => @public_body } %>
+<% if flash[:search_params] %>
+  <div class="back-to-results">
+    <div class="message">
+      <%= link_to select_authority_path(flash[:search_params]) do %>
+        <%= _('« Back to search results') %>
+      <% end %>
     </div>
+  </div>
+<% end %>
 
-    <div id="header_left">
-        <p class="public-body-name-prefix"><%= _("Freedom of information requests to") %></p>
-        <h1><%=h(@public_body.name)%></h1>
-
-        <p class="subtitle">
+<div class="authority__header">
+    <h1><%=h(@public_body.name)%></h1>
+    <p class="authority__header__subtitle">
         <%=@public_body.type_of_authority(true)%><% if not @public_body.short_name.empty? %>,
         <%= _('also called {{public_body_short_name}}', :public_body_short_name =>  h(@public_body.short_name))%><% end %>
         <% if !@user.nil? && @user.admin_page_links? %>
         (<%= link_to _("admin"), admin_body_path(@public_body) %>)
         <% end %>
+    </p>
+
+    <div id="stepwise_make_request">
+      <% if @public_body.has_notes? %>
+        <p class="authority__header__notes">
+          <%= @public_body.notes_as_html.html_safe %>
         </p>
+      <% end %>
 
-        <div id="stepwise_make_request">
-          <% if @public_body.has_notes? %>
-            <%= @public_body.notes_as_html.html_safe %>
-          <% end %>
+      <% if @public_body.is_requestable? %>
+        <% if @public_body.eir_only? %>
+          <p class="authority__header__notes">
+            <%= _('You can only request information about the environment from this authority.')%>
+          </p>
+        <% end %>
 
-          <% if @public_body.is_requestable? %>
-            <% if @public_body.eir_only? %>
-              <p><%= _('You can only request information about the environment from this authority.')%></p>
+        <%= link_to _("Make a request to this authority"),
+                    new_request_to_body_path(:url_name => @public_body.url_name),
+                    :class => "link_button_green" %>
+      <% else %>
+        <p class="authority__header__notes">
+          <%= public_body_not_requestable_reasons(@public_body).first %>
+        </p>
+      <% end %>
+    </div>
+
+    <% if @public_body.info_requests.size > 0 %>
+        <div class="authority__header__stats">
+            <%= n_('{{count}} request',
+                '{{count}} requests',
+                @public_body.info_requests.size,
+                :count => @public_body.info_requests.size) %>
+        </div>
+    <% end %>
+    <div class="authority__header__action-bar">
+        <div class="action-bar__make-request">
+            <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %>
+                <%= link_to _("Make a request to this authority"), new_request_to_body_path(:url_name => @public_body.url_name), :class => "link_button_green" %>
+            <% elsif @public_body.has_notes? %>
+                <%= @public_body.notes_as_html.html_safe %>
             <% end %>
 
-            <%= link_to _("Make a request to this authority"),
-                        new_request_to_body_path(:url_name => @public_body.url_name),
-                        :class => "link_button_green" %>
-          <% else %>
-            <p><%= public_body_not_requestable_reasons(@public_body).first %></p>
-          <% end %>
+        <div class="action-bar__follow">
+            <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
+            <div class="action-bar__follow-button">
+              <% if @existing_track %>
+                  <%= @track_thing.params[:verb_on_page_already] %>
+                <%= (link_to _("(unsubscribe)"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}) %>
+              <% else %>
+                  <div class="feed_link">
+                      <%= link_to _("Follow"), do_track_path(@track_thing), :class => "link_button_green" %>
+                  </div>
+              <% end %>
+
+            </div>
+            <div class="action-bar__follower-count">
+                <%= n_("{{count}} follower",
+                    "{{count}} followers",
+                    follower_count,
+                    :count => content_tag(:span, follower_count, :id => "follow_count")) %>
+            </div>
         </div>
     </div>
+</div>
 
-    <div id="foi_results_section">
-       <% if @public_body.info_requests.size == 0 %>
+
+
+
+
+
+<div class="authority__body">
+    <div class="authority__body__foi-results">
+        <% if @public_body.info_requests.size == 0 %>
             <% if @public_body.is_requestable? or @public_body.not_requestable_reason != 'defunct' %>
                 <% if @public_body.eir_only? %>
                     <h2><%= _('Environmental Information Regulations requests made using this site') %></h2>
@@ -71,20 +102,10 @@
             <% end %>
         <% else %>
             <h2 class="foi_results">
-                <% if @public_body.eir_only? %>
-                    <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %>
-                <% else %>
-               <% if  @public_body.info_requests.size > 4 %>
-                <%= n_('Search within the {{count}} Freedom of Information requests to {{public_body_name}}', 'Search within the {{count}} Freedom of Information requests made to {{public_body_name}}', @public_body.info_requests.size, :count => @public_body.info_requests.size, :public_body_name => @public_body.name) %>
-                   <% else %>
-                  <%= n_('{{count}} Freedom of Information request to {{public_body_name}}',
-                        '{{count}} Freedom of Information requests to {{public_body_name}}',
-                        @public_body.info_requests.size,
-                        :count => @public_body.info_requests.size,
-                        :public_body_name => @public_body.name) %>
-               <% end %>
-                <% end %>
-                <%= @page_desc %>
+            <% if @public_body.eir_only? %>
+                <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %>
+            <% end %>
+            <%= @page_desc %>
             </h2>
             <a name="results"></a>
 
@@ -94,7 +115,6 @@
             <% end %>
         <% end %>
 
-        <div style="clear:both">&nbsp;</div>
         <% if !@xapian_requests.nil? %>
 
             <% for result in @xapian_requests.results %>
@@ -121,4 +141,12 @@
             <p> <%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests that have been made to this authority.')%></p>
         <% end %>
     </div>
+
+    <div class="authority__body__sidebar">
+        <% if  @public_body.info_requests.size > 4 %>
+            <%= render :partial => 'request/request_filter_form' %>
+        <% end %>
+        <%= render :partial => 'more_info', :locals => { :public_body => @public_body } %>
+    </div>
+
 </div>
-- 
cgit v1.2.3


From 2df0322adeece42404a82957a8f1bf42c9d42407 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Tue, 13 Jan 2015 10:45:25 +0000
Subject: Add in new partials

---
 app/views/public_body/show.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index d9b89ea1d..e9798f0a9 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -110,8 +110,7 @@
             <a name="results"></a>
 
             <% if  @public_body.info_requests.size > 4 %>
-                <%= render :partial => 'request/request_search_form',
-                           :locals => { :after_form_fields => render(:partial => 'request/request_filter_form') } %>
+                <%= render :partial => 'request/request_filter_form' %>
             <% end %>
         <% end %>
 
@@ -144,9 +143,10 @@
 
     <div class="authority__body__sidebar">
         <% if  @public_body.info_requests.size > 4 %>
-            <%= render :partial => 'request/request_filter_form' %>
+            <%= render :partial => 'request/request_search_form' %>
         <% end %>
         <%= render :partial => 'more_info', :locals => { :public_body => @public_body } %>
+        <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
     </div>
 
 </div>
-- 
cgit v1.2.3


From 18f5d3c10ae84b8500f039a838991275aee5962f Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Tue, 13 Jan 2015 11:01:12 +0000
Subject: made filters more semantic, styling

---
 .../responsive/_public_body_layout.scss            |  8 ++++++++
 .../stylesheets/responsive/_public_body_style.scss | 24 ++++++++++++++++++++++
 app/views/request/_request_filter_form.html.erb    |  8 +++++---
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss
index bed6b56c7..13be5fc82 100644
--- a/app/assets/stylesheets/responsive/_public_body_layout.scss
+++ b/app/assets/stylesheets/responsive/_public_body_layout.scss
@@ -57,3 +57,11 @@
     font-size: 16px;
     margin-right: 1em;
 }
+
+.list-filter-item {
+    .title {
+        display: inline;
+        font-size: 1em;
+        font-weight: normal;
+    }
+}
diff --git a/app/assets/stylesheets/responsive/_public_body_style.scss b/app/assets/stylesheets/responsive/_public_body_style.scss
index 3876ef40a..6af2d08a7 100644
--- a/app/assets/stylesheets/responsive/_public_body_style.scss
+++ b/app/assets/stylesheets/responsive/_public_body_style.scss
@@ -25,3 +25,27 @@
         font-size: 1em;
     }
 }
+
+
+.list-filter-item {
+    ul {
+        list-style: none outside none;
+        margin: 0;
+        padding: 0;
+    }
+    li {
+        display: inline-block;
+        &:after {
+            content:' | ';
+            display: inline-block;
+            color: #ccc; //Unsupported browsers will ignore the rgba declaration below
+            color: rgba(0,0,0,0.1);
+        }
+        &:last-child {
+            &:after {
+                content: '';
+            }
+        }
+
+    }
+}
diff --git a/app/views/request/_request_filter_form.html.erb b/app/views/request/_request_filter_form.html.erb
index 0983c8c57..19961ddfc 100644
--- a/app/views/request/_request_filter_form.html.erb
+++ b/app/views/request/_request_filter_form.html.erb
@@ -1,21 +1,23 @@
 <div class="list-filter-item">
-  <h3 class="title"><%= _("Showing") %></h3>
   <div class="filter-request-types">
+    <ul>
     <% statuses = [["all", _("all requests")],
                    ["successful", _("successful requests")],
                    ["unsuccessful", _("unsuccessful requests")],
                    ["awaiting", _("unresolved requests")]] %>
     <% statuses.each do |status, label| %>
+      <li>
       <% if params[:view] != status %>
         <% if params[:controller] == "public_body" %>
           <%= link_to label, url_for(:controller => "public_body", :action => "show", :view => status, :url_name => @public_body.url_name) + "?" + request.query_string + '#results' %>
         <% else %>
-          <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string + '#results' %> 
+          <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string + '#results' %>
         <% end %>
       <% else %>
         <%= label %>
       <% end %>
-      <%= "|" unless statuses.last[0] == status %>
+      </li>
     <% end %>
+    </ul>
   </div>
 </div>
-- 
cgit v1.2.3


From 7c5fbd63a635025fb294a491735a6c4dae160e1e Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Tue, 13 Jan 2015 16:43:26 +0000
Subject: tweaks to styles and spacing of authority page

---
 .../stylesheets/responsive/_global_style.scss      |  2 +-
 .../responsive/_public_body_layout.scss            |  4 ++--
 .../stylesheets/responsive/_public_body_style.scss | 25 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_global_style.scss b/app/assets/stylesheets/responsive/_global_style.scss
index 771fc9d88..24cddc0d9 100644
--- a/app/assets/stylesheets/responsive/_global_style.scss
+++ b/app/assets/stylesheets/responsive/_global_style.scss
@@ -92,7 +92,7 @@ dt + dd {
 
 /* Links in sidebars usually only underlined on hover */
 .feed_link,.act_link {
-  margin-bottom:10px;
+
   a{
     text-decoration:none;
   }
diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss
index 13be5fc82..33550780b 100644
--- a/app/assets/stylesheets/responsive/_public_body_layout.scss
+++ b/app/assets/stylesheets/responsive/_public_body_layout.scss
@@ -11,7 +11,6 @@
 
 .authority__header {
     margin-bottom: 1em;
-    padding-bottom: 1em;
     @include grid-column(12);
 }
 
@@ -45,7 +44,8 @@
 
 .authority__header__action-bar {
     font-size: 0;
-    padding: 8px 0;
+    padding: 16px 0;
+    margin-top: 8px;
 }
 
 .action-bar__make-request,
diff --git a/app/assets/stylesheets/responsive/_public_body_style.scss b/app/assets/stylesheets/responsive/_public_body_style.scss
index 6af2d08a7..748f6218b 100644
--- a/app/assets/stylesheets/responsive/_public_body_style.scss
+++ b/app/assets/stylesheets/responsive/_public_body_style.scss
@@ -6,6 +6,9 @@
         padding: 0.5em 0.8em;
         background-color: #fff;
         background-color: rgba(0,0,0,0.1);
+        a {
+            text-decoration: none;
+        }
     }
 }
 
@@ -13,6 +16,11 @@
     border-bottom: 1px solid #e9e9e9;
 }
 
+.authority__header__subtitle {
+    font-size: 1.2em;
+    color: #666;
+}
+
 .authority__header__action-bar {
     border-top: 1px solid #e9e9e9;
 }
@@ -49,3 +57,20 @@
 
     }
 }
+
+.authority__body__sidebar__links {
+    a {
+        display: inline-block;
+        margin-bottom: 0.5em;
+    }
+}
+
+#list-filter {
+    margin-bottom: 3em;
+}
+
+#filter_requests_form label.title {
+    display: block;
+    width: auto;
+    margin-bottom: 0.3em;
+}
-- 
cgit v1.2.3


From b48ecd8048d35e327d0eec182ca73355e64f36a6 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Tue, 13 Jan 2015 17:04:49 +0000
Subject: complete new styling of new request page

---
 .../responsive/_new_request_layout.scss            |   4 +
 .../stylesheets/responsive/_new_request_style.scss |   5 +
 app/views/request/new.html.erb                     | 300 +++++++++++----------
 3 files changed, 167 insertions(+), 142 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index dc2d43900..a5714a510 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -140,6 +140,10 @@
 
 }
 
+#outgoing_message_body {
+  width: 100%;
+}
+
 /* Message preview */
 .message-preview {
   @include grid-row($behavior: nest);
diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss
index 574c98c9e..fa0180d62 100644
--- a/app/assets/stylesheets/responsive/_new_request_style.scss
+++ b/app/assets/stylesheets/responsive/_new_request_style.scss
@@ -103,6 +103,11 @@ input#reedit_button {
     border: none;
 }
 
+
+input[name=commit] {
+
+}
+
 /* Batch request page */
 
 .batch_public_body_toggle {
diff --git a/app/views/request/new.html.erb b/app/views/request/new.html.erb
index 27c578481..cbcf5a0a5 100644
--- a/app/views/request/new.html.erb
+++ b/app/views/request/new.html.erb
@@ -31,100 +31,115 @@
       });
   </script>
 <% end %>
+
+
+
 <% if @batch %>
   <% @title = _("Make an {{law_used_short}} request", :law_used_short=>h(@info_request.law_used_short))  %>
 <% else %>
   <% @title = _("Make an {{law_used_short}} request to '{{public_body_name}}'",:law_used_short=>h(@info_request.law_used_short),:public_body_name=>h(@info_request.public_body.name))  %>
 <% end %>
+
+
+<%= form_for(@info_request, :url => (@batch ? new_batch_path : new_request_path), :html => { :id => 'write_form' }  ) do |f| %>
   <div id="request_header">
     <div id="request_header_body">
       <h1><%= _('Make a request') %></h1>
 
       <% if @existing_request %>
-        <div class="errorExplanation" id="errorExplanation"><ul>
-        <li>
-         <%= _('{{existing_request_user}} already
-        created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>,
-        or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_path(@existing_request)) %>
-        </li>
-        </ul></div>
+        <div class="errorExplanation" id="errorExplanation">
+          <ul>
+            <li>
+             <%= _('{{existing_request_user}} already
+            created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>,
+            or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_path(@existing_request)) %>
+            </li>
+          </ul>
+        </div>
       <% end %>
+
       <% if @existing_batch %>
-      <div class="errorExplanation" id="errorExplanation"><ul>
-      <li>
-       <%= _('You already created the same batch of requests on {{date}}.   You can either view the <a href="{{existing_batch}}">existing batch</a>, or edit the details below to make a new but similar batch of requests.', :date=>simple_date(@existing_batch.created_at), :existing_batch=>info_request_batch_path(@existing_batch)) %>
-      </li>
-      </ul></div>
+        <div class="errorExplanation" id="errorExplanation">
+          <ul>
+            <li>
+              <%= _('You already created the same batch of requests on {{date}}.   You can either view the <a href="{{existing_batch}}">existing batch</a>, or edit the details below to make a new but similar batch of requests.', :date=>simple_date(@existing_batch.created_at), :existing_batch=>info_request_batch_path(@existing_batch)) %>
+            </li>
+          </ul>
+        </div>
       <% end %>
 
       <%= foi_error_messages_for :info_request, :outgoing_message %>
 
-      <%= form_for(@info_request, :url => (@batch ? new_batch_path : new_request_path), :html => { :id => 'write_form' }  ) do |f| %>
-      </div>
-    </div>
-    <div class="request_body">
-        <div id="request_body_header">
-          <% if @info_request.public_body.override_request_email %>
-            <div class="warning">
-              <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => @info_request.public_body.override_request_email) %>
-            </div>
-          <% end %>
-
-          <% if @batch %>
-              <label class="form_label"><%= _('To:') %></label>
-              <span id="to_public_body">
-                <%= _("Your selected authorities") %>
-                <span class="batch_public_body_toggle" data-hidetext="<%= _("(hide)") %>" data-showtext="<%= _("(show)") %>"><a class="toggle-message"></a></span>
-              </span>
-
-              <div class="batch_public_body_list">
-                <ul>
-                <% @public_bodies.each do |public_body| %>
-                  <li><%= public_body.name %></li>
-                <% end %>
-                </ul>
-              </div>
+      <% if @info_request.public_body.override_request_email %>
+        <div class="warning">
+          <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => @info_request.public_body.override_request_email) %>
+        </div>
+      <% end %>
 
-          <% else %>
-            <p id="to_public_body"><span class="to_public_body_label">To:</span>
-              <%=h(@info_request.public_body.name)%>
-            </p>
-          <% end %>
+      <% if @batch %>
+          <label class="form_label"><%= _('To:') %></label>
+          <span id="to_public_body">
+            <%= _("Your selected authorities") %>
+            <span class="batch_public_body_toggle" data-hidetext="<%= _("(hide)") %>" data-showtext="<%= _("(show)") %>"><a class="toggle-message"></a></span>
+          </span>
 
-          <% unless @batch %>
-            <% if @info_request.public_body.has_notes? %>
-              <div id="request_header_text">
-                <p><%= @info_request.public_body.notes_as_html.html_safe %></p>
-              </div>
+          <div class="batch_public_body_list">
+            <ul>
+            <% @public_bodies.each do |public_body| %>
+              <li><%= public_body.name %></li>
             <% end %>
+            </ul>
+          </div>
+      <% else %>
+        <p id="to_public_body"><span class="to_public_body_label">To:</span>
+          <%=h(@info_request.public_body.name)%>
+        </p>
+      <% end %>
 
-            <% if @info_request.public_body.eir_only? %>
-              <h3><%= _('Please ask for environmental information only') %></h3>
-
-              <p><%= _('The Freedom of Information Act <strong>does not apply</strong> to') %> <%=h(@info_request.public_body.name)%>.
-              <%= _('However, you have the right to request environmental
-          information under a different law') %> (<a href="/help/requesting#eir">explanation</a>).
-              <%= _('This covers a very wide spectrum of information about the state of
-          the <strong>natural and built environment</strong>, such as:') %>
-
-              <ul>
-              <li><%= _('Air, water, soil, land, flora and fauna (including how these effect
-          human beings)') %></li>
-              <li><%= _('Information on emissions and discharges (e.g. noise, energy,
-          radiation, waste materials)') %></li>
-              <li><%= _('Human health and safety') %></li>
-              <li><%= _('Cultural sites and built structures (as they may be affected by the
-          environmental factors listed above)') %></li>
-              <li><%= _('Plans and administrative measures that affect these matters') %></li>
-              </ul>
-
-              <p><%= _('Please only request information that comes under those categories, <strong>do not waste your
-          time</strong> or the time of the public authority by requesting unrelated information.') %></p>
-          <% end %>
+      <% unless @batch %>
+        <% if @info_request.public_body.has_notes? %>
+          <div id="request_header_text">
+            <p><%= @info_request.public_body.notes_as_html.html_safe %></p>
+          </div>
         <% end %>
+      <% end %>
+
+    </div>
+  </div>
+
+  <% unless @batch %>
+    <% if @info_request.public_body.eir_only? %>
+      <div class="request_body">
+        <div id="request_body_header">
+          <h3><%= _('Please ask for environmental information only') %></h3>
+
+          <p><%= _('The Freedom of Information Act <strong>does not apply</strong> to') %> <%=h(@info_request.public_body.name)%>.
+          <%= _('However, you have the right to request environmental
+      information under a different law') %> (<a href="/help/requesting#eir">explanation</a>).
+          <%= _('This covers a very wide spectrum of information about the state of
+      the <strong>natural and built environment</strong>, such as:') %>
+          </p>
+          <ul>
+          <li><%= _('Air, water, soil, land, flora and fauna (including how these effect
+      human beings)') %></li>
+          <li><%= _('Information on emissions and discharges (e.g. noise, energy,
+      radiation, waste materials)') %></li>
+          <li><%= _('Human health and safety') %></li>
+          <li><%= _('Cultural sites and built structures (as they may be affected by the
+      environmental factors listed above)') %></li>
+          <li><%= _('Plans and administrative measures that affect these matters') %></li>
+          </ul>
+
+          <p><%= _('Please only request information that comes under those categories, <strong>do not waste your
+      time</strong> or the time of the public authority by requesting unrelated information.') %></p>
+        </div>
       </div>
+    <% end %>
+  <% end %>
 
-      <div id="request_advice">
+  <div class="request_body">
+    <div id="request_advice">
+      <% unless @batch %>
         <p>
           <% if @info_request.public_body.info_requests.size > 0 %>
               <%= _("Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name), :url=>public_body_path(@info_request.public_body)) %>
@@ -132,89 +147,90 @@
               <%= _("Browse <a href='{{url}}'>other requests</a> for examples of how to word your request.", :url=>request_list_url) %>
           <% end %>
         </p>
-        <% unless @batch %>
-          <% if !@user %>
-            <p>
-              <%= raw(_('Everything that you enter on this page, including <strong>your name</strong>,
-              will be <strong>displayed publicly</strong> on
-              this website <a href="{{url}}">forever</a>', :url => (help_privacy_path+"#public_request").html_safe)) %>.
-            </p>
-            <p>
-              <%= raw(_('<a href="{{url}}">Thinking of using a pseudonym?</a>.', :url => (help_privacy_path+"#real_name").html_safe)) %>
-            </p>
-          <% else %>
-            <p>
-              <%= raw(_('Everything that you enter on this page
-              will be <strong>displayed publicly</strong> on
-              this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %>
-            </p>
-        <% end %>
+      <% end %>
 
-          <p>
-            <%= raw(_("<strong> Can I request information about myself?</strong>\n" +
-            "\t\t\t<a href=\"{{url}}\">No!</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %>
-          </p>
-          <div class="advice-panel">
-            <ul>
-              <% end %>
-              <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li>
-              <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li>
-              <li><%= _('<a href="{{url}}">Keep it <strong>focused</strong></a>, you\'ll be more likely to get what you want.', :url => (help_requesting_path + '#focused').html_safe) %></li>
-            </ul>
-          </div>
+      <% if !@user %>
+        <p>
+          <%= raw(_('Everything that you enter on this page, including <strong>your name</strong>,
+          will be <strong>displayed publicly</strong> on
+          this website <a href="{{url}}">forever</a>', :url => (help_privacy_path+"#public_request").html_safe)) %>.
+        </p>
+        <p>
+          <%= raw(_('<a href="{{url}}">Thinking of using a pseudonym?</a>.', :url => (help_privacy_path+"#real_name").html_safe)) %>
+        </p>
+      <% else %>
+        <p>
+          <%= raw(_('Everything that you enter on this page
+          will be <strong>displayed publicly</strong> on
+          this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %>
+        </p>
+      <% end %>
+
+      <p>
+        <%= raw(_("<strong> Can I request information about myself?</strong>\n" +
+          "\t\t\t<a href=\"{{url}}\">No!</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %>
+      </p>
+      <div class="advice-panel">
+        <ul>
+
+          <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li>
+          <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li>
+          <li><%= _('<a href="{{url}}">Keep it <strong>focused</strong></a>, you\'ll be more likely to get what you want.', :url => (help_requesting_path + '#focused').html_safe) %></li>
+        </ul>
       </div>
 
-      <div id="request_form">
-
-          <div id="request_header_subject">
-              <p>
-                  <label class="form_label" for="typeahead_search"><%= _('Summary:') %></label>
-                  <%= f.text_field :title, :size => 50, :id =>"typeahead_search" %>
-              </p>
-              <div class="form_item_note">
-                  <%= _("A one line summary of the information you are requesting, \n\t\t\te.g.") %>
-                    <%= render :partial => "summary_suggestion" %>
-              </div>
-          </div>
+    </div>
 
-          <div id="typeahead_response">
-          </div>
+    <div id="request_form">
 
-          <%= fields_for :outgoing_message do |o| %>
-          <p>
-              <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label>
-              <%= o.text_area :body, :rows => 20, :cols => 60 %>
-          </p>
-          <% end %>
+      <div id="request_header_subject">
+        <p>
+          <label class="form_label" for="typeahead_search"><%= _('Summary:') %></label>
+            <%= f.text_field :title, :size => 50, :id =>"typeahead_search" %>
+        </p>
+        <div class="form_item_note">
+          <%= _("A one line summary of the information you are requesting, \n\t\t\te.g.") %>
+          <%= render :partial => "summary_suggestion" %>
+        </div>
+      </div>
 
+      <div id="typeahead_response">
+      </div>
 
+      <%= fields_for :outgoing_message do |o| %>
+      <p>
+          <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label>
+          <%= o.text_area :body, :rows => 20, :cols => 60 %>
+      </p>
+      <% end %>
 
-          <div class="form_button">
-              <% if @batch %>
-                <% params[:public_body_ids].each do |public_body_id| %>
-                  <%= hidden_field_tag("public_body_ids[]", public_body_id)%>
-                <% end %>
-              <% else %>
-                <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %>
-              <% end %>
-              <%= hidden_field_tag(:submitted_new_request, 1 ) %>
-              <%= hidden_field_tag(:preview, 1 ) %>
-              <%= submit_tag _("Preview your public request") %>
-          </div>
+      <div class="form_button">
+          <% if @batch %>
+            <% params[:public_body_ids].each do |public_body_id| %>
+              <%= hidden_field_tag("public_body_ids[]", public_body_id)%>
+            <% end %>
+          <% else %>
+            <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %>
+          <% end %>
+          <%= hidden_field_tag(:submitted_new_request, 1 ) %>
+          <%= hidden_field_tag(:preview, 1 ) %>
+          <%= submit_tag _("Preview your public request") %>
+      </div>
 
-          <% if !@info_request.tag_string.empty? %>
-              <p class="form_note">
-                  <!-- <label class="form_label" for="info_request_tag_string"><%= _("Tags (separated by a space):") %></label>
-                  <%= f.text_field :tag_string, :size => 50 %> -->
+      <% if !@info_request.tag_string.empty? %>
+        <p class="form_note">
+          <!-- <label class="form_label" for="info_request_tag_string"><%= _("Tags (separated by a space):") %></label>
+          <%= f.text_field :tag_string, :size => 50 %> -->
 
-                  <%= f.hidden_field(:tag_string) %>
-                  <strong>Tags:</strong> <%=h @info_request.tag_string %>
-              </p>
-          <% end %>
+          <%= f.hidden_field(:tag_string) %>
+          <strong>Tags:</strong> <%=h @info_request.tag_string %>
+        </p>
+      <% end %>
 
-          </div>
-        </div>
+    </div>
+  </div>
 <% end %>
+
 <% if @batch %>
   <%= javascript_include_tag 'new-request.js' %>
 <% end %>
-- 
cgit v1.2.3


From 886369a38ce932e9b34e064ea0d4118c115d077c Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 14 Jan 2015 15:02:09 +0000
Subject: remove empty declaration

---
 app/assets/stylesheets/responsive/_new_request_style.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss
index fa0180d62..4ca7a397b 100644
--- a/app/assets/stylesheets/responsive/_new_request_style.scss
+++ b/app/assets/stylesheets/responsive/_new_request_style.scss
@@ -104,10 +104,6 @@ input#reedit_button {
 }
 
 
-input[name=commit] {
-
-}
-
 /* Batch request page */
 
 .batch_public_body_toggle {
-- 
cgit v1.2.3


From f68b200c24958929cbed5130eed323fd9afaee5f Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 5 Feb 2015 16:26:05 +0000
Subject: removed grey background from advice panel

---
 app/assets/stylesheets/responsive/_new_request_style.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss
index 4ca7a397b..55abdca31 100644
--- a/app/assets/stylesheets/responsive/_new_request_style.scss
+++ b/app/assets/stylesheets/responsive/_new_request_style.scss
@@ -64,8 +64,6 @@
 }
 
 .advice-panel {
-  background-color: #f4f4f4;
-  padding: 1.5em;
   margin-bottom: 1.5em;
   @include respond-min( $main_menu-mobile_menu_cutoff ){
     margin-bottom: 0;
-- 
cgit v1.2.3


From ffcf85f68fad5320d628f9202d9efc3539cc6cac Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Fri, 6 Feb 2015 16:15:24 +0000
Subject: add missing } and remove dup code from merge

---
 app/assets/stylesheets/responsive/_new_request_layout.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index a5714a510..2d0e14bca 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -99,9 +99,6 @@
 
 #typeahead_response .close-button {
   float: right;
-
-.request_body {
-  @include grid-row($behavior: nest);
 }
 
 .request_body {
-- 
cgit v1.2.3


From 7d86c38b657aa612f9e3b9429deff77d7b7807b4 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Fri, 6 Feb 2015 17:13:21 +0000
Subject: reworded 'duplicate' to 'related'

when searching for similar requests
---
 app/views/request/_search_ahead.html.erb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/request/_search_ahead.html.erb b/app/views/request/_search_ahead.html.erb
index eb6bd6670..c17c0b1ea 100644
--- a/app/views/request/_search_ahead.html.erb
+++ b/app/views/request/_search_ahead.html.erb
@@ -1,19 +1,19 @@
 <% unless @xapian_requests.nil? %>
+  <div id="request_search_ahead_results">
     <% if @xapian_requests.results.any? %>
-        <div id="request_search_ahead_results">
-            <span class="close-button">X</span>
-            <h2><%= _("Possible duplicate requests") %></h2>
-            <% @xapian_requests.results.each do |result| %>
-              <%= render :partial => 'request/request_listing_short_via_event',
-                         :locals => { :event => result[:model],
-                                      :info_request => result[:model].info_request } %>
-            <% end %>
+      <span class="close-button">X</span>
+      <h2><%= _("Possible related requests") %></h2>
+      <% @xapian_requests.results.each do |result| %>
+        <%= render :partial => 'request/request_listing_short_via_event',
+                   :locals => { :event => result[:model],
+                                :info_request => result[:model].info_request } %>
+      <% end %>
 
-            <p>
-                <a id="body-site-search-link">
-                  <%= _("Search in their website for this information &rarr;") %>
-                </a>
-            </p>
-        </div>
+      <p>
+          <a id="body-site-search-link">
+            <%= _("Search in their website for this information &rarr;") %>
+          </a>
+      </p>
     <% end %>
+  </div>
 <% end %>
-- 
cgit v1.2.3


From 84e22e1262b559d77d56e56ce4ad4e2a25a7409c Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 11 Feb 2015 15:37:08 +0000
Subject: Fix body/show view spec after rewording

---
 spec/views/public_body/show.html.erb_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/views/public_body/show.html.erb_spec.rb b/spec/views/public_body/show.html.erb_spec.rb
index 917c0c793..4ba42b9f7 100644
--- a/spec/views/public_body/show.html.erb_spec.rb
+++ b/spec/views/public_body/show.html.erb_spec.rb
@@ -44,7 +44,7 @@ describe "public_body/show" do
 
     it "should tell total number of requests" do
         render
-        response.should match "4 Freedom of Information requests"
+        response.should match "4 requests"
     end
 
     it "should cope with no results" do
-- 
cgit v1.2.3


From bf7fca93affaabdf90e516124c513925da4fca16 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 11 Feb 2015 15:40:50 +0000
Subject: Remove specs for charity links

This functionality has been moved to whatdotheyknow-theme:
https://github.com/mysociety/whatdotheyknow-theme/commit/963d1453e94056eaf6f93a4f73a1f348a0817656
---
 spec/views/public_body/show.html.erb_spec.rb | 32 ----------------------------
 1 file changed, 32 deletions(-)

diff --git a/spec/views/public_body/show.html.erb_spec.rb b/spec/views/public_body/show.html.erb_spec.rb
index 4ba42b9f7..e4217ca4d 100644
--- a/spec/views/public_body/show.html.erb_spec.rb
+++ b/spec/views/public_body/show.html.erb_spec.rb
@@ -59,38 +59,6 @@ describe "public_body/show" do
         response.should match "The search index is currently offline"
     end
 
-    it "should link to Charity Commission site if we have numbers to do so" do
-        @pb.stub!(:has_tag?).and_return(true)
-        @pb.stub!(:get_tag_values).and_return(['98765', '12345'])
-
-        render
-        response.should have_selector("div#header_right") do
-            have_selector "a", :href => /charity-commission.gov.uk.*RegisteredCharityNumber=98765$/
-        end
-        response.should have_selector("div#header_right") do
-            have_selector "a", :href => /www.charity-commission.gov.uk.*RegisteredCharityNumber=12345$/
-        end
-    end
-
-    it "should link to Scottish Charity Regulator site if we have an SC number" do
-        @pb.stub!(:has_tag?).and_return(true)
-        @pb.stub!(:get_tag_values).and_return(['SC1234'])
-
-        render
-        response.should have_selector("div#header_right") do
-            have_selector "a", :href => /www.oscr.org.uk.*id=SC1234$/
-        end
-    end
-
-
-    it "should not link to Charity Commission site if we don't have number" do
-        render
-        response.should have_selector("div#header_right") do
-            have_selector "a", :href => /charity-commission.gov.uk/
-        end
-    end
-
-
 end
 
 def mock_event
-- 
cgit v1.2.3


From 380116b4b49ebad449a1b260b6937f7de3cbb4de Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 20 Feb 2015 14:35:06 +0000
Subject: Don't add any elements to page if there are no results.

---
 app/views/request/_search_ahead.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/request/_search_ahead.html.erb b/app/views/request/_search_ahead.html.erb
index c17c0b1ea..397973d49 100644
--- a/app/views/request/_search_ahead.html.erb
+++ b/app/views/request/_search_ahead.html.erb
@@ -1,6 +1,6 @@
 <% unless @xapian_requests.nil? %>
+<% if @xapian_requests.results.any? %>
   <div id="request_search_ahead_results">
-    <% if @xapian_requests.results.any? %>
       <span class="close-button">X</span>
       <h2><%= _("Possible related requests") %></h2>
       <% @xapian_requests.results.each do |result| %>
@@ -14,6 +14,7 @@
             <%= _("Search in their website for this information &rarr;") %>
           </a>
       </p>
-    <% end %>
-  </div>
+
+    </div>
+ <% end %>
 <% end %>
-- 
cgit v1.2.3


From 5cb9925c4295f148491bca8403e97d64a366c498 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 20 Feb 2015 15:36:56 +0000
Subject: Restore missing whitespace.

---
 app/views/info_request_batch/_batch_sent.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/info_request_batch/_batch_sent.html.erb b/app/views/info_request_batch/_batch_sent.html.erb
index 1bf51962f..eed93916d 100644
--- a/app/views/info_request_batch/_batch_sent.html.erb
+++ b/app/views/info_request_batch/_batch_sent.html.erb
@@ -6,7 +6,7 @@
   <p>
     <%= _("<strong>We will email you</strong> when they have been sent. " \
           "We will also email you when there is a response to any of them, or " \
-          "after {{late_number_of_days}} working days if the authorities still" \
+          "after {{late_number_of_days}} working days if the authorities still " \
           "haven't replied by then.",
           :late_number_of_days => AlaveteliConfiguration::reply_late_after_days) %>
   </p>
-- 
cgit v1.2.3


From f4088ec1118e6fe442cbd4aafbd5192f384a75d6 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 20 Feb 2015 16:06:00 +0000
Subject: More moderate H1 size for smaller screens.

---
 app/assets/stylesheets/responsive/_new_request_layout.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index 2d0e14bca..44460f13f 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -231,7 +231,12 @@ div.batch_public_body_toggle {
 .request-sent-message {
   margin-top: 1em;
   h1 {
-    margin-bottom: 1em;
+    font-size: 1.3em;
+    margin-top: 0;
+    @include respond-min( $main_menu-mobile_menu_cutoff ){
+      font-size: 2em;
+      margin-bottom: 1em;
+    }
   }
 }
 
-- 
cgit v1.2.3


From be368e258f7ea657e8e6c786c229ed5a1dffb34a Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 20 Feb 2015 16:06:22 +0000
Subject: Center each share link on it's own line on smaller screens.

---
 app/assets/stylesheets/responsive/_new_request_layout.scss | 10 ++++++++++
 app/views/request/_request_sent.html.erb                   |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index 44460f13f..a719370a7 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -238,6 +238,16 @@ div.batch_public_body_toggle {
       margin-bottom: 1em;
     }
   }
+
+  .share-link img {
+    display:block;
+    margin: 1em auto;
+    @include respond-min( $main_menu-mobile_menu_cutoff ){
+      display: inline-block;
+      margin: inherit;
+    }
+  }
+
 }
 
 .request-sent-message__row {
diff --git a/app/views/request/_request_sent.html.erb b/app/views/request/_request_sent.html.erb
index 3525ba2be..3bbf49446 100644
--- a/app/views/request/_request_sent.html.erb
+++ b/app/views/request/_request_sent.html.erb
@@ -24,7 +24,7 @@
                 :via => AlaveteliConfiguration.twitter_username,
                 :text => "'#{ @info_request.title }'",
                 :related => _('alaveteli_foi:The software that runs {{site_name}}', :site_name => site_name)
-             }.to_query %>
+             }.to_query, :class => 'share-link' %>
 
            <%= link_to image_tag("next-step-facebook.png",
                                  :alt => _("Share on Facebook"),
@@ -32,7 +32,7 @@
                                  :height => "37"),
                       "https://www.facebook.com/sharer/sharer.php?" << {
                :u => request.url
-             }.to_query %>
+             }.to_query, :class => 'share-link' %>
 
         <h2><%= _("Keep your request up to date") %></h2>
         <p>
-- 
cgit v1.2.3


From b82f2809d2065743fdd4cab48f6cdaaaf66cdd06 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 20 Feb 2015 16:24:48 +0000
Subject: Move body up a bit on smaller devices.

---
 app/assets/stylesheets/responsive/_public_body_layout.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss
index 33550780b..3e55614ab 100644
--- a/app/assets/stylesheets/responsive/_public_body_layout.scss
+++ b/app/assets/stylesheets/responsive/_public_body_layout.scss
@@ -10,7 +10,9 @@
 }
 
 .authority__header {
-    margin-bottom: 1em;
+    @include respond-min( $main_menu-mobile_menu_cutoff ){
+      margin-bottom: 1em;
+    }
     @include grid-column(12);
 }
 
-- 
cgit v1.2.3


From d6d636af3da0192acd1419a1024f81e4e5f4b6e4 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 20 Feb 2015 16:26:06 +0000
Subject: Space out buttons on smaller devices.

---
 app/assets/stylesheets/responsive/_public_body_layout.scss | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss
index 3e55614ab..d694006e4 100644
--- a/app/assets/stylesheets/responsive/_public_body_layout.scss
+++ b/app/assets/stylesheets/responsive/_public_body_layout.scss
@@ -54,10 +54,13 @@
 .action-bar__follow,
 .action-bar__follow-button,
 .action-bar__follower-count {
+  vertical-align: top;
+  font-size: 16px;
+  margin: 1em 0;
+  @include respond-min( $main_menu-mobile_menu_cutoff ){
     display: inline-block;
-    vertical-align: top;
-    font-size: 16px;
-    margin-right: 1em;
+    margin:0 1em 0 0;
+  }
 }
 
 .list-filter-item {
-- 
cgit v1.2.3


From c99a9c312177dae90c2d38f198d04cfd6cbf7991 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 20 Feb 2015 16:27:53 +0000
Subject: Remove eir header, only display h2 if it has contents.

---
 app/views/public_body/show.html.erb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index e9798f0a9..5a9c7b012 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -101,12 +101,11 @@
                 <% end %>
             <% end %>
         <% else %>
-            <h2 class="foi_results">
-            <% if @public_body.eir_only? %>
-                <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %>
+            <% unless @page_desc.blank? %>
+              <h2 class="foi_results">
+                <%= @page_desc %>
+              </h2>
             <% end %>
-            <%= @page_desc %>
-            </h2>
             <a name="results"></a>
 
             <% if  @public_body.info_requests.size > 4 %>
-- 
cgit v1.2.3


From 3af2835fb53fa5670e3ae0fc78e39e845b26dab3 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 20 Feb 2015 16:45:47 +0000
Subject: Add some bottom margin on smaller screens.

Column 2 appears underneath in this context and was right against
the end of the text.
---
 app/assets/stylesheets/responsive/_new_request_layout.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index a719370a7..2ebba0813 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -256,8 +256,10 @@ div.batch_public_body_toggle {
 
 .request-sent-message__column-1 {
   @include grid-column(12);
+  margin-bottom: 1em;
   @include respond-min( $main_menu-mobile_menu_cutoff ){
     @include grid-column($columns:8);
+    margin-bottom: 0;
     @include ie8{
       padding-right: 0.9375em;
     }
-- 
cgit v1.2.3


From 1283b548c381c431ce0c7a9aa45ced286796e8a8 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 26 Feb 2015 09:28:19 +0000
Subject: tidy up after merge added missing </div> remove duplicate request
 button

---
 app/views/public_body/show.html.erb | 47 ++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index 5a9c7b012..572878b9f 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -33,10 +33,6 @@
             <%= _('You can only request information about the environment from this authority.')%>
           </p>
         <% end %>
-
-        <%= link_to _("Make a request to this authority"),
-                    new_request_to_body_path(:url_name => @public_body.url_name),
-                    :class => "link_button_green" %>
       <% else %>
         <p class="authority__header__notes">
           <%= public_body_not_requestable_reasons(@public_body).first %>
@@ -52,6 +48,7 @@
                 :count => @public_body.info_requests.size) %>
         </div>
     <% end %>
+
     <div class="authority__header__action-bar">
         <div class="action-bar__make-request">
             <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %>
@@ -60,34 +57,30 @@
                 <%= @public_body.notes_as_html.html_safe %>
             <% end %>
 
-        <div class="action-bar__follow">
-            <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
-            <div class="action-bar__follow-button">
-              <% if @existing_track %>
-                  <%= @track_thing.params[:verb_on_page_already] %>
-                <%= (link_to _("(unsubscribe)"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}) %>
-              <% else %>
-                  <div class="feed_link">
-                      <%= link_to _("Follow"), do_track_path(@track_thing), :class => "link_button_green" %>
-                  </div>
-              <% end %>
-
-            </div>
-            <div class="action-bar__follower-count">
-                <%= n_("{{count}} follower",
-                    "{{count}} followers",
-                    follower_count,
-                    :count => content_tag(:span, follower_count, :id => "follow_count")) %>
+            <div class="action-bar__follow">
+                <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
+                <div class="action-bar__follow-button">
+                  <% if @existing_track %>
+                      <%= @track_thing.params[:verb_on_page_already] %>
+                    <%= (link_to _("(unsubscribe)"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}) %>
+                  <% else %>
+                      <div class="feed_link">
+                          <%= link_to _("Follow"), do_track_path(@track_thing), :class => "link_button_green" %>
+                      </div>
+                  <% end %>
+
+                </div>
+                <div class="action-bar__follower-count">
+                    <%= n_("{{count}} follower",
+                        "{{count}} followers",
+                        follower_count,
+                        :count => content_tag(:span, follower_count, :id => "follow_count")) %>
+                </div>
             </div>
         </div>
     </div>
 </div>
 
-
-
-
-
-
 <div class="authority__body">
     <div class="authority__body__foi-results">
         <% if @public_body.info_requests.size == 0 %>
-- 
cgit v1.2.3


From 4b867321f903fea9c0e93231135d505376314861 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 26 Feb 2015 17:15:01 +0000
Subject: repaired some errors introduced with merge

---
 app/views/public_body/show.html.erb | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index 572878b9f..3de89b340 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -56,26 +56,25 @@
             <% elsif @public_body.has_notes? %>
                 <%= @public_body.notes_as_html.html_safe %>
             <% end %>
+        </div>
+        <div class="action-bar__follow">
+            <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
+            <div class="action-bar__follow-button">
+              <% if @existing_track %>
+                  <%= @track_thing.params[:verb_on_page_already] %>
+                <%= (link_to _("(unsubscribe)"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}) %>
+              <% else %>
+                  <div class="feed_link">
+                      <%= link_to _("Follow"), do_track_path(@track_thing), :class => "link_button_green" %>
+                  </div>
+              <% end %>
 
-            <div class="action-bar__follow">
-                <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
-                <div class="action-bar__follow-button">
-                  <% if @existing_track %>
-                      <%= @track_thing.params[:verb_on_page_already] %>
-                    <%= (link_to _("(unsubscribe)"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}) %>
-                  <% else %>
-                      <div class="feed_link">
-                          <%= link_to _("Follow"), do_track_path(@track_thing), :class => "link_button_green" %>
-                      </div>
-                  <% end %>
-
-                </div>
-                <div class="action-bar__follower-count">
-                    <%= n_("{{count}} follower",
-                        "{{count}} followers",
-                        follower_count,
-                        :count => content_tag(:span, follower_count, :id => "follow_count")) %>
-                </div>
+            </div>
+            <div class="action-bar__follower-count">
+                <%= n_("{{count}} follower",
+                    "{{count}} followers",
+                    follower_count,
+                    :count => content_tag(:span, follower_count, :id => "follow_count")) %>
             </div>
         </div>
     </div>
-- 
cgit v1.2.3


From 81ff5cf105c12da8e240ec5a80153dc70b575877 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 26 Feb 2015 17:15:54 +0000
Subject: Fixed display of public body page when running non-responsive mode

---
 app/assets/stylesheets/main.scss | 128 +++++++++++++++++++++++++++++----------
 1 file changed, 97 insertions(+), 31 deletions(-)

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index b063b0d77..de384346b 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -185,11 +185,8 @@ margin:18px 0 36px;
 }
 
 #stepwise_make_request {
-color:#222;
 font-size:1.1em;
 text-align:left;
-width:412px;
-margin:0 14em 40px 0;
 }
 
 #stepwise_make_request_view_email {
@@ -907,34 +904,6 @@ vertical-align:middle;
 text-decoration:none;
 }
 
-#follow_box {
-
- padding: 4px;
-}
-
-#follow_box .feed_link {
- text-align: center;
-}
-
-#follow_count {
- color: #93278F;
- font-family: 'DeliciousBold', Arial, sans-serif;
- font-weight: 700;
- font-size: 60px;
- line-height: 60px;
- text-align: right;
- float: left;
- margin-top: -15px;
- margin-right: 5px;
-}
-.follow_count {
- clear:both;
-}
-
-#follow_box h2 {
- margin: 0;
-}
-
 h2,dt {
 font-size:1.8em;
 }
@@ -1817,3 +1786,100 @@ text-decoration:none;
   color: #0000EE;
   font-size: 0.9em;
 }
+
+.back-to-results {
+    margin-top: 0.5em;
+}
+
+.authority__header {
+    border-bottom: 1px solid #e9e9e9;
+    margin-bottom: 1em;
+}
+
+.authority__header__subtitle {
+    font-size: 1.2em;
+    color: #666;
+}
+
+.authority__body {
+    overflow: hidden;
+}
+
+.authority__body__foi-results {
+    width: 63.666%;
+    float: left;
+    margin-right: 3%;
+}
+
+.authority__body__sidebar {
+    width: 33.333%;
+    float: left;
+}
+
+.authority__header__action-bar {
+    font-size: 0;
+    padding: 16px 0;
+    margin-top: 8px;
+    border-top: 1px solid #e9e9e9;
+}
+
+.action-bar__make-request,
+.action-bar__follow,
+.action-bar__follow-button,
+.action-bar__follower-count {
+    vertical-align: top;
+    font-size: 16px;
+    display: inline-block;
+    margin:0 1em 0 0;
+    .feed_link {
+        padding: 0;
+    }
+}
+
+.list-filter-item {
+    .title {
+        display: inline;
+        font-size: 1em;
+        font-weight: normal;
+    }
+}
+
+.list-filter-item {
+    ul {
+        list-style: none outside none;
+        margin: 0;
+        padding: 0;
+    }
+    li {
+        display: inline-block;
+        &:after {
+            content:' | ';
+            display: inline-block;
+            color: #ccc; //Unsupported browsers will ignore the rgba declaration below
+            color: rgba(0,0,0,0.1);
+        }
+        &:last-child {
+            &:after {
+                content: '';
+            }
+        }
+
+    }
+}
+
+.authority__body__sidebar__links {
+    a {
+        display: inline-block;
+        margin-bottom: 0.5em;
+    }
+}
+
+#list-filter {
+    margin-bottom: 3em;
+}
+
+#filter_requests_form label.title {
+    display: block;
+    width: auto;
+    margin-bottom: 0.3em;
+}
-- 
cgit v1.2.3


From ff59f14c6c71c35f6720972b017b8f38cf077be7 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 26 Feb 2015 17:26:24 +0000
Subject: Fixed display of write request page in non-responsive mode

---
 app/assets/stylesheets/main.scss | 43 ++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index de384346b..cbe9cc916 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -583,12 +583,25 @@ width:40%;
 width:26em;
 }
 
+#request_form {
+width: 63.6666%;
+margin-right: 3%;
+float: left;
+}
+
 #request_advice {
 float:right;
-width:250px;
+width:30.3333%;
 margin-top:1em;
 }
 
+.advice-panel {
+    ul {
+        list-style: none outside none;
+        padding-left: 0 !important;
+    }
+}
+
 #select_authority_help {
 background-color: #FEF1F6;
 float: right;
@@ -613,20 +626,18 @@ padding-top:0.5em;
 padding-bottom:1em;
 }
 
+#request_header_subject {
+    .form_item_note {
+        margin-top: 0.5em;
+    }
+}
+
 #request_form label,label.form_label {
-display:block;
-float:left;
-clear:none;
-width:100px;
-text-align:left;
-margin:2px 0 0;
-padding:0 10px 0 0;
+    display: block;
 }
 
 .form_item_note,.form_note {
-width:34em;
-margin-left:110px;
-font-size:1em;
+
 }
 
 .form_item_note {
@@ -634,7 +645,7 @@ margin-top:-1em;
 }
 
 .form_button {
-margin:0 0 0 9em;
+margin:0;
 }
 
 p#sign_in_reason, p#superuser_message {
@@ -895,7 +906,6 @@ margin:0 1.2em 0 0.9em;
 
 #request_header_text,#request_search_ahead_results {
 font-size:0.9em;
-margin-left:11em;
 }
 
 div.feed_link img,div.act_link img {
@@ -965,20 +975,15 @@ float:left;
 }
 
 #request_header_text {
-margin-left:110px;
-width: 30em;
 border-radius:3px;
 -moz-border-radius:3px;
-margin-top: 10px;
+margin: 10px 10px 0;
 background-color:#D5FFD8;
 border-color:#1EFF38;
 border-style:solid;
 border-width:1px;
 padding:0.5em;
-
 font-style: italic;
-
-
 }
 
 #request_header_text h3 {
-- 
cgit v1.2.3


From 51d31d6df779896ef5559be2274337064cc721d3 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 26 Feb 2015 18:17:01 +0000
Subject: Fixed display of sign in/up  page in non-responsive mode

---
 app/assets/stylesheets/main.scss | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index cbe9cc916..dc5ecd1f4 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -661,7 +661,6 @@ p#superuser_message {
 clear:none;
 margin-bottom:1em;
 float:none;
-margin-top:20px;
 width:auto;
 }
 
@@ -683,8 +682,16 @@ margin-left:25%;
 
 #signup .form_item_note,#signin .form_note {
 font-size:0.9em;
-margin-left:11.5em;
-width:inherit;
+margin-top: 0.5em;
+}
+
+.sign-in-wrapper {
+    overflow: hidden;
+    padding: 1em 1.5em 1.5em;
+    background-color: #f4f4f4;
+    h2 {
+        margin-top: 0.2em;
+    }
 }
 
 div.controller_help dt a,div.controller_help h1 a,div#help_unhappy h1 a.hover_a {
@@ -1246,13 +1253,19 @@ font-style:italic;
 color:#444;
 }
 
-#sign_together h1 {
-width:320px;
-text-align:center;
+
+#sign_together {
+    #left_half {
+        width: 63.666%;
+        margin-right: 3%;
+    }
+    #right_half {
+        width: 33.333%;
+    }
 }
 
-#sign_together .form_button {
-margin-left:10.5em;
+.pretitle {
+    margin-bottom: 0;
 }
 
 form input[type=text],form input[type=password] {
-- 
cgit v1.2.3


From 6241b37982c6cea44ecd6fb784ed2677eceaeb9b Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 26 Feb 2015 18:20:33 +0000
Subject: Fixed display of process complete  page in non-responsive mode

---
 app/assets/stylesheets/main.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index dc5ecd1f4..e7d167c0d 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -1901,3 +1901,7 @@ text-decoration:none;
     width: auto;
     margin-bottom: 0.3em;
 }
+
+#notice.request-sent-message {
+    font-size: 1em;
+}
-- 
cgit v1.2.3


From d10a2089949095640d10db444001379032cc2464 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 27 Feb 2015 15:22:57 +0000
Subject: Don't show two 'Make a request' buttons if there's no contact info.

---
 app/helpers/public_body_helper.rb   | 2 +-
 app/views/public_body/show.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/public_body_helper.rb b/app/helpers/public_body_helper.rb
index d8a5d57b5..4a71f89ab 100644
--- a/app/helpers/public_body_helper.rb
+++ b/app/helpers/public_body_helper.rb
@@ -21,7 +21,7 @@ module PublicBodyHelper
 
     unless public_body.has_request_email?
       # Make the authority appear requestable to encourage users to help find
-      # the authroty's email address
+      # the authority's email address
       msg = link_to _("Make a request to this authority"),
                       new_request_to_body_path(:url_name => public_body.url_name),
                       :class => "link_button_green"
diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index 3de89b340..552fae717 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -33,7 +33,7 @@
             <%= _('You can only request information about the environment from this authority.')%>
           </p>
         <% end %>
-      <% else %>
+      <% elsif @public_body.not_requestable_reason != 'bad_contact' %>
         <p class="authority__header__notes">
           <%= public_body_not_requestable_reasons(@public_body).first %>
         </p>
-- 
cgit v1.2.3


From 5e0128c8f2988463f9b337cd592d783752f31504 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 27 Feb 2015 15:43:04 +0000
Subject: Add bottom margin to stepwise_make_request

Next element shouldn't be right along its border.
---
 app/assets/stylesheets/main.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index e7d167c0d..d92b9b4e3 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -187,6 +187,7 @@ margin:18px 0 36px;
 #stepwise_make_request {
 font-size:1.1em;
 text-align:left;
+margin-bottom: 1em;
 }
 
 #stepwise_make_request_view_email {
-- 
cgit v1.2.3


From 5d4e347339fafe95ce04b475f8bd3b1605f6d87b Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 27 Feb 2015 15:43:44 +0000
Subject: Add some side margin to the notes content

Don't want it right by the border of stepwise_make_request.
---
 app/assets/stylesheets/main.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index d92b9b4e3..614a1580f 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -1815,11 +1815,16 @@ text-decoration:none;
     margin-bottom: 1em;
 }
 
+
 .authority__header__subtitle {
     font-size: 1.2em;
     color: #666;
 }
 
+.authority__header__notes {
+  margin: 1em;
+}
+
 .authority__body {
     overflow: hidden;
 }
-- 
cgit v1.2.3


From 7ef0219045526cdef1e16f0f133b35562a1bea79 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 27 Feb 2015 15:56:24 +0000
Subject: Don't display stepwise_make_request unless there's some content for
 it.

---
 app/views/public_body/show.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index 552fae717..82d678e56 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -20,6 +20,7 @@
         <% end %>
     </p>
 
+    <% if @public_body.has_notes? || @public_body.eir_only? || @public_body.special_not_requestable_reason? %>
     <div id="stepwise_make_request">
       <% if @public_body.has_notes? %>
         <p class="authority__header__notes">
@@ -33,12 +34,13 @@
             <%= _('You can only request information about the environment from this authority.')%>
           </p>
         <% end %>
-      <% elsif @public_body.not_requestable_reason != 'bad_contact' %>
+      <% elsif @public_body.special_not_requestable_reason? %>
         <p class="authority__header__notes">
           <%= public_body_not_requestable_reasons(@public_body).first %>
         </p>
       <% end %>
     </div>
+    <% end %>
 
     <% if @public_body.info_requests.size > 0 %>
         <div class="authority__header__stats">
-- 
cgit v1.2.3


From f58194286964e99e5c2496059c7d926de53d30f5 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 27 Feb 2015 16:05:50 +0000
Subject: Make request extract full width when on authority page.

---
 app/assets/stylesheets/main.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 614a1580f..98114c810 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -982,6 +982,10 @@ width:245px;
 float:left;
 }
 
+.authority__body__foi-results .request_right {
+width:545px;
+}
+
 #request_header_text {
 border-radius:3px;
 -moz-border-radius:3px;
-- 
cgit v1.2.3


From d2acfccc6789a24d8dae263002ba7ed29b4e20ab Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 27 Feb 2015 16:06:09 +0000
Subject: Align buttons and follower count.

---
 app/assets/stylesheets/main.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 98114c810..91e509083 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -1855,7 +1855,6 @@ text-decoration:none;
 .action-bar__follow,
 .action-bar__follow-button,
 .action-bar__follower-count {
-    vertical-align: top;
     font-size: 16px;
     display: inline-block;
     margin:0 1em 0 0;
-- 
cgit v1.2.3


From 4886051f3517178c17e555c8610df8ce98c55ac8 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 27 Feb 2015 16:31:21 +0000
Subject: Make unsubscribe a button as it is elsewhere on this page.

---
 app/assets/stylesheets/responsive/_public_body_layout.scss |  1 +
 app/views/public_body/show.html.erb                        | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss
index d694006e4..7a9637bc9 100644
--- a/app/assets/stylesheets/responsive/_public_body_layout.scss
+++ b/app/assets/stylesheets/responsive/_public_body_layout.scss
@@ -63,6 +63,7 @@
   }
 }
 
+
 .list-filter-item {
     .title {
         display: inline;
diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index 82d678e56..c46596c89 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -61,17 +61,16 @@
         </div>
         <div class="action-bar__follow">
             <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
-            <div class="action-bar__follow-button">
+              <div class="action-bar__follow-button">
               <% if @existing_track %>
-                  <%= @track_thing.params[:verb_on_page_already] %>
-                <%= (link_to _("(unsubscribe)"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}) %>
+                <%= (link_to _("Unsubscribe"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}, :class => "link_button_green") %>
               <% else %>
-                  <div class="feed_link">
+                <div class="feed_link">
                       <%= link_to _("Follow"), do_track_path(@track_thing), :class => "link_button_green" %>
-                  </div>
+                </div>
               <% end %>
+              </div>
 
-            </div>
             <div class="action-bar__follower-count">
                 <%= n_("{{count}} follower",
                     "{{count}} followers",
-- 
cgit v1.2.3


From 56e7fe278e84200324e2ec2a1be72c3bd998c5ff Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 27 Feb 2015 17:11:07 +0000
Subject: Remove duplicate notes field.

---
 app/views/public_body/show.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index c46596c89..5c11c9428 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -55,9 +55,7 @@
         <div class="action-bar__make-request">
             <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %>
                 <%= link_to _("Make a request to this authority"), new_request_to_body_path(:url_name => @public_body.url_name), :class => "link_button_green" %>
-            <% elsif @public_body.has_notes? %>
-                <%= @public_body.notes_as_html.html_safe %>
-            <% end %>
+           <% end %>
         </div>
         <div class="action-bar__follow">
             <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
-- 
cgit v1.2.3