pugin 0.8.2 → 0.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/views/pugin/components/_header.haml +1 -1
- data/app/views/pugin/components/_status.haml +1 -1
- data/app/views/pugin/layouts/pugin-sinatra.haml +2 -2
- data/app/views/pugin/layouts/pugin.haml +2 -2
- data/lib/pugin.rb +2 -1
- data/lib/pugin/version.rb +1 -1
- data/lib/pugin/view_helpers.rb +1 -1
- data/spec/views/pugin/components/_header.html.haml_spec.rb +1 -1
- data/spec/views/pugin/components/_status.html.haml_spec.rb +4 -4
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 99fb83c9f9c089a9a858f03d143e2b56276ce0d9
|
|
4
|
+
data.tar.gz: d3e140508e9c5398f9aa0760eee0463eac4fe051
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cd632727f4133c0c55940d8d1981488caf4915402f4e439cbb9bffd05d40bfee5e1502a68bb6a62dac917973d097090fa3ec43b5b1b183054752531d2a85d6e1
|
|
7
|
+
data.tar.gz: ea086ca2771ffbe6bbf6e87f5ca4349b15513f7cf9f639a8d713e3227dce2f5087a68bc7ce20bf7415c4ed30320b6c908d7c78dd07b9c0a4af87426b075138d5
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
%header
|
|
2
2
|
.container
|
|
3
3
|
%a{:href => "/" }
|
|
4
|
-
%img{:src => "https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/
|
|
4
|
+
%img{:src => "https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/images/uk_parliament_logo_white.png", :alt => "#{I18n.t('pugin.components.header.parliament_header')}", :class => "logo", :srcset => "https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/images/uk_parliament_logo_white.svg"}
|
|
@@ -6,15 +6,15 @@
|
|
|
6
6
|
%link{rel: 'stylesheet', href: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/stylesheets/main.css" }
|
|
7
7
|
%meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
|
|
8
8
|
%meta{'http-equiv': 'X-UA-Compatible', content: 'IE=edge'}
|
|
9
|
-
|
|
9
|
+
%link{rel: 'shortcut icon', type: 'image/x-icon', href: "#{Pugin::STATIC_ASSET_LOCATION_URL}/favicon.ico"}
|
|
10
10
|
- if ENV['GTM_KEY']
|
|
11
11
|
= partial '/pugin/javascript/_google_tag_manager'
|
|
12
12
|
%body.no-js
|
|
13
13
|
- if ENV['GTM_KEY']
|
|
14
14
|
= partial '/pugin/javascript/_google_tag_manager_noscript'
|
|
15
15
|
= partial '/pugin/elements/_skip-content'
|
|
16
|
-
= partial '/pugin/components/_header'
|
|
17
16
|
= partial '/pugin/components/_status'
|
|
17
|
+
= partial '/pugin/components/_header'
|
|
18
18
|
%main
|
|
19
19
|
= yield
|
|
20
20
|
= partial '/pugin/components/_footer'
|
|
@@ -5,15 +5,15 @@
|
|
|
5
5
|
%link{rel: 'stylesheet', href: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/stylesheets/main.css" }
|
|
6
6
|
%meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
|
|
7
7
|
%meta{'http-equiv': 'X-UA-Compatible', content: 'IE=edge'}
|
|
8
|
-
|
|
8
|
+
%link{rel: 'shortcut icon', type: 'image/x-icon', href: "#{Pugin::STATIC_ASSET_LOCATION_URL}/favicon.ico"}
|
|
9
9
|
- if ENV['GTM_KEY']
|
|
10
10
|
= render partial: 'pugin/javascript/google_tag_manager'
|
|
11
11
|
%body.no-js
|
|
12
12
|
- if ENV['GTM_KEY']
|
|
13
13
|
= render partial: 'pugin/javascript/google_tag_manager_noscript'
|
|
14
14
|
= render partial: 'pugin/elements/skip-content'
|
|
15
|
-
= render 'pugin/components/header'
|
|
16
15
|
= render partial: 'pugin/components/status', locals: { status: nil } if Pugin::Feature::StatusBanner.enabled?
|
|
16
|
+
= render 'pugin/components/header'
|
|
17
17
|
= render partial: 'pugin/components/navigation-main' if Pugin::Feature::TopNavigation.enabled?
|
|
18
18
|
%main
|
|
19
19
|
= yield
|
data/lib/pugin.rb
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
require 'pugin/version'
|
|
2
2
|
|
|
3
3
|
module Pugin
|
|
4
|
-
ASSET_VERSION = '1.4.
|
|
4
|
+
ASSET_VERSION = '1.4.8'.freeze
|
|
5
5
|
ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1devci.pugin-website')
|
|
6
|
+
STATIC_ASSET_LOCATION_URL = ENV.fetch('STATIC_ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1devci.static-assets')
|
|
6
7
|
|
|
7
8
|
class << self
|
|
8
9
|
# Inspired by bootsrap-sass
|
data/lib/pugin/version.rb
CHANGED
data/lib/pugin/view_helpers.rb
CHANGED
|
@@ -12,7 +12,7 @@ module Pugin
|
|
|
12
12
|
if @image
|
|
13
13
|
return image_tag("#{@image.image_id}")
|
|
14
14
|
else
|
|
15
|
-
return image_tag("https://s3-eu-west-1.amazonaws.com/
|
|
15
|
+
return image_tag("https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/images/uk_parliament_placeholder_list_image.png")
|
|
16
16
|
end
|
|
17
17
|
end
|
|
18
18
|
end
|
|
@@ -10,7 +10,7 @@ describe 'pugin/components/_header.html.haml', type: :view do
|
|
|
10
10
|
<header>
|
|
11
11
|
<div class='container'>
|
|
12
12
|
<a href='/'>
|
|
13
|
-
<img alt='UK Parliament' class='logo' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/
|
|
13
|
+
<img alt='UK Parliament' class='logo' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/images/uk_parliament_logo_white.png' srcset='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/images/uk_parliament_logo_white.svg'>
|
|
14
14
|
</a>
|
|
15
15
|
</div>
|
|
16
16
|
</header>
|
|
@@ -16,7 +16,7 @@ describe 'pugin/components/_status.html.haml', type: :view do
|
|
|
16
16
|
|
|
17
17
|
expect(response).to eq(
|
|
18
18
|
<<DATA
|
|
19
|
-
<div class='highlight--status
|
|
19
|
+
<div class='highlight--status'>
|
|
20
20
|
<div class='container'>
|
|
21
21
|
<p>
|
|
22
22
|
This is a test website, so may be inaccurate.
|
|
@@ -41,7 +41,7 @@ DATA
|
|
|
41
41
|
render partial: 'pugin/components/status', locals: { status: nil }
|
|
42
42
|
expect(response).to eq(
|
|
43
43
|
<<DATA
|
|
44
|
-
<div class='highlight--status
|
|
44
|
+
<div class='highlight--status'>
|
|
45
45
|
<div class='container'>
|
|
46
46
|
<p>
|
|
47
47
|
This is a test website, so may be inaccurate.
|
|
@@ -69,7 +69,7 @@ DATA
|
|
|
69
69
|
|
|
70
70
|
expect(response).to eq(
|
|
71
71
|
<<DATA
|
|
72
|
-
<div class='highlight--status
|
|
72
|
+
<div class='highlight--status'>
|
|
73
73
|
<div class='container'>
|
|
74
74
|
<p>
|
|
75
75
|
This is a test website, so may be inaccurate.
|
|
@@ -99,7 +99,7 @@ DATA
|
|
|
99
99
|
|
|
100
100
|
expect(response).to eq(
|
|
101
101
|
<<DATA
|
|
102
|
-
<div class='highlight--status
|
|
102
|
+
<div class='highlight--status'>
|
|
103
103
|
<div class='container'>
|
|
104
104
|
<p>
|
|
105
105
|
This is a test website, so may be inaccurate.
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: pugin
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.8.
|
|
4
|
+
version: 0.8.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Matt Rayner
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-06-
|
|
11
|
+
date: 2017-06-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|