govuk_publishing_components 6.0.0 → 6.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/govuk_publishing_components/_all_components.scss +1 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/_taxonomy-navigation.scss +76 -0
- data/app/views/govuk_publishing_components/components/_contextual_sidebar.html.erb +1 -1
- data/app/views/govuk_publishing_components/components/_taxonomy_navigation.html.erb +115 -0
- data/app/views/govuk_publishing_components/components/docs/contextual_sidebar.yml +4 -0
- data/app/views/govuk_publishing_components/components/docs/taxonomy_navigation.yml +122 -0
- data/config/locales/en.yml +7 -0
- data/lib/govuk_publishing_components.rb +4 -4
- data/lib/govuk_publishing_components/presenters/{breadcrumbs.rb → content_breadcrumbs_based_on_parent.rb} +1 -1
- data/lib/govuk_publishing_components/presenters/{taxon_breadcrumbs.rb → content_breadcrumbs_based_on_taxons.rb} +1 -1
- data/lib/govuk_publishing_components/presenters/contextual_navigation.rb +4 -4
- data/lib/govuk_publishing_components/presenters/navigation_type.rb +1 -5
- data/lib/govuk_publishing_components/presenters/{step_nav_helper.rb → page_with_step_by_step_navigation.rb} +1 -1
- data/lib/govuk_publishing_components/presenters/{taxonomy_sidebar.rb → taxonomy_navigation.rb} +19 -3
- data/lib/govuk_publishing_components/version.rb +1 -1
- metadata +9 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1d570b7d195fdcdf9d28a7cb0502750541b0f5fb04576bc138ffe2b9959f7aed
|
|
4
|
+
data.tar.gz: edde09a2676e3529e3c9b9021fe3c007436d7815770f8118378c4186a6428726
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a9fd5314c688fd2531be541cfbcef25a0c202d8cbb3104bc88621b90056d4baa78a9b7e1c31a2dec9fa315d7e8d6e807e9910314fec548b7df1c760b1a75ece7
|
|
7
|
+
data.tar.gz: 47d8dbd1faa5ec8d7e72f111571ea3ce7d04377ffc2107bfced125fc1f70bbcba26d85e580b6a3570667b89f493a4811499fb04ac62de4558df7723fdc00b187
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
.gem-c-taxonomy-navigation {
|
|
2
|
+
@include core-16;
|
|
3
|
+
border-top: 2px solid $govuk-blue;
|
|
4
|
+
padding-top: $gutter-half;
|
|
5
|
+
|
|
6
|
+
// FIXME: These styles can be removed once new
|
|
7
|
+
// taxonomy template code is populated across all
|
|
8
|
+
// application caches.
|
|
9
|
+
h2 {
|
|
10
|
+
margin-bottom: 0.5em;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
.taxon-description {
|
|
14
|
+
margin-bottom: 0.75em;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
ul {
|
|
18
|
+
// reset the default browser styles
|
|
19
|
+
padding: 0;
|
|
20
|
+
margin: 0;
|
|
21
|
+
list-style: none;
|
|
22
|
+
margin-bottom: 1.25em;
|
|
23
|
+
|
|
24
|
+
li {
|
|
25
|
+
// reset the default browser styles
|
|
26
|
+
padding: 0;
|
|
27
|
+
margin-bottom: 0.75em;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
// END FIXME
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
.gem-c-taxonomy-navigation__heading {
|
|
34
|
+
@include bold-19;
|
|
35
|
+
margin-bottom: $gutter-one-third;
|
|
36
|
+
margin-top: 0;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
.gem-c-taxonomy-navigation__taxon-description {
|
|
40
|
+
margin-bottom: $gutter-one-third;
|
|
41
|
+
margin-top: 0;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
.gem-c-taxonomy-navigation__navigation {
|
|
45
|
+
margin-bottom: $gutter;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
.gem-c-taxonomy-navigation__list {
|
|
49
|
+
list-style: none;
|
|
50
|
+
margin: 0;
|
|
51
|
+
margin-bottom: 1.25em;
|
|
52
|
+
padding: 0;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
.gem-c-taxonomy-navigation__item {
|
|
56
|
+
list-style-type: none;
|
|
57
|
+
margin-bottom: $gutter-one-third;
|
|
58
|
+
padding: 0;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
.gem-c-taxonomy-navigation__link {
|
|
62
|
+
text-decoration: none;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
|
|
66
|
+
.gem-c-taxonomy-navigation__section-heading {
|
|
67
|
+
border-top: 1px solid $border-colour;
|
|
68
|
+
margin-bottom: $gutter-half;
|
|
69
|
+
margin-top: $gutter;
|
|
70
|
+
padding-top: $gutter-half;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
.gem-c-taxonomy-navigation__section-link {
|
|
74
|
+
@include bold-19;
|
|
75
|
+
text-decoration: none;
|
|
76
|
+
}
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
<% else %>
|
|
12
12
|
<% if navigation.should_present_taxonomy_navigation? %>
|
|
13
13
|
<!-- rendering taxonomy sidebar -->
|
|
14
|
-
<%= render
|
|
14
|
+
<%= render 'govuk_publishing_components/components/taxonomy_navigation', navigation.taxonomy_sidebar %>
|
|
15
15
|
<% else %>
|
|
16
16
|
<!-- rendering related navigation sidebar -->
|
|
17
17
|
<%= render 'govuk_publishing_components/components/related_navigation', content_item %>
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
<% if local_assigns[:items] && !items.blank? %>
|
|
2
|
+
<aside class='gem-c-taxonomy-navigation' data-module='track-click' role='complementary'>
|
|
3
|
+
<h2 class='gem-c-taxonomy-navigation__heading'><%= t("components.taxonomy_navigation.related_content") %></h2>
|
|
4
|
+
<% items.each_with_index do |item, item_index| %>
|
|
5
|
+
<div data-track-count="sidebarTaxonSection">
|
|
6
|
+
<h3 class='gem-c-taxonomy-navigation__heading'>
|
|
7
|
+
<%=
|
|
8
|
+
link_to_if(
|
|
9
|
+
item[:url],
|
|
10
|
+
item[:title],
|
|
11
|
+
item[:url],
|
|
12
|
+
class: 'gem-c-taxonomy-navigation__link',
|
|
13
|
+
data: {
|
|
14
|
+
track_category: 'relatedLinkClicked',
|
|
15
|
+
track_action: "#{item_index + 1}",
|
|
16
|
+
track_label: item[:url],
|
|
17
|
+
track_options: {
|
|
18
|
+
dimension28: items.length.to_s,
|
|
19
|
+
dimension29: item[:title],
|
|
20
|
+
},
|
|
21
|
+
},
|
|
22
|
+
)
|
|
23
|
+
%>
|
|
24
|
+
</h3>
|
|
25
|
+
|
|
26
|
+
<p class='gem-c-taxonomy-navigation__taxon-description'>
|
|
27
|
+
<%= item[:description] %>
|
|
28
|
+
</p>
|
|
29
|
+
|
|
30
|
+
<% item[:related_content] ||= [] %>
|
|
31
|
+
<% if item[:related_content].any? %>
|
|
32
|
+
<nav class='gem-c-taxonomy-navigation__navigation' role='navigation'>
|
|
33
|
+
<ul class='gem-c-taxonomy-navigation__list'>
|
|
34
|
+
<% item[:related_content].each_with_index do |related_item, related_content_index| %>
|
|
35
|
+
<li class='gem-c-taxonomy-navigation__item'>
|
|
36
|
+
<%=
|
|
37
|
+
link_to(
|
|
38
|
+
related_item[:title],
|
|
39
|
+
related_item[:link],
|
|
40
|
+
data: {
|
|
41
|
+
track_category: 'relatedLinkClicked',
|
|
42
|
+
track_action: "#{item_index + 1}.#{related_content_index + 1}",
|
|
43
|
+
track_label: related_item[:link],
|
|
44
|
+
track_options: {
|
|
45
|
+
dimension28: item[:related_content].length.to_s,
|
|
46
|
+
dimension29: related_item[:title],
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
class: 'related-link gem-c-taxonomy-navigation__link',
|
|
50
|
+
)
|
|
51
|
+
%>
|
|
52
|
+
</li>
|
|
53
|
+
<% end %>
|
|
54
|
+
</ul>
|
|
55
|
+
</nav>
|
|
56
|
+
<% end %>
|
|
57
|
+
</div>
|
|
58
|
+
<% end %>
|
|
59
|
+
|
|
60
|
+
<% local_assigns.except(:items).each do |section_name, section| %>
|
|
61
|
+
<% if section && !section.blank? %>
|
|
62
|
+
<div>
|
|
63
|
+
<h3 class='gem-c-taxonomy-navigation__section-heading'>
|
|
64
|
+
<%= t("components.taxonomy_navigation.#{section_name}") %>
|
|
65
|
+
</h3>
|
|
66
|
+
<nav class='gem-c-taxonomy-navigation__navigation' data-module='toggle' role='navigation'>
|
|
67
|
+
<ul class='gem-c-taxonomy-navigation__list'>
|
|
68
|
+
<% sidx = 0; hidden_links = [] %>
|
|
69
|
+
<% section.each_with_index do |item, idx| %>
|
|
70
|
+
<% if item[:text] && item[:path] %>
|
|
71
|
+
<% link_element = link_to(
|
|
72
|
+
item[:text], item[:path],
|
|
73
|
+
class: "gem-c-taxonomy-navigation__section-link",
|
|
74
|
+
rel: item[:rel],
|
|
75
|
+
data: {
|
|
76
|
+
track_category: 'relatedLinkClicked',
|
|
77
|
+
track_action: "#{sidx += 1}.#{idx + 1} #{t('components.taxonomy_navigation.related_content')}",
|
|
78
|
+
track_label: item[:path],
|
|
79
|
+
track_options: {
|
|
80
|
+
dimension28: section.length.to_s,
|
|
81
|
+
dimension29: item[:text]
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
) %>
|
|
85
|
+
<% if idx < 5 %>
|
|
86
|
+
<li><%= link_element %></li>
|
|
87
|
+
<% else %>
|
|
88
|
+
<% hidden_links << link_element %>
|
|
89
|
+
<% end %>
|
|
90
|
+
<% end %>
|
|
91
|
+
<% end %>
|
|
92
|
+
<% if hidden_links.any? %>
|
|
93
|
+
<li class="gem-c-taxonomy-navigation__link toggle-wrap">
|
|
94
|
+
<a href="#"
|
|
95
|
+
data-controls="toggle_<%= section_name %>"
|
|
96
|
+
data-expanded="false"
|
|
97
|
+
data-toggled-text="<%= t("govuk_component.metadata.toggle_less", default: "Show fewer") %>">
|
|
98
|
+
<%= t("govuk_component.metadata.toggle_more",
|
|
99
|
+
number: hidden_links.size,
|
|
100
|
+
default: "+ #{hidden_links.size} more") %>
|
|
101
|
+
</a>
|
|
102
|
+
</li>
|
|
103
|
+
<li class="gem-c-taxonomy-navigation__link">
|
|
104
|
+
<span id="toggle_<%= section_name %>" class="js-hidden">
|
|
105
|
+
<%= hidden_links.to_sentence.html_safe %>
|
|
106
|
+
</span>
|
|
107
|
+
</li>
|
|
108
|
+
<% end %>
|
|
109
|
+
</ul>
|
|
110
|
+
</nav>
|
|
111
|
+
</div>
|
|
112
|
+
<% end %>
|
|
113
|
+
<% end %>
|
|
114
|
+
</aside>
|
|
115
|
+
<% end %>
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
name: "Taxonomy navigation"
|
|
2
|
+
description: "Sidebar navigation for displaying on pages tagged to the GOV.UK taxonomy."
|
|
3
|
+
body: |
|
|
4
|
+
This component should not be used directly, the contextual-sidebar component uses
|
|
5
|
+
this component for content which should present taxonomy navigation.
|
|
6
|
+
|
|
7
|
+
Accepts an array of items. These items are typically the list of taxons the current
|
|
8
|
+
content page is tagged to.
|
|
9
|
+
|
|
10
|
+
Each item is a hash with a title, url, description, and list of related content
|
|
11
|
+
associated with that item.
|
|
12
|
+
|
|
13
|
+
Sections of links appear below the main taxonomy-driven navigation items. These are
|
|
14
|
+
Collections, Policies, Statistical data sets, Topical events and World locations.
|
|
15
|
+
|
|
16
|
+
This implementation is very similar to the related-navigation component in that the
|
|
17
|
+
same sections are appended. The two components should ultimately be merged to form
|
|
18
|
+
a consolidated sidebar navigation.
|
|
19
|
+
accessibility_criteria: |
|
|
20
|
+
- Should have a role of 'complementary' as it complements the main page content
|
|
21
|
+
- Should have a role of 'navigation' on any navigation elements inside the component
|
|
22
|
+
shared_accessibility_criteria:
|
|
23
|
+
- link
|
|
24
|
+
examples:
|
|
25
|
+
default:
|
|
26
|
+
data:
|
|
27
|
+
items:
|
|
28
|
+
- title: "School curriculum"
|
|
29
|
+
url: /education/school-curriculum
|
|
30
|
+
description: |
|
|
31
|
+
Early years, key stages 1 to 5, GCSE and AS and A level reforms, tests,
|
|
32
|
+
exams and assessments, PSHE and SMSC.
|
|
33
|
+
related_content:
|
|
34
|
+
- title: "The national curriculum"
|
|
35
|
+
link: /national-curriculum
|
|
36
|
+
- title: "Tests (key stage 1)"
|
|
37
|
+
url: /key-stage-1-tests
|
|
38
|
+
description: |
|
|
39
|
+
Key dates, sample and test materials, administration, moderation,
|
|
40
|
+
assessing and reporting, statistics, frameworks.
|
|
41
|
+
related_content:
|
|
42
|
+
- title: "Key stage 1 teacher assessment"
|
|
43
|
+
link: /government/collections/key-stage-1-teacher-assessment
|
|
44
|
+
- title: "Primary assessments: information and resources for 2017"
|
|
45
|
+
link: /government/publications/primary-assessments-information-and-resources-for-2017
|
|
46
|
+
long_example:
|
|
47
|
+
data:
|
|
48
|
+
items:
|
|
49
|
+
- title: "School curriculum for children ages 16 to 19, and 10 to 14"
|
|
50
|
+
url: /education/school-curriculum
|
|
51
|
+
description: |
|
|
52
|
+
Early years, key stages 1 to 5, GCSE and AS and A level reforms, tests,
|
|
53
|
+
exams and assessments, PSHE and SMSC. Widening participation, funding
|
|
54
|
+
for children in deprived areas. Improving attainment in schools for
|
|
55
|
+
looked-after children.
|
|
56
|
+
related_content:
|
|
57
|
+
- title: "Further education financial management and data collection"
|
|
58
|
+
link: /government/collections/key-stage-1-teacher-assessment
|
|
59
|
+
- title: "Primary assessments: information and resources for 2017"
|
|
60
|
+
link: /government/publications/primary-assessments-information-and-resources-for-2017
|
|
61
|
+
- title: "Slide pack from Phil Beach at the Skills & Employability Summit"
|
|
62
|
+
link: /government/publications/primary-assessments-information-and-resources-for-2017
|
|
63
|
+
- title: "Transport to education and training for people aged 16 to 18"
|
|
64
|
+
link: /government/publications/primary-assessments-information-and-resources-for-2017
|
|
65
|
+
- title: "Tests (key stage 1, 2 and 3), plus further tests outside of school"
|
|
66
|
+
url: /key-stage-1-tests
|
|
67
|
+
description: |
|
|
68
|
+
Key dates, sample and test materials, administration, moderation,
|
|
69
|
+
assessing and reporting, statistics, frameworks. University and college
|
|
70
|
+
qualifications. Apprenticeships, traineeships and internships. Funding
|
|
71
|
+
for further education providers.
|
|
72
|
+
related_content:
|
|
73
|
+
- title: "Key stage 1 teacher assessment"
|
|
74
|
+
link: /government/collections/key-stage-1-teacher-assessment
|
|
75
|
+
- title: "Primary assessments: information and resources for 2017"
|
|
76
|
+
link: /government/publications/primary-assessments-information-and-resources-for-2017
|
|
77
|
+
collections:
|
|
78
|
+
- text: "Statistics: outcome based success measures"
|
|
79
|
+
path: "/government/collections/statistics-outcome-based-success-measures"
|
|
80
|
+
policies:
|
|
81
|
+
- text: "Teaching and school leadership"
|
|
82
|
+
path: "/government/policies/teaching-and-school-leadership"
|
|
83
|
+
world_locations:
|
|
84
|
+
- text: "Afghanistan"
|
|
85
|
+
path: "/world/afghanistan/news"
|
|
86
|
+
- text: "Albania"
|
|
87
|
+
path: "/world/albania/news"
|
|
88
|
+
- text: "Algeria"
|
|
89
|
+
path: "/world/algeria/news"
|
|
90
|
+
- text: "Angola"
|
|
91
|
+
path: "/world/angola/news"
|
|
92
|
+
- text: "Anguilla"
|
|
93
|
+
path: "/world/anguilla/news"
|
|
94
|
+
- text: "Argentina"
|
|
95
|
+
path: "/world/argentina/news"
|
|
96
|
+
no_children:
|
|
97
|
+
description: |
|
|
98
|
+
The child links are usually pulled from rummager. If rummager doesn’t respond we fallback to a sidebar with a taxon link but without any child content links.
|
|
99
|
+
data:
|
|
100
|
+
items:
|
|
101
|
+
- title: "School curriculum"
|
|
102
|
+
url: /education/school-curriculum
|
|
103
|
+
description: |
|
|
104
|
+
Early years, key stages 1 to 5, GCSE and AS and A level reforms, tests,
|
|
105
|
+
exams and assessments, PSHE and SMSC.
|
|
106
|
+
- title: "Tests (key stage 1)"
|
|
107
|
+
url: /key-stage-1-tests
|
|
108
|
+
description: |
|
|
109
|
+
Key dates, sample and test materials, administration, moderation,
|
|
110
|
+
assessing and reporting, statistics, frameworks.
|
|
111
|
+
taxon_with_no_link:
|
|
112
|
+
data:
|
|
113
|
+
items:
|
|
114
|
+
- title: "Taxon without a link"
|
|
115
|
+
description: |
|
|
116
|
+
Early years, key stages 1 to 5, GCSE and AS and A level reforms, tests,
|
|
117
|
+
exams and assessments, PSHE and SMSC.
|
|
118
|
+
related_content:
|
|
119
|
+
- title: "Key stage 1 teacher assessment"
|
|
120
|
+
link: /government/collections/key-stage-1-teacher-assessment
|
|
121
|
+
- title: "Primary assessments: information and resources for 2017"
|
|
122
|
+
link: /government/publications/primary-assessments-information-and-resources-for-2017
|
data/config/locales/en.yml
CHANGED
|
@@ -38,3 +38,10 @@ en:
|
|
|
38
38
|
world_locations: "World locations"
|
|
39
39
|
step_by_step_nav_related:
|
|
40
40
|
part_of: "Part of"
|
|
41
|
+
taxonomy_navigation:
|
|
42
|
+
collections: "Collection"
|
|
43
|
+
policies: "Policy"
|
|
44
|
+
related_content: "Related content"
|
|
45
|
+
statistical_data_sets: "Statistical data set"
|
|
46
|
+
topical_events: "Topical event"
|
|
47
|
+
world_locations: "World locations"
|
|
@@ -4,11 +4,11 @@ require "govuk_publishing_components/presenters/contextual_navigation"
|
|
|
4
4
|
require "govuk_publishing_components/presenters/navigation_type"
|
|
5
5
|
require "govuk_publishing_components/presenters/related_navigation_helper"
|
|
6
6
|
require "govuk_publishing_components/presenters/step_by_step_nav_helper"
|
|
7
|
-
require "govuk_publishing_components/presenters/
|
|
8
|
-
require "govuk_publishing_components/presenters/
|
|
9
|
-
require "govuk_publishing_components/presenters/
|
|
7
|
+
require "govuk_publishing_components/presenters/page_with_step_by_step_navigation"
|
|
8
|
+
require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_parent"
|
|
9
|
+
require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons"
|
|
10
10
|
require "govuk_publishing_components/presenters/services"
|
|
11
|
-
require "govuk_publishing_components/presenters/
|
|
11
|
+
require "govuk_publishing_components/presenters/taxonomy_navigation"
|
|
12
12
|
require "govuk_publishing_components/presenters/rummager_taxonomy_sidebar_links"
|
|
13
13
|
require "govuk_publishing_components/presenters/curated_taxonomy_sidebar_links"
|
|
14
14
|
require "govuk_publishing_components/presenters/content_item"
|
|
@@ -12,11 +12,11 @@ module GovukPublishingComponents
|
|
|
12
12
|
end
|
|
13
13
|
|
|
14
14
|
def taxonomy_sidebar
|
|
15
|
-
@taxonomy_sidebar ||=
|
|
15
|
+
@taxonomy_sidebar ||= TaxonomyNavigation.new(content_item).sidebar
|
|
16
16
|
end
|
|
17
17
|
|
|
18
18
|
def taxon_breadcrumbs
|
|
19
|
-
@taxon_breadcrumbs ||=
|
|
19
|
+
@taxon_breadcrumbs ||= ContentBreadcrumbsBasedOnTaxons.new(content_item).breadcrumbs
|
|
20
20
|
end
|
|
21
21
|
|
|
22
22
|
def breadcrumbs
|
|
@@ -35,7 +35,7 @@ module GovukPublishingComponents
|
|
|
35
35
|
}
|
|
36
36
|
]
|
|
37
37
|
else
|
|
38
|
-
|
|
38
|
+
ContentBreadcrumbsBasedOnParent.new(content_item).breadcrumbs[:breadcrumbs]
|
|
39
39
|
end
|
|
40
40
|
end
|
|
41
41
|
|
|
@@ -45,7 +45,7 @@ module GovukPublishingComponents
|
|
|
45
45
|
end
|
|
46
46
|
|
|
47
47
|
def step_nav_helper
|
|
48
|
-
@step_nav_helper ||=
|
|
48
|
+
@step_nav_helper ||= PageWithStepByStepNavigation.new(content_item, request_path)
|
|
49
49
|
end
|
|
50
50
|
end
|
|
51
51
|
end
|
|
@@ -2,17 +2,13 @@ module GovukPublishingComponents
|
|
|
2
2
|
module Presenters
|
|
3
3
|
# @private
|
|
4
4
|
class NavigationType
|
|
5
|
-
GUIDANCE_SCHEMAS =
|
|
6
|
-
%w{answer contact guide detailed_guide document_collection publication}.freeze
|
|
7
|
-
|
|
8
5
|
def initialize(content_item)
|
|
9
6
|
@content_item = content_item
|
|
10
7
|
end
|
|
11
8
|
|
|
12
9
|
def should_present_taxonomy_navigation?
|
|
13
10
|
!content_is_tagged_to_browse_pages? &&
|
|
14
|
-
content_is_tagged_to_a_live_taxon?
|
|
15
|
-
content_schema_is_guidance?
|
|
11
|
+
content_is_tagged_to_a_live_taxon?
|
|
16
12
|
end
|
|
17
13
|
|
|
18
14
|
private
|
|
@@ -2,7 +2,7 @@ module GovukPublishingComponents
|
|
|
2
2
|
module Presenters
|
|
3
3
|
# @private
|
|
4
4
|
# Only used by the step by step component
|
|
5
|
-
class
|
|
5
|
+
class PageWithStepByStepNavigation
|
|
6
6
|
def initialize(content_store_response, current_path)
|
|
7
7
|
@content_item = content_store_response.to_h
|
|
8
8
|
@current_path = current_path
|
data/lib/govuk_publishing_components/presenters/{taxonomy_sidebar.rb → taxonomy_navigation.rb}
RENAMED
|
@@ -1,20 +1,36 @@
|
|
|
1
1
|
module GovukPublishingComponents
|
|
2
2
|
module Presenters
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
class TaxonomyNavigation
|
|
4
|
+
RELATED_SECTIONS = %w(
|
|
5
|
+
policies
|
|
6
|
+
topical_events
|
|
7
|
+
world_locations
|
|
8
|
+
statistical_data_sets
|
|
9
|
+
).freeze
|
|
10
|
+
|
|
5
11
|
def initialize(content_item)
|
|
6
12
|
@content_item = ContentItem.new content_item
|
|
13
|
+
@related_navigation = RelatedNavigationHelper.new(content_item)
|
|
7
14
|
end
|
|
8
15
|
|
|
9
16
|
def sidebar
|
|
10
17
|
{
|
|
11
18
|
items: related_items,
|
|
12
19
|
collections: collections,
|
|
13
|
-
}
|
|
20
|
+
}.merge(related_navigation_links)
|
|
14
21
|
end
|
|
15
22
|
|
|
16
23
|
private
|
|
17
24
|
|
|
25
|
+
def related_navigation_links
|
|
26
|
+
{}.tap do |hash|
|
|
27
|
+
@related_navigation.related_navigation.each do |section|
|
|
28
|
+
key = section.keys.first
|
|
29
|
+
hash[key.to_sym] = section[key] if RELATED_SECTIONS.include?(key)
|
|
30
|
+
end
|
|
31
|
+
end
|
|
32
|
+
end
|
|
33
|
+
|
|
18
34
|
def there_are_related_item_overrides?
|
|
19
35
|
# TODO: We should check for any external links when we have "new"
|
|
20
36
|
# external links being curated in Content Tagger
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: govuk_publishing_components
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.
|
|
4
|
+
version: 6.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- GOV.UK Dev
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-03-
|
|
11
|
+
date: 2018-03-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: govuk_app_config
|
|
@@ -328,6 +328,7 @@ files:
|
|
|
328
328
|
- app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-header.scss
|
|
329
329
|
- app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-related.scss
|
|
330
330
|
- app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss
|
|
331
|
+
- app/assets/stylesheets/govuk_publishing_components/components/_taxonomy-navigation.scss
|
|
331
332
|
- app/assets/stylesheets/govuk_publishing_components/components/helpers/_clearfix.scss
|
|
332
333
|
- app/assets/stylesheets/govuk_publishing_components/components/helpers/_px-to-em.scss
|
|
333
334
|
- app/assets/stylesheets/govuk_publishing_components/components/helpers/_variables.scss
|
|
@@ -363,6 +364,7 @@ files:
|
|
|
363
364
|
- app/views/govuk_publishing_components/components/_step_by_step_nav.html.erb
|
|
364
365
|
- app/views/govuk_publishing_components/components/_step_by_step_nav_header.html.erb
|
|
365
366
|
- app/views/govuk_publishing_components/components/_step_by_step_nav_related.html.erb
|
|
367
|
+
- app/views/govuk_publishing_components/components/_taxonomy_navigation.html.erb
|
|
366
368
|
- app/views/govuk_publishing_components/components/docs/back_link.yml
|
|
367
369
|
- app/views/govuk_publishing_components/components/docs/contextual_breadcrumbs.yml
|
|
368
370
|
- app/views/govuk_publishing_components/components/docs/contextual_sidebar.yml
|
|
@@ -378,6 +380,7 @@ files:
|
|
|
378
380
|
- app/views/govuk_publishing_components/components/docs/step_by_step_nav.yml
|
|
379
381
|
- app/views/govuk_publishing_components/components/docs/step_by_step_nav_header.yml
|
|
380
382
|
- app/views/govuk_publishing_components/components/docs/step_by_step_nav_related.yml
|
|
383
|
+
- app/views/govuk_publishing_components/components/docs/taxonomy_navigation.yml
|
|
381
384
|
- app/views/layouts/govuk_publishing_components/application.html.erb
|
|
382
385
|
- config/initializers/assets.rb
|
|
383
386
|
- config/locales/cy.yml
|
|
@@ -393,18 +396,18 @@ files:
|
|
|
393
396
|
- lib/govuk_publishing_components/config.rb
|
|
394
397
|
- lib/govuk_publishing_components/engine.rb
|
|
395
398
|
- lib/govuk_publishing_components/minitest/component_guide_test.rb
|
|
396
|
-
- lib/govuk_publishing_components/presenters/
|
|
399
|
+
- lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_parent.rb
|
|
400
|
+
- lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons.rb
|
|
397
401
|
- lib/govuk_publishing_components/presenters/content_item.rb
|
|
398
402
|
- lib/govuk_publishing_components/presenters/contextual_navigation.rb
|
|
399
403
|
- lib/govuk_publishing_components/presenters/curated_taxonomy_sidebar_links.rb
|
|
400
404
|
- lib/govuk_publishing_components/presenters/navigation_type.rb
|
|
405
|
+
- lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb
|
|
401
406
|
- lib/govuk_publishing_components/presenters/related_navigation_helper.rb
|
|
402
407
|
- lib/govuk_publishing_components/presenters/rummager_taxonomy_sidebar_links.rb
|
|
403
408
|
- lib/govuk_publishing_components/presenters/services.rb
|
|
404
409
|
- lib/govuk_publishing_components/presenters/step_by_step_nav_helper.rb
|
|
405
|
-
- lib/govuk_publishing_components/presenters/
|
|
406
|
-
- lib/govuk_publishing_components/presenters/taxon_breadcrumbs.rb
|
|
407
|
-
- lib/govuk_publishing_components/presenters/taxonomy_sidebar.rb
|
|
410
|
+
- lib/govuk_publishing_components/presenters/taxonomy_navigation.rb
|
|
408
411
|
- lib/govuk_publishing_components/version.rb
|
|
409
412
|
- lib/tasks/govuk_publishing_components_tasks.rake
|
|
410
413
|
homepage: https://github.com/alphagov/govuk_publishing_components
|