From a21542e04f8c1616d3ef87e9d0db9c5702ffcc0a Mon Sep 17 00:00:00 2001
From: Paul Hayes <fofr@users.noreply.github.com>
Date: Fri, 16 Dec 2016 13:04:09 +0000
Subject: [PATCH 1/5] Add share buttons to consultations

* Port social media icons from Whitehall, remove unused icons and
PNGCrush
* Simplify markup and CSS for social icons
* Look and behaviour matches Whitehall
---
 app/assets/images/social-icons-white.png      | Bin 0 -> 264 bytes
 app/assets/stylesheets/application.scss       |   1 +
 .../stylesheets/helpers/_share-buttons.scss   |  32 ++++++++++++++++++
 .../stylesheets/views/_consultation.scss      |   1 +
 app/presenters/consultation_presenter.rb      |  13 +++++++
 app/views/content_items/consultation.html.erb |  17 ++++++++++
 test/integration/consultation_test.rb         |   6 ++++
 .../presenters/consultation_presenter_test.rb |   5 +++
 8 files changed, 75 insertions(+)
 create mode 100644 app/assets/images/social-icons-white.png
 create mode 100644 app/assets/stylesheets/helpers/_share-buttons.scss

diff --git a/app/assets/images/social-icons-white.png b/app/assets/images/social-icons-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae88b376c99f63c2279df1e6f94068d007b60e35
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^azJdu!3HD?L%8Mxsq>yLjv*C{Z*LsrZE_H3eW;u0
zy@16FikQ#O(>N%kk?4IxNaLZU+GGni1&MU?i+l7d4G$jHUoFn#;=<3cD5o({d(FjP
ziP@7%uO4>%n=ZjFQFl;Y{4m41=V>!u^Zb`kQc_~NaQe}?>a{wLGbi$HdLrnzYsW{Q
zJxRCU2%Z!8b!+Bp*>6wRKW0dicxG{YQNKR>@y<&Rx$P!5t&)|uJ^b^@#PyqANap#s
z{eHmfpzM9ayz>6bCHD*MEbc8lGM8_Y^u5%-4!(2u^O?H1l(3)DpR5<2B{T!*H3m;t
KKbLh*2~7aN8f(M=

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 345caa39f..c729cdd4b 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -16,6 +16,7 @@
 @import "helpers/dash-list";
 @import "helpers/description";
 @import "helpers/sidebar-with-body";
+@import "helpers/share-buttons";
 @import "helpers/national_statistics_logo";
 @import "helpers/notice";
 @import "helpers/history-notice";
diff --git a/app/assets/stylesheets/helpers/_share-buttons.scss b/app/assets/stylesheets/helpers/_share-buttons.scss
new file mode 100644
index 000000000..ad0cc953b
--- /dev/null
+++ b/app/assets/stylesheets/helpers/_share-buttons.scss
@@ -0,0 +1,32 @@
+@mixin share-buttons {
+  $share-button-width: 25px;
+  $share-button-height: 25px;
+
+  .share-buttons {
+    @include core-16;
+    margin-top: $gutter-one-third;
+
+    .share-button-link {
+      margin-right: $gutter;
+    }
+
+    .share-button {
+      display: inline-block;
+      width: $share-button-width;
+      height: $share-button-height;
+      margin-right: $gutter-one-third;
+      background-color: $govuk-blue;
+      background-image: image-url("social-icons-white.png");
+      background-repeat: no-repeat;
+      vertical-align: top;
+    }
+
+    .share-button-facebook {
+      background-position: -2px -2px;
+    }
+
+    .share-button-twitter {
+      background-position: -2px -32px;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/views/_consultation.scss b/app/assets/stylesheets/views/_consultation.scss
index 64ff332bd..acfc1d995 100644
--- a/app/assets/stylesheets/views/_consultation.scss
+++ b/app/assets/stylesheets/views/_consultation.scss
@@ -2,6 +2,7 @@
   @include sidebar-with-body;
   @include history-notice;
   @include withdrawal-notice;
+  @include share-buttons;
 
   .section-title {
     @include bold-27;
diff --git a/app/presenters/consultation_presenter.rb b/app/presenters/consultation_presenter.rb
index 625ffc48e..a1499a4f4 100644
--- a/app/presenters/consultation_presenter.rb
+++ b/app/presenters/consultation_presenter.rb
@@ -4,6 +4,7 @@ class ConsultationPresenter < ContentItemPresenter
   include NationalApplicability
   include Political
   include Withdrawable
+  include ERB::Util
 
   def body
     content_item["details"]["body"]
@@ -113,8 +114,20 @@ def attachment_url
     ways_to_respond["attachment_url"]
   end
 
+  def facebook_share_url
+    "https://www.facebook.com/sharer/sharer.php?u=#{share_url}"
+  end
+
+  def twitter_share_url
+    "https://twitter.com/share?url=#{share_url}&text=#{url_encode(title)}"
+  end
+
 private
 
+  def share_url
+    url_encode(Plek.current.website_root + content_item["base_path"])
+  end
+
   def display_date_and_time(date, rollback_midnight = false)
     time = Time.parse(date)
     date_format = "%-e %B %Y"
diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb
index 8a9f4bbf3..eba618b02 100644
--- a/app/views/content_items/consultation.html.erb
+++ b/app/views/content_items/consultation.html.erb
@@ -229,6 +229,23 @@
   </div>
 <% end %>
 
+<div class="grid-row sidebar-with-body">
+  <div class="column-two-thirds offset-one-third">
+    <h2>Share this page</h2>
+    <div class="share-buttons">
+      <%= link_to @content_item.facebook_share_url,
+          target: "_blank",
+          class: "share-button-link" do %>
+        <span class="share-button share-button-facebook"></span><span class="visually-hidden">Share on </span>Facebook<% end %>
+
+      <%= link_to @content_item.twitter_share_url,
+          target: "_blank",
+          class: "share-button-link" do %>
+        <span class="share-button share-button-twitter"></span><span class="visually-hidden">Share on </span>Twitter<% end %>
+    </div>
+  </div>
+</div>
+
 <%= render 'govuk_component/document_footer',
     from: @content_item.from,
     updated: @content_item.updated,
diff --git a/test/integration/consultation_test.rb b/test/integration/consultation_test.rb
index 907f0d4bb..bad111310 100644
--- a/test/integration/consultation_test.rb
+++ b/test/integration/consultation_test.rb
@@ -135,4 +135,10 @@ class ConsultationTest < ActionDispatch::IntegrationTest
       end
     end
   end
+
+  test "share urls" do
+    setup_and_visit_content_item('open_consultation')
+    assert page.has_css?("a", text: "Share on Facebook")
+    assert page.has_css?("a", text: "Share on Twitter")
+  end
 end
diff --git a/test/presenters/consultation_presenter_test.rb b/test/presenters/consultation_presenter_test.rb
index 432358664..0c6cdd86e 100644
--- a/test/presenters/consultation_presenter_test.rb
+++ b/test/presenters/consultation_presenter_test.rb
@@ -139,5 +139,10 @@ def format_name
 
       refute presented.ways_to_respond?
     end
+
+    test 'presents share urls with encoded url and title' do
+      assert_equal 'https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.test.gov.uk%2Fgovernment%2Fconsultations%2Fpostgraduate-doctoral-loans', presented_item("open_consultation").facebook_share_url
+      assert_equal 'https://twitter.com/share?url=https%3A%2F%2Fwww.test.gov.uk%2Fgovernment%2Fconsultations%2Fpostgraduate-doctoral-loans&text=Postgraduate%20doctoral%20loans', presented_item("open_consultation").twitter_share_url
+    end
   end
 end

From f04337117f8b6ff5aad1b0d8a5999a194107d99f Mon Sep 17 00:00:00 2001
From: Paul Hayes <fofr@users.noreply.github.com>
Date: Fri, 16 Dec 2016 13:05:57 +0000
Subject: [PATCH 2/5] PNG crush image assets

Save 4% of bytes:

TOTAL was: 11.503kb now: 11.038kb saving: .465kb (4.00%) quality: 100%
---
 .../images/ministry-of-defence-crest.png      | Bin 8826 -> 8681 bytes
 app/assets/images/national-statistics.png     | Bin 2067 -> 1861 bytes
 app/assets/images/separator-2x.png            | Bin 201 -> 132 bytes
 app/assets/images/separator.png               | Bin 145 -> 100 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/assets/images/ministry-of-defence-crest.png b/app/assets/images/ministry-of-defence-crest.png
index 5e0363de9ae254e43e0bb71c488721c0420d9caf..f13a16c1d324fda607e251c3c479522bfa3ce0a2 100644
GIT binary patch
literal 8681
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
Hu0mjf2p0p0

literal 8826
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

diff --git a/app/assets/images/national-statistics.png b/app/assets/images/national-statistics.png
index db95a4d4bd35ee2001d7544db2a7b4328f9f388a..aee90182655479a6d27a818be85f257700736ee6 100644
GIT binary patch
delta 1846
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

delta 2053
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

diff --git a/app/assets/images/separator-2x.png b/app/assets/images/separator-2x.png
index 9d5fd7c032937362453fa664232ce19a0b32e996..ddd27f9aa4a023cee1a9d63cdc1d87611f40b8b3 100644
GIT binary patch
delta 114
zcmV-&0FD320fYgN8EXar008tjeHs7&082?kK~#7FW7v1_umKRi2hj|~0I1^s2u*}F
zB!Dyw9ZdqnXlg*xbe>pE^M{ZoN;MF664ey<qbnvhw(o-!Q=Xpaub8S?l;lDH0E#j#
UHu%k8?*IS*07*qoM6N<$f-qYvPyhe`

literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eQ!3-o1KkL;1Qi=gSA+Gxl9>#@$N`O*!7lYM+
zEUuCuzu^1*4fD?nBpAGB$dGW$1B&{3x;TbZ+)6zk$k$-N!5py6FYI0YgU&TC*=s%u
zF&(Y3jM(P1$z0{I{-TnASuE>1(uH;eb80HqPLMLWCeE{N9mlc7Jj)mSW&QRyH@u(s
Y+&+$(4eHxg0S#vGboFyt=akR{0D%`y&;S4c

diff --git a/app/assets/images/separator.png b/app/assets/images/separator.png
index b9767addc222e4ab13f6b98a7e2750a9e035eea8..bf35123b6a3ac4f10fd788360c6f5b043d4f95f4 100644
GIT binary patch
delta 82
zcmbQpm@+}ahl7oQfgvX7&om&V?djqeQo)#fV^i((x3%p2>IMs#7d&86_~-9`(l>hh
merC@{R~$DgFg^HU$q@V?e8=Rky^Da_7(8A5T-G@yGywpnvL5{a

delta 127
zcmYe9$T&fwl7*Rpfni<E!=*q<D8MJgb<@`ETek1qcknO}0mXpift(kNKo)CBkYDh-
z+Y1sHB;v~hfC8GHE{-7_vdIEvg^2;Cg^2}RWr+oWrilfGTxkV`iLDnL>^x*t_(Rwk
YmP@nGIj0*v1*nO^)78&qol`;+0CN;8X#fBK


From f0d80b3c1f56f4bcbe7549c8ef9e4f01695990d3 Mon Sep 17 00:00:00 2001
From: Paul Hayes <fofr@users.noreply.github.com>
Date: Fri, 16 Dec 2016 14:48:31 +0000
Subject: [PATCH 3/5] Use link colours for share buttons

Show the button in purple when it matches the visited state. With a
purple link and a blue button it looks like a mistake.

Also use active and hover colours to match full link behaviour.
---
 .../stylesheets/helpers/_share-buttons.scss   | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/helpers/_share-buttons.scss b/app/assets/stylesheets/helpers/_share-buttons.scss
index ad0cc953b..d0f454a2a 100644
--- a/app/assets/stylesheets/helpers/_share-buttons.scss
+++ b/app/assets/stylesheets/helpers/_share-buttons.scss
@@ -8,17 +8,29 @@
 
     .share-button-link {
       margin-right: $gutter;
-    }
 
-    .share-button {
-      display: inline-block;
-      width: $share-button-width;
-      height: $share-button-height;
-      margin-right: $gutter-one-third;
-      background-color: $govuk-blue;
-      background-image: image-url("social-icons-white.png");
-      background-repeat: no-repeat;
-      vertical-align: top;
+      .share-button {
+        display: inline-block;
+        width: $share-button-width;
+        height: $share-button-height;
+        margin-right: $gutter-one-third;
+        background-color: $link-colour;
+        background-image: image-url("social-icons-white.png");
+        background-repeat: no-repeat;
+        vertical-align: top;
+      }
+
+      &:visited .share-button {
+        background-color: $link-visited-colour;
+      }
+
+      &:active .share-button {
+        background-color: $link-active-colour;
+      }
+
+      &:hover .share-button {
+        background-color: $link-hover-colour;
+      }
     }
 
     .share-button-facebook {

From 59cb8df86e435435b1794ba0503e93df90c4d0f9 Mon Sep 17 00:00:00 2001
From: Paul Hayes <fofr@users.noreply.github.com>
Date: Fri, 16 Dec 2016 15:25:30 +0000
Subject: [PATCH 4/5] Add javascript tracking of share buttons

* Tracking ported from Whitehall
* Set up and include first JS in government-frontend
---
 app/assets/javascripts/application.js         |  1 +
 .../modules/track-share-button-clicks.js      | 26 +++++++++++++++++++
 app/views/content_items/consultation.html.erb |  6 ++---
 app/views/layouts/application.html.erb        |  1 +
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/application.js
 create mode 100644 app/assets/javascripts/modules/track-share-button-clicks.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
new file mode 100644
index 000000000..079e5abc2
--- /dev/null
+++ b/app/assets/javascripts/application.js
@@ -0,0 +1 @@
+//= require_tree ./modules
diff --git a/app/assets/javascripts/modules/track-share-button-clicks.js b/app/assets/javascripts/modules/track-share-button-clicks.js
new file mode 100644
index 000000000..307655054
--- /dev/null
+++ b/app/assets/javascripts/modules/track-share-button-clicks.js
@@ -0,0 +1,26 @@
+window.GOVUK.Modules = window.GOVUK.Modules || {};
+
+(function (GOVUK) {
+  'use strict'
+
+  GOVUK.Modules.TrackShareButtonClicks = function () {
+    this.start = function (element) {
+      element.on('click', '.js-share-facebook', trackFacebook)
+      element.on('click', '.js-share-twitter', trackTwitter)
+
+      function trackFacebook () {
+        trackShare('facebook')
+      }
+
+      function trackTwitter () {
+        trackShare('twitter')
+      }
+
+      function trackShare (network) {
+        if (GOVUK.analytics && GOVUK.analytics.trackShare) {
+          GOVUK.analytics.trackShare(network)
+        }
+      }
+    }
+  }
+})(window.GOVUK)
diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb
index eba618b02..006ab13a7 100644
--- a/app/views/content_items/consultation.html.erb
+++ b/app/views/content_items/consultation.html.erb
@@ -232,15 +232,15 @@
 <div class="grid-row sidebar-with-body">
   <div class="column-two-thirds offset-one-third">
     <h2>Share this page</h2>
-    <div class="share-buttons">
+    <div class="share-buttons" data-module="track-share-button-clicks">
       <%= link_to @content_item.facebook_share_url,
           target: "_blank",
-          class: "share-button-link" do %>
+          class: "share-button-link js-share-facebook" do %>
         <span class="share-button share-button-facebook"></span><span class="visually-hidden">Share on </span>Facebook<% end %>
 
       <%= link_to @content_item.twitter_share_url,
           target: "_blank",
-          class: "share-button-link" do %>
+          class: "share-button-link js-share-twitter" do %>
         <span class="share-button share-button-twitter"></span><span class="visually-hidden">Share on </span>Twitter<% end %>
     </div>
   </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c9f3da508..be638bfbd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -6,6 +6,7 @@
   <!--[if IE 6]><%= stylesheet_link_tag "application-ie6" %><script>var ieVersion = 6;</script><![endif]-->
   <!--[if IE 7]><%= stylesheet_link_tag "application-ie7" %><script>var ieVersion = 7;</script><![endif]-->
   <!--[if IE 8]><%= stylesheet_link_tag "application-ie8" %><script>var ieVersion = 8;</script><![endif]-->
+  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
   <%= render partial: 'govuk_component/analytics_meta_tags', locals: { content_item: @content_item.content_item } %>
   <% if content_for(:meta_description).present? %>

From 97085c3c9b072e4e3b88c3f9fb6ae0dfd041f9b5 Mon Sep 17 00:00:00 2001
From: Paul Hayes <fofr@users.noreply.github.com>
Date: Fri, 16 Dec 2016 16:23:16 +0000
Subject: [PATCH 5/5] Only offset column on tablet and above

On mobile devices containers using this class would still be shifted
right by a few 100 pixels.
---
 app/assets/stylesheets/helpers/_sidebar-with-body.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/helpers/_sidebar-with-body.scss b/app/assets/stylesheets/helpers/_sidebar-with-body.scss
index 7f96b5982..3c36c63e2 100644
--- a/app/assets/stylesheets/helpers/_sidebar-with-body.scss
+++ b/app/assets/stylesheets/helpers/_sidebar-with-body.scss
@@ -16,6 +16,8 @@
   }
 
   .offset-one-third {
-    margin-left: percentage(1 / 3);
+    @include media(tablet) {
+      margin-left: percentage(1 / 3);
+    }
   }
 }