govuk_publishing_components 13.5.2 → 13.5.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: db548793e2560002edb6bc2ac4fc0cf0fbcb48342d76c008de00f7b4e3519b4e
4
- data.tar.gz: 7ff2b9a1602ed29bc5badfc740ec73cc615d0659c38d5441595d0b78b0a5ee68
3
+ metadata.gz: eb6f0a6a88e800116e375c194590701993f18afb31af15c9f618b5c262d7cd9e
4
+ data.tar.gz: fdf68a7b9d3242654437d6c720522f1bdb81ede1986067fb3b005e925e97228d
5
5
  SHA512:
6
- metadata.gz: 2f0a65ebf42f6cbbe6cf61b1e0be7b51964d4d6ab0219b2fae6a2b30f4f1d0cf8995722afbdb5098e0ca0b7f38a5fca9648a8592dba73850e44cda849f1105f5
7
- data.tar.gz: 3fd2cc7380e755078aa4da8fa86a0af6cc9bd83144944f0cb1d154e4e363491ecb1278a5543d3c2f8abaedce4f3ddc8997d75f96bdaf77356eebea72cde9933a
6
+ metadata.gz: f518f82c42467d896db37a6f8fa4598859eaf31ac46f8a1d53f10e46882e489956f04295b14b0d7152c7e33ae423f2fbcb771146febcd91f384917604c898d8f
7
+ data.tar.gz: 18e35556379c6b172aab0941d0f3fea45476366bf79ca1be0a32e91315d265060958d7787383f51e982ea610df9e6bf0b5c0b129e811dd68beac18b81c4dba0e
@@ -1,76 +1,6 @@
1
- .gem-c-error-summary {
2
- color: $gem-text-colour;
3
- padding: $gem-spacing-scale-3;
1
+ @import "govuk-frontend/components/error-summary/error-summary";
4
2
 
5
- border: $gem-border-width-mobile solid $gem-error-colour;
6
-
7
- @include media(tablet) {
8
-
9
- padding: $gem-spacing-scale-4;
10
-
11
- border: $gem-border-width-tablet solid $gem-error-colour;
12
- }
13
- }
14
-
15
- .gem-c-error-summary:focus {
16
- outline: $gem-focus-width solid $gem-focus-colour;
17
- }
18
-
19
- .gem-c-error-summary__title {
20
- margin-top: 0;
21
- margin-bottom: $gem-spacing-scale-3;
22
-
23
- @include media(tablet) {
24
- margin-bottom: $gem-spacing-scale-4;
25
- }
26
-
27
- @include bold-24;
28
- }
29
-
30
- .gem-c-error-summary__body {
31
- @include core-19;
32
- }
33
-
34
- .gem-c-error-summary__text {
35
- margin-top: 0;
36
- margin-bottom: $gem-spacing-scale-3;
37
-
38
- @include media(tablet) {
39
- margin-bottom: $gem-spacing-scale-4;
40
- }
41
- }
42
-
43
- .gem-c-error-summary__list {
44
- margin-top: 0;
45
- margin-bottom: 0;
46
- padding: 0;
47
- list-style: none;
48
- }
49
-
50
- .gem-c-error-summary__list__item {
51
- color: $gem-error-colour;
52
- font-weight: bold;
53
- margin-bottom: $gem-spacing-scale-2;
54
-
55
- &:last-child {
56
- margin-bottom: 0;
57
- }
58
- }
59
-
60
- .gem-c-error-summary__link {
61
- @include govuk-link-common;
62
- &:link,
63
- &:link:focus,
64
- &:focus,
65
- &:visited,
66
- &:hover,
67
- &:active {
68
- color: $gem-error-colour;
69
- font-weight: bold;
70
- text-decoration: underline;
71
- }
72
-
73
- &:hover {
74
- color: darken($gem-error-colour, 10%);
75
- }
3
+ .gem-c-error-summary__list-item {
4
+ @include govuk-font($size: 19, $weight: bold);
5
+ color: $govuk-error-colour;
76
6
  }
@@ -10,7 +10,7 @@
10
10
  end
11
11
  %>
12
12
  <%= tag.div(
13
- class: "gem-c-error-summary",
13
+ class: "gem-c-error-summary govuk-error-summary",
14
14
  data: { module: "error-summary" }.merge(data_attributes),
15
15
  aria: { labelledby: title_id },
16
16
  role: "alert",
@@ -18,23 +18,20 @@
18
18
  id: id,
19
19
  ) do %>
20
20
  <% if title %>
21
- <h2 class="gem-c-error-summary__title" id="<%= title_id %>">
21
+ <h2 class="govuk-error-summary__title" id="<%= title_id %>">
22
22
  <%= title %>
23
23
  </h2>
24
24
  <% end %>
25
- <div class="gem-c-error-summary__body">
25
+ <div class="govuk-error-summary__body">
26
26
  <% if description %>
27
- <p class="gem-c-error-summary__text"><%= description %></p>
27
+ <p><%= description %></p>
28
28
  <% end %>
29
29
  <% if items.present? %>
30
- <ul class="gem-c-error-summary__list">
30
+ <ul class="govuk-list govuk-error-summary__list">
31
31
  <% items.each_with_index do |item, index| %>
32
- <li class="gem-c-error-summary__list__item">
32
+ <li class="gem-c-error-summary__list-item">
33
33
  <% if item[:href] %>
34
- <a
35
- class="js-error-summary__link gem-c-error-summary__link"
36
- href="<%= item[:href] %>"
37
- ><%= item[:text] %></a>
34
+ <%= link_to item[:text], item[:href] %>
38
35
  <% else %>
39
36
  <%= item[:text] %>
40
37
  <% end %>
@@ -1,170 +1,18 @@
1
1
  <%
2
- contact_govuk_path = "/contact/govuk"
3
2
  margin_top ||= 1
4
3
  margin_top_class = "gem-c-feedback--top-margin" if margin_top == 1
5
- email_regex = /[^\s=\/?&]+(?:@|%40)[^\s=\/?&]+/
6
- stripped_path = request.original_url.gsub(email_regex, '[email]')
7
- stripped_url = request.fullpath.gsub(email_regex, '[email]')
8
- user_agent = request.user_agent
9
4
 
10
- def utf_encode element
5
+ def utf_encode(element)
11
6
  element.is_a?(String) ? element.encode : element
12
7
  end
8
+
9
+ email_regex = /[^\s=\/?&]+(?:@|%40)[^\s=\/?&]+/
10
+ path_without_pii = utf_encode(request.original_url.gsub(email_regex, '[email]'))
11
+ url_without_pii = utf_encode(request.fullpath.gsub(email_regex, '[email]'))
13
12
  %>
14
13
 
15
14
  <div class="gem-c-feedback <%= margin_top_class %>" data-module="feedback">
16
- <div class="gem-c-feedback__prompt gem-c-feedback__js-show js-prompt" tabindex="-1">
17
- <div class="gem-c-feedback__js-prompt-questions js-prompt-questions">
18
- <h2 class="gem-c-feedback__prompt-question">Is this page useful?</h2>
19
-
20
- <%= link_to contact_govuk_path, {
21
- class: 'gem-c-feedback__prompt-link',
22
- data: {
23
- 'track-category' => 'yesNoFeedbackForm',
24
- 'track-action' => 'ffMaybeClick'
25
- },
26
- 'aria-expanded': false,
27
- role: 'button',
28
- style: 'display: none;',
29
- hidden: 'hidden',
30
- 'aria-hidden': 'true',
31
- } do %>
32
- Maybe
33
- <% end %>
34
-
35
- <%= link_to contact_govuk_path, {
36
- class: 'gem-c-feedback__prompt-link gem-c-feedback__prompt-link--useful js-page-is-useful',
37
- data: {
38
- 'track-category' => 'yesNoFeedbackForm',
39
- 'track-action' => 'ffYesClick'
40
- },
41
- 'aria-expanded': false,
42
- role: 'button',
43
- } do %>
44
- Yes <span class="visually-hidden">this page is useful</span>
45
- <% end %>
46
-
47
- <%= link_to contact_govuk_path, {
48
- class: 'gem-c-feedback__prompt-link js-toggle-form js-page-is-not-useful',
49
- data: {
50
- 'track-category' => 'yesNoFeedbackForm',
51
- 'track-action' => 'ffNoClick'
52
- },
53
- 'aria-controls': 'page-is-not-useful',
54
- 'aria-expanded': false,
55
- role: 'button',
56
- } do %>
57
- No <span class="visually-hidden">this page is not useful</span>
58
- <% end %>
59
-
60
- <%= link_to contact_govuk_path, {
61
- class: 'gem-c-feedback__prompt-link gem-c-feedback__prompt-link--wrong js-toggle-form js-something-is-wrong',
62
- data: {
63
- 'track-category' => 'Onsite Feedback',
64
- 'track-action' => 'GOV.UK Open Form'
65
- },
66
- 'aria-controls': 'something-is-wrong',
67
- 'aria-expanded': false,
68
- role: 'button',
69
- } do %>
70
- Is there anything wrong with this page?
71
- <% end %>
72
- </div>
73
-
74
- <div class="gem-c-feedback__prompt-success js-prompt-success js-hidden" tabindex="-1">
75
- Thank you for your feedback
76
- </div>
77
- </div>
78
-
79
- <form action="/contact/govuk/problem_reports"
80
- id="something-is-wrong"
81
- class="gem-c-feedback__form js-feedback-form js-hidden"
82
- data-track-category="Onsite Feedback"
83
- data-track-action="GOV.UK Send Form"
84
- method="post">
85
- <a href="#"
86
- class="gem-c-feedback__close gem-c-feedback__js-show js-close-form"
87
- data-track-category="Onsite Feedback"
88
- data-track-action="GOV.UK Close Form"
89
- aria-controls="something-is-wrong"
90
- aria-expanded="true"
91
- role="button">Close</a>
92
-
93
- <div class="gem-c-feedback__grid-row">
94
- <div class="gem-c-feedback__column-two-thirds">
95
- <div class="gem-c-feedback__error-summary gem-c-feedback__js-show js-hidden js-errors" tabindex="-1"></div>
96
-
97
- <input type="hidden" name="url" value="<%= utf_encode(stripped_path) -%>">
98
- <input type="hidden" name="user_agent" value="<%= utf_encode(user_agent) -%>">
99
-
100
- <h3 class="gem-c-feedback__form-heading">Help us improve GOV.UK</h3>
101
- <p id="feedback_explanation" class="gem-c-feedback__form-paragraph">Don’t include personal or financial information like your National Insurance number or credit card details.</p>
102
-
103
- <%= render "govuk_publishing_components/components/input", {
104
- label: {
105
- text: "What were you doing?"
106
- },
107
- name: "what_doing",
108
- describedby: "feedback_explanation"
109
- } %>
110
-
111
- <%= render "govuk_publishing_components/components/input", {
112
- label: {
113
- text: "What went wrong?"
114
- },
115
- name: "what_wrong"
116
- } %>
117
-
118
- <%= render "govuk_publishing_components/components/button", {
119
- text: "Send"
120
- } %>
121
- </div>
122
- </div>
123
- </form>
124
-
125
- <form action="/contact/govuk/email-survey-signup"
126
- id="page-is-not-useful"
127
- class="gem-c-feedback__form gem-c-feedback__form--email gem-c-feedback__js-show js-feedback-form js-hidden"
128
- data-track-category="yesNoFeedbackForm"
129
- data-track-action="Send Form"
130
- method="post">
131
- <a href="#"
132
- class="gem-c-feedback__close js-close-form"
133
- data-track-category="yesNoFeedbackForm"
134
- data-track-action="ffFormClose"
135
- aria-controls="page-is-not-useful"
136
- aria-expanded="true"
137
- role="button">Close</a>
138
-
139
- <div class="gem-c-feedback__grid-row">
140
- <div class="gem-c-feedback__column-two-thirds">
141
- <div class="gem-c-feedback__error-summary js-hidden js-errors" tabindex="-1"></div>
142
-
143
- <input type="hidden" name="url" value="<%= utf_encode(stripped_path) -%>">
144
- <input type="hidden" name="user_agent" value="<%= utf_encode(user_agent) -%>">
145
-
146
- <input name="email_survey_signup[survey_id]" type="hidden" value="footer_satisfaction_survey">
147
- <input name="email_survey_signup[survey_source]" type="hidden" value="<%= utf_encode(stripped_path) -%>">
148
- <input name="email_survey_signup[ga_client_id]" type="hidden" value="1627485790.1515403243">
149
-
150
- <h3 class="gem-c-feedback__form-heading">Help us improve GOV.UK</h3>
151
- <p id="survey_explanation" class="gem-c-feedback__form-paragraph">To help us improve GOV.UK, we’d like to know more about your visit today. We’ll send you a link to a feedback form. It will take only 2 minutes to fill in. Don’t worry we won’t send you spam or share your email address with anyone.</p>
152
-
153
- <%= render "govuk_publishing_components/components/input", {
154
- label: {
155
- text: "Email address"
156
- },
157
- name: "email_survey_signup[email_address]",
158
- type: "email",
159
- describedby: "survey_explanation"
160
- } %>
161
-
162
- <%= render "govuk_publishing_components/components/button", {
163
- text: "Send me the survey"
164
- } %>
165
- <a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=<%= utf_encode(stripped_url) -%>&amp;gcl=1627485790.1515403243" class="gem-c-feedback__email-link govuk-link" id="take-survey" target="_blank" rel="noopener noreferrer">Don’t have an email address?</a>
166
- </div>
167
- </div>
168
- </form>
169
-
15
+ <%= render "govuk_publishing_components/components/feedback/yes_no_banner" %>
16
+ <%= render "govuk_publishing_components/components/feedback/problem_form", path_without_pii: path_without_pii %>
17
+ <%= render "govuk_publishing_components/components/feedback/survey_signup_form", path_without_pii: path_without_pii, url_without_pii: url_without_pii %>
170
18
  </div>
@@ -0,0 +1,44 @@
1
+ <form action="/contact/govuk/problem_reports"
2
+ id="something-is-wrong"
3
+ class="gem-c-feedback__form js-feedback-form js-hidden"
4
+ data-track-category="Onsite Feedback"
5
+ data-track-action="GOV.UK Send Form"
6
+ method="post">
7
+ <a href="#"
8
+ class="gem-c-feedback__close gem-c-feedback__js-show js-close-form"
9
+ data-track-category="Onsite Feedback"
10
+ data-track-action="GOV.UK Close Form"
11
+ aria-controls="something-is-wrong"
12
+ aria-expanded="true"
13
+ role="button">Close</a>
14
+
15
+ <div class="gem-c-feedback__grid-row">
16
+ <div class="gem-c-feedback__column-two-thirds">
17
+ <div class="gem-c-feedback__error-summary gem-c-feedback__js-show js-hidden js-errors" tabindex="-1"></div>
18
+
19
+ <input type="hidden" name="url" value="<%= path_without_pii %>">
20
+
21
+ <h3 class="gem-c-feedback__form-heading">Help us improve GOV.UK</h3>
22
+ <p id="feedback_explanation" class="gem-c-feedback__form-paragraph">Don’t include personal or financial information like your National Insurance number or credit card details.</p>
23
+
24
+ <%= render "govuk_publishing_components/components/input", {
25
+ label: {
26
+ text: "What were you doing?"
27
+ },
28
+ name: "what_doing",
29
+ describedby: "feedback_explanation"
30
+ } %>
31
+
32
+ <%= render "govuk_publishing_components/components/input", {
33
+ label: {
34
+ text: "What went wrong?"
35
+ },
36
+ name: "what_wrong"
37
+ } %>
38
+
39
+ <%= render "govuk_publishing_components/components/button", {
40
+ text: "Send"
41
+ } %>
42
+ </div>
43
+ </div>
44
+ </form>
@@ -0,0 +1,41 @@
1
+ <form action="/contact/govuk/email-survey-signup"
2
+ id="page-is-not-useful"
3
+ class="gem-c-feedback__form gem-c-feedback__form--email gem-c-feedback__js-show js-feedback-form js-hidden"
4
+ data-track-category="yesNoFeedbackForm"
5
+ data-track-action="Send Form"
6
+ method="post">
7
+ <a href="#"
8
+ class="gem-c-feedback__close js-close-form"
9
+ data-track-category="yesNoFeedbackForm"
10
+ data-track-action="ffFormClose"
11
+ aria-controls="page-is-not-useful"
12
+ aria-expanded="true"
13
+ role="button">Close</a>
14
+
15
+ <div class="gem-c-feedback__grid-row">
16
+ <div class="gem-c-feedback__column-two-thirds">
17
+ <div class="gem-c-feedback__error-summary js-hidden js-errors" tabindex="-1"></div>
18
+
19
+ <input name="email_survey_signup[survey_id]" type="hidden" value="footer_satisfaction_survey">
20
+ <input name="email_survey_signup[survey_source]" type="hidden" value="<%= path_without_pii %>">
21
+ <input name="email_survey_signup[ga_client_id]" type="hidden" value="1627485790.1515403243">
22
+
23
+ <h3 class="gem-c-feedback__form-heading">Help us improve GOV.UK</h3>
24
+ <p id="survey_explanation" class="gem-c-feedback__form-paragraph">To help us improve GOV.UK, we’d like to know more about your visit today. We’ll send you a link to a feedback form. It will take only 2 minutes to fill in. Don’t worry we won’t send you spam or share your email address with anyone.</p>
25
+
26
+ <%= render "govuk_publishing_components/components/input", {
27
+ label: {
28
+ text: "Email address"
29
+ },
30
+ name: "email_survey_signup[email_address]",
31
+ type: "email",
32
+ describedby: "survey_explanation"
33
+ } %>
34
+
35
+ <%= render "govuk_publishing_components/components/button", {
36
+ text: "Send me the survey"
37
+ } %>
38
+ <a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=<%= url_without_pii %>&amp;gcl=1627485790.1515403243" class="gem-c-feedback__email-link govuk-link" id="take-survey" target="_blank" rel="noopener noreferrer">Don’t have an email address?</a>
39
+ </div>
40
+ </div>
41
+ </form>
@@ -0,0 +1,66 @@
1
+ <%
2
+ contact_govuk_path = "/contact/govuk"
3
+ %>
4
+
5
+ <div class="gem-c-feedback__prompt gem-c-feedback__js-show js-prompt" tabindex="-1">
6
+ <div class="gem-c-feedback__js-prompt-questions js-prompt-questions">
7
+ <h2 class="gem-c-feedback__prompt-question">Is this page useful?</h2>
8
+
9
+ <%= link_to contact_govuk_path, {
10
+ class: 'gem-c-feedback__prompt-link',
11
+ data: {
12
+ 'track-category' => 'yesNoFeedbackForm',
13
+ 'track-action' => 'ffMaybeClick'
14
+ },
15
+ 'aria-expanded': false,
16
+ role: 'button',
17
+ style: 'display: none;',
18
+ hidden: 'hidden',
19
+ 'aria-hidden': 'true',
20
+ } do %>
21
+ Maybe
22
+ <% end %>
23
+
24
+ <%= link_to contact_govuk_path, {
25
+ class: 'gem-c-feedback__prompt-link gem-c-feedback__prompt-link--useful js-page-is-useful',
26
+ data: {
27
+ 'track-category' => 'yesNoFeedbackForm',
28
+ 'track-action' => 'ffYesClick'
29
+ },
30
+ 'aria-expanded': false,
31
+ role: 'button',
32
+ } do %>
33
+ Yes <span class="visually-hidden">this page is useful</span>
34
+ <% end %>
35
+
36
+ <%= link_to contact_govuk_path, {
37
+ class: 'gem-c-feedback__prompt-link js-toggle-form js-page-is-not-useful',
38
+ data: {
39
+ 'track-category' => 'yesNoFeedbackForm',
40
+ 'track-action' => 'ffNoClick'
41
+ },
42
+ 'aria-controls': 'page-is-not-useful',
43
+ 'aria-expanded': false,
44
+ role: 'button',
45
+ } do %>
46
+ No <span class="visually-hidden">this page is not useful</span>
47
+ <% end %>
48
+
49
+ <%= link_to contact_govuk_path, {
50
+ class: 'gem-c-feedback__prompt-link gem-c-feedback__prompt-link--wrong js-toggle-form js-something-is-wrong',
51
+ data: {
52
+ 'track-category' => 'Onsite Feedback',
53
+ 'track-action' => 'GOV.UK Open Form'
54
+ },
55
+ 'aria-controls': 'something-is-wrong',
56
+ 'aria-expanded': false,
57
+ role: 'button',
58
+ } do %>
59
+ Is there anything wrong with this page?
60
+ <% end %>
61
+ </div>
62
+
63
+ <div class="gem-c-feedback__prompt-success js-prompt-success js-hidden" tabindex="-1">
64
+ Thank you for your feedback
65
+ </div>
66
+ </div>
@@ -1,3 +1,3 @@
1
1
  module GovukPublishingComponents
2
- VERSION = '13.5.2'.freeze
2
+ VERSION = '13.5.3'.freeze
3
3
  end
@@ -110,7 +110,7 @@
110
110
  "directories": {},
111
111
  "dist": {
112
112
  "shasum": "01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c",
113
- "tarball": "http://registry.npmjs.org/jquery/-/jquery-1.12.4.tgz"
113
+ "tarball": "https://registry.npmjs.org/jquery/-/jquery-1.12.4.tgz"
114
114
  },
115
115
  "gitHead": "5e89585e0121e72ff47de177c5ef604f3089a53d",
116
116
  "homepage": "http://jquery.com",
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: 13.5.2
4
+ version: 13.5.3
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: 2019-01-03 00:00:00.000000000 Z
11
+ date: 2019-01-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govspeak
@@ -559,6 +559,9 @@ files:
559
559
  - app/views/govuk_publishing_components/components/docs/title.yml
560
560
  - app/views/govuk_publishing_components/components/docs/translation-nav.yml
561
561
  - app/views/govuk_publishing_components/components/docs/warning_text.yml
562
+ - app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb
563
+ - app/views/govuk_publishing_components/components/feedback/_survey_signup_form.html.erb
564
+ - app/views/govuk_publishing_components/components/feedback/_yes_no_banner.html.erb
562
565
  - app/views/govuk_publishing_components/components/metadata/_sentence.html.erb
563
566
  - app/views/govuk_publishing_components/components/related_navigation/_section.html.erb
564
567
  - app/views/layouts/govuk_publishing_components/application.html.erb