pugin 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee5060392d300c70657dc2111d57a21e75d53308
-  data.tar.gz: 1d5df330f288a5790f2afc848e4809bbf3b86c9d
+  metadata.gz: 21155ec1b0d35348a4a36c06779930e029640a84
+  data.tar.gz: be85a1ffa2cc92346541f53a0916245c73212823
 SHA512:
-  metadata.gz: 7794100c0263228cf90dc83f12f1546b622f8b0f9d60030ae704e395d46d44cba1c82ae8c3fe20e371620f9aded2c89716a9adfec240de21b43619ded2e95847
-  data.tar.gz: 53a8a08abc44e1cce323c94070968564b54e79679e1dd4991b24245b2f7d98122752aacae7498c34fdeb2dca74c0a7a68e5fea011e4db99cf4f740496f9ec8e7
+  metadata.gz: 2be2a35269c81cb83f2fd9ae3c4506ebd9b60f09d86a238e787245a32ff81ebac0f96295a2b91fb0b4a90e372cab9f6c1898d26e3da0e53a607a0f74fc85a1fa
+  data.tar.gz: d1c8ad210131eed9374bed5736498fee411c0d1d5d4a8b40d3dd6d9eaf1e1faa38f7ca9093580ba82cd434a85d8c58f449b1e6a07feed05f010ea023d810776d

data/app/views/pugin/committees/list/_list.html.haml

@@ -1,7 +1,7 @@
 %li
   .list--details
     - if committees.respond_to?(:name)
-      %h2= link_to(committees.name, committees_show_path(committees.graph_id))
+      %h2= committees.name
     - else
-      %h2= link_to(committees.formal_body.name, committees_show_path(committees.formal_body.graph_id))
+      %h2= committees.formal_body.name
     %p= "" ? committees.date_range : committees.formal_body.date_range

data/app/views/pugin/components/_navigation-letter.haml

@@ -5,7 +5,7 @@
         - if @letters.empty? || !local_assigns[:all_path]
           %span= I18n.t('pugin.components.navigation-letter.all').capitalize
         - else
-          = link_to "#{I18n.t('pugin.components.navigation-letter.all').upcase}", send(all_path)
+          = link_to "#{I18n.t('pugin.components.navigation-letter.all').capitalize}", send(all_path, local_assigns.fetch(:route_args, nil))
       - ('a'..'z').each do |letter|
         %li{ data: { letter: letter }, class: ('active' if (params[:letter] == letter)) }
           - if @letters.include?(letter.upcase)

data/app/views/pugin/components/_status-cookie.haml

@@ -0,0 +1,3 @@
+.status--banner.theme--caution.cookie#cookie
+  .container
+    %p= t('.cookie_content', link: link_to(t('.about_cookies'), meta_cookie_policy_path())).html_safe

data/app/views/pugin/components/_status.haml

@@ -1,6 +1,8 @@
 .status--banner
   .container
     %p
+      %img{ class: "icon--inline", src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/icons/caution-circle-white.svg" }
+      
       = I18n.t('pugin.components.status.status_text_1')
       %a{ href: 'http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/' }= I18n.t('pugin.components.status.give_feedback')
       = I18n.t('pugin.components.status.status_text_2')

data/app/views/pugin/javascript/_has_js.haml

@@ -0,0 +1,2 @@
+:javascript
+  document.body.className = ((document.body.className) ? document.body.className + ' has-js' : 'has-js');

data/app/views/pugin/layouts/_layout.html.haml

@@ -15,7 +15,9 @@
       / \==========================/
     - Pugin.alternates.each do |alternate|
       %link{rel: 'alternate', type: alternate[:type], href: alternate[:href]}
-  %body.no-js
+  %body
+    = render partial: 'pugin/javascript/has_js'
+    = render partial: 'pugin/components/status-cookie'
     - if ENV['GTM_KEY']
       = render partial: 'pugin/javascript/google_tag_manager_noscript'
     = render partial: 'pugin/elements/skip-content'

data/config/locales/en.yml

@@ -34,6 +34,9 @@ en:
         item_2: "Lords"
         item_3: "Parties and groups"
         item_4: "Constituencies"
+      status-cookie:
+        cookie_content: 'Parliament.uk uses cookies to make the site simpler. %{link}.'
+        about_cookies: 'Find out more about cookies'
     people:
         list:
           member:

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

data/spec/views/pugin/components/_status.html.haml_spec.rb

@@ -19,6 +19,7 @@ describe 'pugin/components/_status.html.haml', type: :view do
 <div class='status--banner'>
 <div class='container'>
 <p>
+<img class='icon--inline' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.6.3/icons/caution-circle-white.svg'>
 This is a test website, so may be inaccurate.
 <a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/'>Give feedback</a>
 to help improve it.
@@ -44,6 +45,7 @@ DATA
 <div class='status--banner'>
 <div class='container'>
 <p>
+<img class='icon--inline' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.6.3/icons/caution-circle-white.svg'>
 This is a test website, so may be inaccurate.
 <a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/'>Give feedback</a>
 to help improve it.
@@ -72,6 +74,7 @@ DATA
 <div class='status--banner'>
 <div class='container'>
 <p>
+<img class='icon--inline' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.6.3/icons/caution-circle-white.svg'>
 This is a test website, so may be inaccurate.
 <a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/'>Give feedback</a>
 to help improve it.
@@ -102,6 +105,7 @@ DATA
 <div class='status--banner'>
 <div class='container'>
 <p>
+<img class='icon--inline' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.6.3/icons/caution-circle-white.svg'>
 This is a test website, so may be inaccurate.
 <a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/'>Give feedback</a>
 to help improve it.

data/spec/views/pugin/layouts/_layout.html.haml_spec.rb

@@ -20,6 +20,7 @@ describe 'pugin/layouts/_layout.html.haml', type: :view do
     allow(view).to receive(:house_parties_current_path).and_return("houses/#{Parliament::Utils::Helpers::HousesHelper.commons_id}/parties/current/")
     allow(view).to receive(:find_your_constituency_path).and_return("/find-your-constituency")
     allow(view).to receive(:opensearch_description_url).and_return("http://localhost:3000/search/opensearch")
+    allow(view).to receive(:meta_cookie_policy_path).and_return("/meta/cookie-policy")
   end
 
   it 'renders HAML without errors' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -198,12 +198,14 @@ files:
 - app/views/pugin/components/_header.haml
 - app/views/pugin/components/_navigation-letter.haml
 - app/views/pugin/components/_navigation-main.haml
+- app/views/pugin/components/_status-cookie.haml
 - app/views/pugin/components/_status.haml
 - app/views/pugin/constituencies/list/_list.html.haml
 - app/views/pugin/elements/_list.html.haml
 - app/views/pugin/elements/_skip-content.haml
 - app/views/pugin/javascript/_google_tag_manager.haml
 - app/views/pugin/javascript/_google_tag_manager_noscript.haml
+- app/views/pugin/javascript/_has_js.haml
 - app/views/pugin/layouts/_layout.html.haml
 - app/views/pugin/layouts/pugin-sinatra.haml
 - app/views/pugin/layouts/pugin.html.erb