From 1c2acff9f02070dd182be30d9610d2509ada52ae Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Fri, 9 Aug 2019 13:56:43 +0100
Subject: [PATCH 1/3] Reconcile with core

---
 lib/views/request/_sidebar.html.erb | 74 ++++++++++++++++-------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/lib/views/request/_sidebar.html.erb b/lib/views/request/_sidebar.html.erb
index f88bf8aa..ec0d2eac 100644
--- a/lib/views/request/_sidebar.html.erb
+++ b/lib/views/request/_sidebar.html.erb
@@ -1,4 +1,6 @@
 <div id="right_column" class="sidebar right_column" role="complementary">
+  <%= render partial: 'sidebar_pro_upsell' %>
+
   <% if (feature_enabled?(:alaveteli_pro) &&
          can?(:create_embargo, @info_request)) %>
     <%= render partial: "alaveteli_pro/info_requests/embargo_form",
@@ -6,40 +8,43 @@
   <% end %>
 
   <% if @info_request.attention_requested %>
-    <div class="request__special-status">
-    <% if @info_request.prominence(:decorate => true).is_hidden? %>
-      <h2><%= _('Request hidden') %></h2>
-      <p>
-        <%= _("This request has prominence 'hidden'. You can only see it " \
-              "because you are logged in as a super user.") %>
-      </p>
-    <% elsif @info_request.prominence(:decorate => true).is_requester_only? %>
-      <h2><%= _('Request hidden') %></h2>
-      <%# The eccentric formatting of the following string is in order that it be identical
-          to the corresponding string in request/show.html.erb %>
-      <p><%= _('This request is hidden, so that only you the requester ' \
-                  'can see it. Please <a href="{{url}}">contact us</a> ' \
-                  'if you are not sure why.',
-               :url => help_requesting_path.html_safe) %></p>
-    <% elsif @info_request.described_state != "attention_requested" %>
-      <h2><%= _('Offensive? Unsuitable?') %></h2>
-      <p><%= _('This request has been marked for review by the site ' \
-               'administrators, who have not hidden it at this time. ' \
-               'If you believe it should be hidden, please ' \
-               '<a href="{{url}}">contact us</a>.',
-              :url => help_requesting_path.html_safe) %></p>
-    <% end %>
+    <div class="sidebar__section request__special-status">
+      <% if @info_request.prominence(:decorate => true).is_hidden? %>
+        <h2><%= _('Request hidden') %></h2>
+        <p>
+          <%= _("This request has prominence 'hidden'. You can only see it " \
+                "because you are logged in as a super user.") %>
+        </p>
+      <% elsif @info_request.prominence(:decorate => true).is_requester_only? %>
+        <h2><%= _('Request hidden') %></h2>
+        <%# The eccentric formatting of the following string is in order that it
+            be identical to the corresponding string in request/show.html.erb %>
+        <p><%= _('This request is hidden, so that only you the requester ' \
+                    'can see it. Please <a href="{{url}}">contact us</a> ' \
+                    'if you are not sure why.',
+                 :url => help_requesting_path.html_safe) %></p>
+      <% elsif @info_request.described_state != "attention_requested" %>
+        <h2><%= _('Offensive? Unsuitable?') %></h2>
+        <p><%= _('This request has been marked for review by the site ' \
+                 'administrators, who have not hidden it at this time. ' \
+                 'If you believe it should be hidden, please ' \
+                 '<a href="{{url}}">contact us</a>.',
+                :url => help_requesting_path.html_safe) %></p>
+      <% end %>
     </div>
   <% end %>
 
-  <%= render :partial => 'request/act' %>
-  <%= render :partial => 'request/next_actions' %>
+  <div class="sidebar__section next-actions">
+    <%= render :partial => 'request/act' %>
+    <%= render :partial => 'request/next_actions' %>
+  </div>
+
   <%= render :partial => 'request/batch',
              :locals => { :info_request => @info_request } %>
 
   <% similar_requests, similar_more = @info_request.similar_requests %>
   <% unless similar_requests.empty? %>
