From bf31b105289e66ac1fad76efa590bcfc1615903b Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 29 Oct 2014 17:50:33 +0000
Subject: =?UTF-8?q?Move=20=E2=80=9CCan=E2=80=99t=20find=20an=20authority?=
 =?UTF-8?q?=E2=80=9D=20to=20sidebar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the “Can’t find an authority” actions on the
/select_authority page to the right of the search
results
---
 app/assets/stylesheets/main.scss                           | 10 ++++++++++
 app/assets/stylesheets/responsive/_new_request_layout.scss | 13 +++++++++++++
 app/assets/stylesheets/responsive/_new_request_style.scss  |  7 +++++++
 app/views/public_body/_search_ahead.html.erb               |  1 -
 app/views/request/select_authority.html.erb                | 12 ++++++++++++
 5 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 183daa59b..b063b0d77 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -592,6 +592,16 @@ width:250px;
 margin-top:1em;
 }
 
+#select_authority_help {
+background-color: #FEF1F6;
+float: right;
+margin-top: 31px;
+overflow: hidden;
+padding-left: 1em;
+padding-right: 1em;
+width: 45%;
+}
+
 #request_advice ul {
 margin:0 auto;
 }
diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss
index 9d7c0b047..a2ab23060 100644
--- a/app/assets/stylesheets/responsive/_new_request_layout.scss
+++ b/app/assets/stylesheets/responsive/_new_request_layout.scss
@@ -21,6 +21,19 @@
  @include grid-row($behavior: nest);
 }
 
+#select_authority_help {
+  @include grid-column(12);
+  @include respond-min( $main_menu-mobile_menu_cutoff ) {
+    @include grid-column(6);
+    @include ie8 {
+      padding-right: 0.9375em;
+    }
+    @include lte-ie7 {
+      width: 26.188em;
+    }
+  }
+}
+
 /* /new/[body_name] page */
 #request_header {
   @include grid-row;
diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss
index ab144b39f..86e17cbfe 100644
--- a/app/assets/stylesheets/responsive/_new_request_style.scss
+++ b/app/assets/stylesheets/responsive/_new_request_style.scss
@@ -1,5 +1,12 @@
 /* Styles for pages in making a new request */
 
+/* /select_authority page */
+#select_authority_help {
+  .info {
+    font-style: italic;
+  }
+}
+
 /* /new/[body_name] page */
 .new_info_request {
   label {
diff --git a/app/views/public_body/_search_ahead.html.erb b/app/views/public_body/_search_ahead.html.erb
index ca942324e..b5632bccd 100644
--- a/app/views/public_body/_search_ahead.html.erb
+++ b/app/views/public_body/_search_ahead.html.erb
@@ -11,5 +11,4 @@
     <% end %>
   </div>
   <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_requests.matches_estimated), :params => {:controller=>"request", :action => "select_authority"} %>
- <p><%= raw(_('<a href="{{browse_url}}">Browse all</a> or <a href="{{add_url}}">ask us to add one</a>.', :browse_url => list_public_bodies_default_path.html_safe, :add_url => (help_requesting_path + '#missing_body').html_safe)) %></p>
  <% end %>
diff --git a/app/views/request/select_authority.html.erb b/app/views/request/select_authority.html.erb
index 409228297..731049d69 100644
--- a/app/views/request/select_authority.html.erb
+++ b/app/views/request/select_authority.html.erb
@@ -45,4 +45,16 @@
   <div id="typeahead_response">
     <%= render :partial => 'public_body/search_ahead' %>
   </div>
+
+</div>
+
+<div id="select_authority_help">
+  <p class="info"><%= _("Can&rsquo;t find an authority?") %></p>
+  <p class="actions">
+    <%= raw _('<a href="{{browse_url}}">Browse all</a> or <a href="{{add_url}}">ask us to add one</a>',
+              :browse_url => list_public_bodies_default_path.html_safe,
+              :add_url => help_requesting_path(:anchor => 'missing_body')
+             ).html_safe %>
+  </p>
+
 </div>
-- 
cgit v1.2.3