darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 00:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues raised on pull request

Browse Source 
Includes:
- make 'remove team member' link, on edit member
  permissions page, destructive
- convert missed links on /features pages
- convert missed links on /using-notify/guidance and sub pages
- give links in browse-lists back their size and
  weight (needed for lists of live and trial
  services on Platform Admin)
- give links on Platform Admin inbound numbers
  page back their size and weight
- update links in JS tests
This commit is contained in:
Tom Byers
2020-02-19 13:49:29 +00:00
parent 16c1c34588
commit efa892423a
19 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/components/browse-list.scss
View File

@@ -16,6 +16,10 @@
margin-bottom: $gutter-half;
}
&-link {
@include govuk-font(24, $weight: bold);
}
&-hint {
@include core-19;
margin: 5px 0 10px 0;

2
app/templates/components/page-footer.html
View File

@@ -26,7 +26,7 @@
{% endif %}
{% if delete_link %}
<span class="page-footer-delete-link {% if not button_text %}page-footer-delete-link-without-button{% endif %}">
<a class="govuk-link govuk-link--no-visited-state" href="{{ delete_link }}">{{ delete_link_text }}</a>
<a class="govuk-link govuk-link--destructive" href="{{ delete_link }}">{{ delete_link_text }}</a>
</span>
{% endif %}
{% if secondary_link and secondary_link_text %}

2
app/templates/views/features.html
View File

@@ -27,7 +27,7 @@
<h2 class="heading-medium" id="personalised-messages">Personalised content</h2>
<p>Notify makes it easy to send personalised messages from a single template.</p>
<p>See <a href="{{ url_for('.edit_and_format_messages', _anchor='personalised-content') }}">how to personalise your content</a>.</p>
<p>See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.edit_and_format_messages', _anchor='personalised-content') }}">how to personalise your content</a>.</p>
<h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
<p>To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.</p>

4
app/templates/views/features/emails.html
View File

@@ -24,7 +24,7 @@
<h3 class="heading heading-small" id="branding">Email branding</h3>
<p>Add your organisation’s logo and brand colour to email templates.</p>
<p>See <a href="{{ url_for('.branding_and_customisation', _anchor='email-branding') }}">how to change your email branding</a>.</p>
<p>See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation', _anchor='email-branding') }}">how to change your email branding</a>.</p>
<h3 class="heading heading-small" id="send-files">Send files by email</h3>
<p>Notify offers a safe and reliable way to send files by email.</p>
@@ -41,7 +41,7 @@
<h3 class="heading heading-small" id="reply-to">Add a reply-to address</h3>
<p>Notify lets you choose the email address that users reply to.</p>
<p>Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.</p>
<p>See <a href="{{ url_for('.branding_and_customisation', _anchor='reply-to-address') }}">how to add a reply-to address</a>.</p>
<p>See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation', _anchor='reply-to-address') }}">how to add a reply-to address</a>.</p>
<h2 class="heading heading-medium">Pricing</h2>
<p>It’s free to send emails through Notify.</p>

2
app/templates/views/features/letters.html
View File

@@ -29,7 +29,7 @@
<h3 class="heading-small" id="branding">Branding</h3>
<p>Add your organisation’s logo to your letter templates.</p>
<p>See <a href="{{ url_for('.branding_and_customisation', _anchor='letter-branding') }}">how to change your letter branding</a>.</p>
<p>See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation', _anchor='letter-branding') }}">how to change your letter branding</a>.</p>
<h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
<p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>

2
app/templates/views/features/text-messages.html
View File

@@ -28,7 +28,7 @@
<h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
<p>When you send a text message with Notify, the sender name tells people who it's from.</p>
<p>See <a href="{{ url_for('.branding_and_customisation', _anchor='text-message-sender') }}">how to change the text message sender</a>.</p>
<p>See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation', _anchor='text-message-sender') }}">how to change the text message sender</a>.</p>
<h2 class="heading heading-medium">Pricing<h2>
<p>Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.</p>

10
app/templates/views/guidance/branding-and-customisation.html
View File

@@ -12,10 +12,10 @@
<p>This page explains how to:</p>
<ul class="list list-bullet">
<li><a href="#email-branding">change your email branding</a></li>
<li><a href="#reply-to-address">add a reply-to email address</a></li>
<li><a href="#text-message-sender">change the text message sender</a></li>
<li><a href="#letter-branding">change your letter branding</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="#email-branding">change your email branding</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="#reply-to-address">add a reply-to email address</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="#text-message-sender">change the text message sender</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="#letter-branding">change your letter branding</a></li>
</ul>
<h2 class="heading-medium" id="email-branding">Change your email branding</h2>
@@ -31,7 +31,7 @@
<h2 class="heading-medium" id="reply-to-address">Add a reply-to email address</h2>
<p>You can choose the email address that your users reply to. You must add at least one reply-to address for your service before you can <a href="{{ url_for('main.trial_mode_new') }}">request to go live</a>.</p>
<p>You can choose the email address that your users reply to. You must add at least one reply-to address for your service before you can <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.trial_mode_new') }}">request to go live</a>.</p>
<p>To add a reply-to email address:</p>

2
app/templates/views/guidance/create-and-send-messages.html
View File

@@ -9,7 +9,7 @@
<h1 class="heading-large">Send messages</h1>
<p><a href="{{ url_for('main.register') }}">Create an account</a> to see a short tutorial explaining how to create and send messages.</p>
<p><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.register') }}">Create an account</a> to see a short tutorial explaining how to create and send messages.</p>
<h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>

10
app/templates/views/guidance/edit-and-format-messages.html
View File

@@ -11,10 +11,10 @@
<p>This page explains how to:</p>
<ul class="list list-bullet">
<li><a href="#formatting">format your content</a></li>
<li><a href="#links">add links</a></li>
<li><a href="#personalised-content">personalise your content</a></li>
<li><a href="#optional-content">add optional content</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="#formatting">format your content</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="#links">add links</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="#personalised-content">personalise your content</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="#optional-content">add optional content</a></li>
</ul>
<h2 class="heading-medium" id="formatting">Format your content</h2>
@@ -30,7 +30,7 @@
<ul class="list list-bullet">
<li>headings</li>
<li>bullets</li>
<li><a href="https://design-system.service.gov.uk/components/inset-text/">inset text</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://design-system.service.gov.uk/components/inset-text/">inset text</a></li>
<li>horizontal rules</li>
</ul>

14
app/templates/views/guidance/index.html
View File

@@ -15,9 +15,9 @@
<p>It explains how to:</p>
<ul class="list list-bullet">
<li><a href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
<li><a href="{{ url_for('.branding_and_customisation') }}">add branding and customisation</a></li>
<li><a href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation') }}">add branding and customisation</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>
</ul>
<h2 class="heading-medium">More information</h2>
@@ -25,10 +25,10 @@
<p>The GOV.UK Service Manual has advice on:</p>
<ul class="list list-bullet">
<li><a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">planning and writing text messages and emails</a></li>
<li><a href="https://www.gov.uk/service-manual/design/writing-effective-letters">writing effective letters</a></li>
<li><a href="https://www.gov.uk/service-manual/technology/how-to-email-your-users">sending emails from your service domain</a></li>
<li><a href="https://www.gov.uk/service-manual/technology/sending-text-messages-securely">sending text messages securely</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">planning and writing text messages and emails</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/writing-effective-letters">writing effective letters</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/technology/how-to-email-your-users">sending emails from your service domain</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/technology/sending-text-messages-securely">sending text messages securely</a></li>
</ul>
{% endblock %}

4
app/templates/views/guidance/send-files-by-email.html
View File

@@ -8,8 +8,8 @@
<h1 class="heading-large">Send files by email</h1>
<p><a href="{{ url_for('.support') }}">Contact us</a> if you want to send files by email.</p>
<p><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">Contact us</a> if you want to send files by email.</p>
<p>Then follow the instructions to send a file by email in our <a href="{{ url_for('.documentation') }}">API documentation</a>.</p>
<p>Then follow the instructions to send a file by email in our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">API documentation</a>.</p>
{% endblock %}

4
app/templates/views/guidance/upload-a-letter.html
View File

@@ -35,8 +35,8 @@
<p>To help you set up your letter, you can download our:</p>
<ul class="list list-bullet">
<li><a href="{{ url_for('.letter_spec') }}">letter specification document (PDF)</a></li>
<li><a href="https://docs.notifications.service.gov.uk/documentation/images/notify-pdf-letter-word-template-v1.0.docx">print margin checker for Microsoft Word (.docx)</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.letter_spec') }}">letter specification document (PDF)</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://docs.notifications.service.gov.uk/documentation/images/notify-pdf-letter-word-template-v1.0.docx">print margin checker for Microsoft Word (.docx)</a></li>
</ul>

12
app/templates/views/inbound-sms-admin.html
View File

@@ -46,8 +46,8 @@ Inbound Numbers
{% for value in inbound_num_list.data: %}
<tr>
<th style="font-weight:normal;">{{value.number}}</th>
<th style="font-weight:normal;">
<td>{{value.number}}</td>
<td>
{% if value.active %}
Active
@@ -56,10 +56,10 @@ Inbound Numbers
{% else %}
Inactive
{% endif %}
</th>
<th style="font-weight:normal;">
<a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="govuk-link govuk-link--no-visited-state">{{ value.service.name }}</a>
</th>
</td>
<td>
<a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="govuk-link govuk-link--no-visited-state govuk-!-font-size-24 govuk-!-font-weight-bold">{{ value.service.name }}</a>
</td>
</tr>
{% endfor %}
</tbody>

4
tests/javascripts/cookieMessage.test.js
View File

@@ -43,7 +43,7 @@ describe("Cookie message", () => {
<div id="global-cookie-message" class="notify-cookie-banner" data-module="cookie-banner" role="region" aria-label="cookie banner" data-nosnippet="">
<div class="notify-cookie-banner__wrapper govuk-width-container govuk-!-padding-4">
<h2 class="notify-cookie-banner__heading govuk-heading-m">Cookies on GOV.UK Notify</h2>
<p class="notify-cookie-banner__message govuk-body">We use <a class="govuk-link" href="/cookies">small files called cookies</a> to make GOV.UK Notify work.</p>
<p class="notify-cookie-banner__message govuk-body">We use <a class="govuk-link govuk-link--no-visited-state" href="/cookies">small files called cookies</a> to make GOV.UK Notify work.</p>
<div class="notify-cookie-banner__buttons notify-cookie-banner__no-js">
<div class="notify-cookie-banner__button">
<a href="/cookies" class="govuk-button notify-cookie-banner-button--inline" role="button" data-accept-cookies="true">Set cookie preferences</a>
@@ -64,7 +64,7 @@ describe("Cookie message", () => {
</div>
<div class="notify-cookie-banner__confirmation govuk-width-container" tabindex="-1">
<p class="notify-cookie-banner__confirmation-message govuk-body">
You can <a class="govuk-link" href="/cookies">change your cookie settings</a> at any time.
You can <a class="govuk-link govuk-link--no-visited-state" href="/cookies">change your cookie settings</a> at any time.
</p>
<button class="notify-cookie-banner__hide-button" data-hide-cookie-banner="true">Hide</button>
</div>

2
tests/javascripts/cookieSettings.test.js
View File

@@ -34,7 +34,7 @@ describe("Cookie settings", () => {
cookiesPageContent = `
<div class="cookie-settings__confirmation banner banner-with-tick" data-cookie-confirmation="true" role="group" tabindex="-1">
<h2 class="banner-title">Your cookie settings were saved</h2>
<a class="govuk_link cookie-settings__prev-page" href="#" data-module="track-click" data-track-category="cookieSettings" data-track-action="Back to previous page">
<a class="govuk_link govuk_link--no-visited-state cookie-settings__prev-page" href="#" data-module="track-click" data-track-category="cookieSettings" data-track-action="Back to previous page">
Go back to the page you were looking at
</a>
</div>

2
tests/javascripts/liveSearch.test.js
View File

@@ -484,7 +484,7 @@ describe('Live search', () => {
</div>
</div>
<li class="tick-cross-list-edit-link">
<a href="/services/6658542f-0cad-491f-bec8-ab8457700ead/cancel-invited-user/21d6d54f-51e2-44ba-b48f-545d678c4c64">Cancel invitation</a>
<a class="govuk-link govuk-link--no-visited-state" href="/services/6658542f-0cad-491f-bec8-ab8457700ead/cancel-invited-user/21d6d54f-51e2-44ba-b48f-545d678c4c64">Cancel invitation</a>
</li>
</ul>
</div>`);

2
tests/javascripts/stick-to-window-when-scrolling.test.js
View File

@@ -697,7 +697,7 @@ describe("Stick to top/bottom of window when scrolling", () => {
<p>This is a paragraph with a horizontal line underneath.</p>
<hr>
<p>This is a paragraph with a horizontal line above.</p>
<p>This paragraph has a link in it: <a href="https://www.gov.uk">https://www.gov.uk</a>.</p>
<p>This paragraph has a link in it: <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk">https://www.gov.uk</a>.</p>
</div>
<div class="page-footer js-stick-at-bottom-when-scrolling">
<form method="post" action="">

2
tests/javascripts/support/helpers/html.js
View File

@@ -45,7 +45,7 @@ function templatesAndFoldersCheckboxes (hierarchy) {
<label></label>
</div>
<h2 class="message-name">
<a href="/services/6658542f-0cad-491f-bec8-ab8457700ead/templates/all/folders/3d057d9a-51fc-45ea-8b63-0003206350a6" class="template-list-${node.type === 'folder' ? 'folder' : 'template'}">
<a href="/services/6658542f-0cad-491f-bec8-ab8457700ead/templates/all/folders/3d057d9a-51fc-45ea-8b63-0003206350a6" class="govuk-link govuk-link--no-visited-state template-list-${node.type === 'folder' ? 'folder' : 'template'}">
<span class="live-search-relevant">${node.label}</span>
</a>
</h2>

6
tests/javascripts/updateContent.test.js
View File

@@ -55,7 +55,7 @@ describe('Update content', () => {
</div>
</li>
<li aria-selected="false" role="tab">
<a href="/services/6658542f-0cad-491f-bec8-ab8457700ead/notifications/email?status=sending">
<a class="govuk-link govuk-link--no-visited-state" href="/services/6658542f-0cad-491f-bec8-ab8457700ead/notifications/email?status=sending">
<div class="big-number-smaller">
<div class="big-number-number">0</div>
</div>
@@ -63,7 +63,7 @@ describe('Update content', () => {
</a>
</li>
<li aria-selected="false" role="tab">
<a href="/services/6658542f-0cad-491f-bec8-ab8457700ead/notifications/email?status=delivered">
<a class="govuk-link govuk-link--no-visited-state" href="/services/6658542f-0cad-491f-bec8-ab8457700ead/notifications/email?status=delivered">
<div class="big-number-smaller">
<div class="big-number-number">0</div>
</div>
@@ -71,7 +71,7 @@ describe('Update content', () => {
</a>
</li>
<li aria-selected="false" role="tab">
<a href="/services/6658542f-0cad-491f-bec8-ab8457700ead/notifications/email?status=failed">
<a class="govuk-link govuk-link--no-visited-state" href="/services/6658542f-0cad-491f-bec8-ab8457700ead/notifications/email?status=failed">
<div class="big-number-smaller">
<div class="big-number-number">0</div>
</div>