-    <div class="sidebar__similar-requests">
+    <div class="sidebar__section sidebar__similar-requests">
       <h2><%= _('Requests like this')%></h2>
 
       <% utm_params = { :utm_source => site_name.downcase,
@@ -55,15 +60,20 @@
 
       <% if similar_more %>
         <p class="sidebar_similar_requests__more-link">
-          <%= link_to similar_request_path(@info_request.url_title, utm_params) do %>
-            <%= _("More similar requests") %>
-          <% end %>
+          <% path = similar_request_path(@info_request.url_title, utm_params) %>
+          <%= link_to _("More similar requests"), path %>
         </p>
       <% end %>
     </div>
   <% end %>
 
-  <!-- this link with this wording is here for legal reasons, discuss with
-    board and our lawyer before changing or removing it -->
-  <p class="copyright-notice"><small><%= link_to _('Are you the owner of any commercial copyright on this page?'), help_officers_path(:anchor => "copyright") %></small></p>
+  <div class="sidebar__section">
+    <!-- this link with this wording is here for legal reasons, discuss with
+         board and our lawyer before changing or removing it -->
+    <p class="copyright-notice">
+      <small><%= link_to _('Are you the owner of any commercial copyright ' \
+                           'on this page?'),
+                         help_officers_path(anchor: 'copyright') %></small>
+    </p>
+  </div>
 </div>

From 143494c8e620664ade070853d5e555a4ae0c6726 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Fri, 9 Aug 2019 15:33:19 +0100
Subject: [PATCH 2/3] Improve sidebar__section styling

The spacing mechanics of the sidebar have changed in core [1] so this
commit tweaks the WDTK sidebar styles to account for that.

Had to fully override the copyright-notice styles due to way the border,
margin and padding work in this theme.

[1] https://github.com/mysociety/alaveteli/commit/93dfa68ab27a92caecfed488fd33980208a76d27
---
 app/assets/stylesheets/responsive/custom.scss | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/responsive/custom.scss b/app/assets/stylesheets/responsive/custom.scss
index 5f8b9532..beb4f536 100644
--- a/app/assets/stylesheets/responsive/custom.scss
+++ b/app/assets/stylesheets/responsive/custom.scss
@@ -1556,14 +1556,46 @@ dd {
 }
 
 .sidebar__section {
-    border-bottom: 1px solid darken($color_light_grey, 7%);
-    margin-bottom: 1.5em;
-    padding-bottom: 1.5em;
-    h2 {
-      margin-top: 0 !important;
+  border-bottom: 1px solid darken($color_light_grey, 7%);
+  margin-bottom: 1.5em !important;
+  padding-bottom: 1.5em;
+  h2 {
+    margin-top: 0 !important;
+  }
+}
+
+.act_link:last-child {
+  margin-bottom: 0;
+}
+
+.sidebar__similar-requests {
+  .request_short_listing__authority {
+    margin-bottom: 0;
+  }
+}
+
+.copyright-notice {
+  border-top: none;
+  margin-bottom: 0;
+  padding-top: 0;
+  margin-top: 0;
+  font-size: 0.875em;
+  line-height: 1.5em;
+  small {
+    font-size: 1em;
+  }
+  a {
+    color: #777;
+    text-decoration: none;
+    &:hover,
+    &:active,
+    &:focus {
+      text-decoration: underline;
     }
+  }
 }
 
+
 /* Sidebar request navigation */
 .request-navigation {
   margin-bottom: 1.5em;

From 9f20069cd74bef2d190b1a473bfedfd9b18c4dc9 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Fri, 9 Aug 2019 16:31:58 +0100
Subject: [PATCH 3/3] Highlight pro upsell

Use the "marketing-highlight" colour.
---
 app/assets/stylesheets/responsive/custom.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/stylesheets/responsive/custom.scss b/app/assets/stylesheets/responsive/custom.scss
index beb4f536..c540e473 100644
--- a/app/assets/stylesheets/responsive/custom.scss
+++ b/app/assets/stylesheets/responsive/custom.scss
@@ -1564,6 +1564,12 @@ dd {
   }
 }
 
+.sidebar__section.pro-upsell {
+  background-color: #faf785;
+  border-bottom: none;
+  padding: 0.85em;
+}
+
 .act_link:last-child {
   margin-bottom: 0;
 }