Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Find and update all non closing <p> #1096

Merged
merged 3 commits into from
Mar 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- Fix context links within `content/how-to-write-good-questions-for-forms`
- Update all context links within `app/views/content`
- Update all context links within `app/views/design-system`
- Find and replace all non-closing `<p>` tags - [Issue 1092](https://github.com/nhsuk/nhsuk-service-manual/issues/1092)


## 3.14.2 - 18 March 2021
Expand Down
2 changes: 1 addition & 1 deletion app/views/accessibility/partials/set-language.njk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</summary>
<div class="nhsuk-details__text">
<p>In the HTML element, set the language for the whole page to English:</p>
<pre class="rich-text"><code>&lt;html lang="en"&gt;</code></pre> or whatever language the page is in.<p></p>
<pre class="rich-text"><code>&lt;html lang="en"&gt;</code></pre> or whatever language the page is in.</p>
<p>If there are changes of language within the page, mark these up as well:</p>
<pre class="rich-text"><code>&lt;p&gt;Make sure you are treated by a state healthcare provider in France (&lt;span lang="fr"&gt;conventionné&lt;/span&gt;).&lt;/p&gt;</code></pre>
<p>You can apply the lang attribute to any container.</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/accessibility/partials/use-aria-patterns.njk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h2 id="use-aria-patterns">Use ARIA patterns</h2>
<p class="nhsuk-body-s">For: <a href="/accessibility/development">Development</a>, <a href="/accessibility/testing">Testing</a></p>
<p>ARIA (Accessibility Rich Internet Applications) adds extra information that lets people who use assistive technologies know what's going on. If a component needs more description than HTML provides, you need to mark it up with an ARIA pattern. </p>
<p>ARIA (Accessibility Rich Internet Applications) adds extra information that lets people who use assistive technologies know what's going on. If a component needs more description than HTML provides, you need to mark it up with an ARIA pattern.</p>
<p>We use simple examples of ARIA in some of the service manual components, such as <a href="/design-system/components/details">details</a>, <a href="/design-system/components/breadcrumbs">breadcrumbs</a> and <a href="/design-system/components/error-message">error messages</a>.</p>

<details class="nhsuk-details">
Expand Down
14 changes: 7 additions & 7 deletions app/views/content/a-to-z-of-nhs-health-writing.njk
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<p>One word without a hyphen.</p>
<h3 id="anus">anus</h3>
<p>We prefer "<a href="#bottom">bottom</a>" (as in "bleeding from your bottom") to "anus" or "<a href="#rectum">rectum</a>".</p>
<p>You can add "anus" in brackets after "bottom". For example, in "enlarged blood vessels found inside or around the bottom (anus)".<p>
<p>You can add "anus" in brackets after "bottom". For example, in "enlarged blood vessels found inside or around the bottom (anus)".</p>
<p>Or you can use "anus" on its own when you need to be more precise, for example when you're talking about anal cancer.</p>
<p>User testing showed that people understand "bottom" better than "anus". They do search for "anus" in Google, however.</p>
<h3 id="apply">apply</h3>
Expand Down Expand Up @@ -195,7 +195,7 @@
<h3 id="bum">bum</h3>
<p>We prefer "<a href="#bottom">bottom</a>" (in phrases like "bleeding from your bottom").</p>
<h3 id="burp">burp</h3>
<p> We use "burp" and "burping". We also use "<a href="#wind">wind</a>".</p>
<p>We use "burp" and "burping". We also use "<a href="#wind">wind</a>".</p>
<a class="nhsuk-back-to-top__link" href="#nhsuk-a-z-list">
<svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
<path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
Expand All @@ -208,7 +208,7 @@
<h3 id="caesarean">caesarean</h3>
<p>Lower case. </p>
<h3 id="calories-(kcal)">calories (kcal)</h3>
<p>See <a href="/content/numbers-measurements-dates-time#calories">calories on our Numbers, measurements, dates and time page</a>.<p>
<p>See <a href="/content/numbers-measurements-dates-time#calories">calories on our Numbers, measurements, dates and time page</a>.</p>
<h3 id="can't-or-cannot">can't or cannot</h3>
<p>We use "cannot" instead of "can't".</p>
<p>Read why in the <a href="/content/formatting-and-punctuation#contractions">contractions section</a>.</p>
Expand Down Expand Up @@ -263,7 +263,7 @@
<h3 id="dates">dates</h3>
<p>See our guidance on <a href="/content/numbers-measurements-dates-time#dates">dates on the Numbers, measurements, dates and time page</a>.</p>
<h3 id="Deaf-people">Deaf people</h3>
<p>If you're creating content for or about people who are Deaf and use British Sign Language to communicate, bear in mind that their needs will be different from those of people who have a hearing loss or tinnitus.<p>
<p>If you're creating content for or about people who are Deaf and use British Sign Language to communicate, bear in mind that their needs will be different from those of people who have a hearing loss or tinnitus.</p>
<p>We use a capital D when we're talking to or about people who are Deaf and use British Sign Language to communicate because many Deaf people prefer it.</p>
<p>We recognise that this doesn't apply to everyone who comes to the NHS for information about deafness and so, as always, we check with the people we're creating content for how they want to be described.</p>
<h3 id="deafness">deafness</h3>
Expand Down Expand Up @@ -312,7 +312,7 @@
<h3 id="don't-or-do-not">don't or do not</h3>
<p>We use "do not" instead of "don't".</p>
<p>Read why in the <a href="/content/formatting-and-punctuation#contractions">contractions section</a>.</p>
<p>We use "Don't" in headings for <a href="/design-system/components/do-and-dont-lists">Do and Don't lists</a>. But we use "do not" for the commands in the list.<p>
<p>We use "Don't" in headings for <a href="/design-system/components/do-and-dont-lists">Do and Don't lists</a>. But we use "do not" for the commands in the list.</p>
<h3 id="dosage">dosage</h3>
<p>See <a href="/content/numbers-measurements-dates-time#dosage">dosage on our Numbers, measurements, dates and time page</a>.</p>
<h3 id="drowsy">drowsy</h3>
Expand Down Expand Up @@ -829,7 +829,7 @@
<p>We don’t use the terms "sexually transmitted disease" or "STD".</p>
<p>Also see "<a href="#sexual-health-clinic">sexual health clinic</a>".</p>
<h3 id="stomach">stomach</h3>
<p>We use "stomach" for the internal organ and in some common phrases like "stomach ache" and "stomach bug".<p>
<p>We use "stomach" for the internal organ and in some common phrases like "stomach ache" and "stomach bug".</p>
<p>We sometimes use "<a href="#tummy">tummy</a>" for short, for example in "tummy bug".</p>
<p>Also see "<a href="#abdomen-and-abdominal">abdomen</a>".</p>
<h3 id="stool">stool</h3>
Expand Down Expand Up @@ -992,6 +992,6 @@
</div>
</div>



{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<h2 id="understand-why-you're-asking-each-question">Understand why you're asking each question</h2>
<p>Make a list of all the information you need from your users now for you to deliver the service.</p>
<p> Having a list forces you to question why you're asking users for each item of information. It also helps you challenge unnecessary questions. (This list is sometimes called a "question protocol".)</p>
<p>Having a list forces you to question why you're asking users for each item of information. It also helps you challenge unnecessary questions. (This list is sometimes called a "question protocol".)</p>
<p>Work out what <a href="#use-information-your-organisation-already-has">information your organisation already has (or can access)</a> and where you have information gaps. Ask the questions that let you fill the gaps.</p>

<h2>Only ask for information you definitely need</h2>
Expand Down Expand Up @@ -120,7 +120,7 @@
<li><a href="https://www.gov.uk/service-manual/design/collecting-personal-information-from-users">Collecting personal information from users</a> (GOV.UK)</li>
</ul>



{% endblock %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<li>a short question, and <a href="/content/how-to-write-good-questions-for-forms/get-the-questions-into-order#begin-prototyping-with-1-thing-per-page">1 thing per page</a>, like "What's your name?"</li>
</ul>
<p>But, if you want people to enter information, action statements work well. Be specific about what you want them to do.</p>
<p> For example, we say "Enter the details your GP surgery gave you", not "What are your patient registration details?". This makes it clear what we want people to do, in this case to "enter the details".</p>
<p>For example, we say "Enter the details your GP surgery gave you", not "What are your patient registration details?". This makes it clear what we want people to do, in this case to "enter the details".</p>

<h2>Use clear language that users understand</h2>
<p>Use familiar words in familiar ways. Listen to your users to get an idea of the language they use: for example, (high) "blood pressure", not "hypertension". Find out how they describe the information you're asking them for.</p>
Expand Down Expand Up @@ -159,7 +159,7 @@
</ul>
<p>Read more about how people react to questions and produce an answer in "The Psychology of Survey Response" by Tourangeau, Rips and Rasinki (2000).</p>



{% endblock %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</div>

<h3 id="how-to-add-help-text">How to add help text</h3>
<p>We do not recommend tool tips. They can be hard for users to see and are not accessible.<p>
<p>We do not recommend tool tips. They can be hard for users to see and are not accessible.</p>
<p>Instead you can:</p>
<ul>
<li>add <a href="/design-system/components/hint-text">hint text</a> as a part of other form inputs, such as <a href="/design-system/components/text-input#using-hint-text">text inputs</a>, <a href="/design-system/components/radios#radios-with-hints">radios</a> and <a href="/design-system/components/checkboxes#checkboxes-with-hint-text">checkboxes</a>, for help that's relevant to most of your users</li>
Expand Down Expand Up @@ -154,7 +154,7 @@
<h2>Read more about writing content for transactions</h2>
<p>GOV.UK has some good guidance on <a href="https://www.gov.uk/service-manual/design/govuk-content-transactions">designing how GOV.UK content and transactions work together</a>.</p>



{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion app/views/content/links.njk
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<h2>Avoid linking to PDFs</h2>
<p>Wherever possible, we avoid publishing PDFs or linking to them. Read our <a href="/content/pdfs-and-other-non-html-documents">guidance on PDFs and other non-HTML documents</a>.</p>

<p>We prefer to link to an HTML page containing the PDF. That way, if the PDF is changed or updated, users can still find the latest information.<p>
<p>We prefer to link to an HTML page containing the PDF. That way, if the PDF is changed or updated, users can still find the latest information.</p>

<p>If we need to link to a PDF, we:</p>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion app/views/content/numbers-measurements-dates-time.njk
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@

<h2 id="measurements">Measurements</h2>
<h3 id="calories">Calories</h3>
<p>We use "calorie" when talking about calories in general, for example "calorie information on menus". Where appropriate, we explain that calories are often written as "kcal".<p>
<p>We use "calorie" when talking about calories in general, for example "calorie information on menus". Where appropriate, we explain that calories are often written as "kcal".</p>
<p>We use "kcal" as the unit of measurement. We do not put a space between the number and the measurement.</p>
<div class="app-example app-example--content">
<strong class="nhsuk-tag app-example__heading">Example</strong>
Expand Down
6 changes: 3 additions & 3 deletions app/views/design-system/components/back-link.njk
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
<p>You can include a back link on other pages in a multi-page transaction, if it makes sense to do so.</p>

<h2>When not to use a back link</h2>
<p>Do not use a back link on a content page, like a health information page.<p>
<p>Do not use a back link with <a href='/design-system/components/breadcrumbs'>breadcrumbs</a>.
<p>Do not use a back link on a content page, like a health information page.</p>
<p>Do not use a back link with <a href='/design-system/components/breadcrumbs'>breadcrumbs</a>.</p>

<h2>How to use back links</h2>
<p>Make sure the text used in the link describes the action, for example "Go back". Carry out research with users to find the words that help them the most.<p>
<p>Make sure the text used in the link describes the action, for example "Go back". Carry out research with users to find the words that help them the most.</p>
<p>The link should take users back to the page they were on in the state they last saw it.</p>
<p>Consider where you put the back link. Do not put it close to other links or buttons where it might distract users from what they need to do.</p>
<p>The <a href="https://design-system.service.gov.uk/components/back-link/">GOV.UK Design System</a> says that you should put back links at the top of a page, but a couple of NHS services (<a href="https://111.nhs.uk/">NHS 111 online</a> and <a href="https://your-data-matters.service.nhs.uk">Find out why your NHS data matters</a>) found that it works better at the bottom of the page below the primary action. That's because we don't want to suggest to people who use a screen reader that they leave the page prematurely.</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/design-system/components/breadcrumbs.njk
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<h2>Research</h2>
<p>We tested breadcrumbs on pages with lots of content about conditions or medicines. People noticed them and appreciated the context they gave. People also used them to get back to where they came from or to get back home.</p>
<p> We took out the breadcrumb links when we tested our pages in transactional journeys (in more than 3 labs). We thought that having extra links would distract users and that fewer people would complete the journey. As we expected, we found that users didn’t miss the links because they were focused on the task.</p>
<p>We took out the breadcrumb links when we tested our pages in transactional journeys (in more than 3 labs). We thought that having extra links would distract users and that fewer people would complete the journey. As we expected, we found that users didn’t miss the links because they were focused on the task.</p>
<p><a href="/community-and-contribution">Get in touch to share your research findings</a> about this pattern.</p>

{% endblock %}
2 changes: 1 addition & 1 deletion app/views/design-system/components/care-cards.njk
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<p>Care cards should be specific and include the information the user needs. Do not say: "Contact your GP if this happens." Explain in the care card in what circumstances users should contact their GP.</p>

<h3>Keep signposting simple</h3>
<p>Ideally you should signpost to just 1 service in the header but you can signpost to 2 (the top 2 services). If you need to, add more services at the end of the body of the care card.<p>
<p>Ideally you should signpost to just 1 service in the header but you can signpost to 2 (the top 2 services). If you need to, add more services at the end of the body of the care card.</p>

<h2 id="accessibility">Accessibility</h2>
<p>People with visual disabilities may not be able to recognise care cards by their colour. Use clearly worded headings to help them.</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/design-system/components/date-input.njk
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<p>Date input consists of 3 fields to let users enter a day, month and year.</p>
<p class="rich-text">Group the 3 date fields together in a <code>&lt;fieldset&gt;</code> with a <code>&lt;legend&gt;</code> that describes them. You can see an example at the top of this page. The legend is usually a question, like "What is your date of birth?".</p>
<p class="rich-text">If you are asking just <a href="/content/how-to-write-good-questions-for-forms/get-the-questions-into-order#begin-prototyping-with-1-thing-per-page">1 question per page</a> as we recommend, you can set the contents of the <code>&lt;legend&gt;</code> as the page heading. This is good practice as it means that screen reader users will only hear the contents once.</p>
<p><p>Read more on the GOV.UK Design System about how to <a href="https://design-system.service.gov.uk/patterns/dates/">ask users for dates</a> and <a href="https://design-system.service.gov.uk/get-started/labels-legends-headings/">making labels and legends headings</a>.</p>
<p>Read more on the GOV.UK Design System about how to <a href="https://design-system.service.gov.uk/patterns/dates/">ask users for dates</a> and <a href="https://design-system.service.gov.uk/get-started/labels-legends-headings/">making labels and legends headings</a>.</p>

<h2>Error messages</h2>
<p>Style error messages like this:</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/design-system/components/do-and-dont-lists.njk
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<p>Use a Do and Don't list to give users clear and simple advice, for example about treating a problem themselves.</p>

<h2 id="when-not-to-use-do-and-dont-lists">When not to use Do and Don't lists</h2>
<p> If you only have 1 Do - or 1 Don't, consider using <a href="/design-system/components/inset-text">inset text</a> or a <a href="/design-system/components/warning-callout">warning callout</a> instead. </p>
<p>If you only have 1 Do - or 1 Don't, consider using <a href="/design-system/components/inset-text">inset text</a> or a <a href="/design-system/components/warning-callout">warning callout</a> instead. </p>

<h2 id="how-to-use-do-and-dont-lists">How to use Do and Don't lists</h2>
<p>Keep your points as brief as possible.</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/design-system/styles/spacing.njk
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
<p class="rich-text">As with the spacing override classes, the width override classes start with <code>nhsuk-u-</code>. The second part of the class name indicates the width on larger screen sizes.
<p>For example:</p>
<ul>
<li><p class="rich-text"><code>nhsuk-u-width-one-half</code> will apply a width of 50% and<p></li>
<li><p class="rich-text"><code>nhsuk-u-width-one-half</code> will apply a width of 50% and</p></li>
<li><p class="rich-text"><code>nhsuk-u-width-two-thirds</code> will apply a width of 66.66%.</p></li>
</ul>

Expand Down
4 changes: 2 additions & 2 deletions app/views/includes/_contact-panel.njk
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<h2 class="nhsuk-u-padding-top-4">Have you{% if subSection === "Styles" %} tested these styles{% endif %}{% if subSection === "Components" %} tested this component{% endif %}{% if subSection === "Patterns" %} tested this pattern{% endif %}{% if pageSection === "Content style guide" %} used this guidance{% endif %}?</h2>
{% if subSection === "Styles" or subSection === "Components" or subSection === "Patterns" %}

<p> If so, please share your research findings and let us know how it has worked for you. This will help us improve it for everyone.</p>
<p>If so, please share your research findings and let us know how it has worked for you. This will help us improve it for everyone.</p>
<p>Before you start, you will need a <a href="https://github.com/join?source=login">GitHub account</a>. It's an open forum where we collect feedback.</p>
{% endif %}
{% if pageSection === "Content style guide" %}

<p> Please let us know how this has worked for you and, in particular, if you have research findings to share. This will help us improve it for everyone.</p>
<p>Please let us know how this has worked for you and, in particular, if you have research findings to share. This will help us improve it for everyone.</p>
<p>Before you start, you will need a <a href="https://github.com/join?source=login">GitHub account</a>. It's an open forum where we collect feedback.</p>
{% endif %}
<div class="nhsuk-action-link">
Expand Down
2 changes: 1 addition & 1 deletion app/views/page-not-found.njk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% block bodyContent %}

<p>Please check the web address to make sure it was correct.</p>
<p>You can also browse the <a href="/">service manual homepage</a> or <a href="/search">search the service manual</a> for the information you need.<p>
<p>You can also browse the <a href="/">service manual homepage</a> or <a href="/search">search the service manual</a> for the information you need.</p>
<p>If you think this link is broken, please get in touch on the <a href="/slack">NHS digital service manual Slack workspace</a> or email the standards team at <a href="mailto:service-manual@nhs.net">service-manual@nhs.net</a>.</p>

{% endblock %}
Loading