diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 83981a7..f87ca05 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,13 +6,16 @@ *.code-workspace @NHSDigital/nhs-notify-amet /docs/ @NHSDigital/nhs-notify-amet -/docs/_sass/ @NHSDigital/nhs-notify-web-cms +/docs/_config.yml @NHSDigital/nhs-notify-web-cms +/docs/_config.dev.yml @NHSDigital/nhs-notify-web-cms +/docs/_data/ @NHSDigital/nhs-notify-web-cms /docs/_includes/ @NHSDigital/nhs-notify-web-cms /docs/_layouts/ @NHSDigital/nhs-notify-web-cms -/docs/pages/ @NHSDigital/nhs-notify-web-cms +/docs/_sass/ @NHSDigital/nhs-notify-web-cms +/docs/_data/ @NHSDigital/nhs-notify-web-cms +/docs/assets/ @NHSDigital/nhs-notify-web-cms /docs/collections/ @NHSDigital/nhs-notify-web-cms -/docs/_config.yml @NHSDigital/nhs-notify-web-cms -/docs/_config.dev.yml @NHSDigital/nhs-notify-web-cms +/docs/pages/ @NHSDigital/nhs-notify-web-cms # Default protection for codeowners, must be last in file. /.github/CODEOWNERS @NHSDigital/nhs-notify-code-owners diff --git a/docs/README.md b/docs/README.md index c808682..5c67cdb 100644 --- a/docs/README.md +++ b/docs/README.md @@ -68,6 +68,7 @@ Below is a list of the supported nhsuk [design system components](https://servic - [Image](_includes/components/docs/image.component.md) - [Action link](_includes/components/docs/action-link.component.md) - [Inset text](_includes/components/docs/inset-text.component.md) +- [Details](_includes/components/docs/details.component.md) ## Assets diff --git a/docs/_data/home/benefits.yml b/docs/_data/home/benefits.yml index e51396d..d305f5f 100644 --- a/docs/_data/home/benefits.yml +++ b/docs/_data/home/benefits.yml @@ -1,6 +1,6 @@ - heading: Lower your messaging costs description: | - Pay less for messages with our competitive rates and never pay any service or integration fees. + Get competitive rates on messages and pay less with no service or integration fees. - heading: Increase your operating efficiency description: | @@ -9,4 +9,3 @@ - heading: Message your audiences more effectively description: | Use a range of channels and formats to message people in the ways that work best for them. - diff --git a/docs/_data/home/heading.yml b/docs/_data/home/heading.yml index 7449783..1f5ff62 100644 --- a/docs/_data/home/heading.yml +++ b/docs/_data/home/heading.yml @@ -1,4 +1,4 @@ -heading: Send NHS App messages, emails, tests and letters to patients and the public +heading: Send NHS App messages, emails, texts and letters to patients and the public description: | You can use NHS Notify if you work in NHS England and support direct care. image: landing-main-image.svg diff --git a/docs/_data/home/how-it-works.yml b/docs/_data/home/how-it-works.yml index f4f91c5..2318498 100644 --- a/docs/_data/home/how-it-works.yml +++ b/docs/_data/home/how-it-works.yml @@ -1,7 +1,7 @@ - heading: Write your messages description: | Create and edit reusable templates for each message channel: - - NHS App messages + - NHS App messages and notifications - emails - text messages (SMS) - letters diff --git a/docs/_data/home/pricing.yml b/docs/_data/home/pricing.yml index 5f2756b..e3d80b0 100644 --- a/docs/_data/home/pricing.yml +++ b/docs/_data/home/pricing.yml @@ -7,9 +7,9 @@ pricing: Free - heading: Texts (SMS) - description: up to 30,000 free texts then + description: each text message pricing: 2.27p - heading: Letters description: A4, 2 sides, sent 2nd class - pricing: 54p + pricing: 61p diff --git a/docs/_includes/components/details.html b/docs/_includes/components/details.html new file mode 100644 index 0000000..3aa7ad2 --- /dev/null +++ b/docs/_includes/components/details.html @@ -0,0 +1,10 @@ +
+ + + {{ include.heading }} + + +
+ {{ include.text | markdownify }} +
+
diff --git a/docs/_includes/components/docs/details.component.md b/docs/_includes/components/docs/details.component.md new file mode 100644 index 0000000..eb32e52 --- /dev/null +++ b/docs/_includes/components/docs/details.component.md @@ -0,0 +1,71 @@ +# Jekyll component - Inset text + +> | | | +> | -------- | ---------------------------------------------------------------------------------------- | +> | Theme | `nhsuk` | +> | Link | [nhsuk details element](https://service-manual.nhs.uk/design-system/components/details) | +> | location | `/_includes/components/details.html` | + +## Usage + +```markdown +# This is a markdown file with a Jekyll component + +- Step 1 +- Step 2 +- Step 3 + +Below is details expander + +{% include components/details.html + heading='this is the text show in the underlined link' + text='example text hidden by default until a user clicks the heading text' +%} + +Above is details expander +``` + +## Attributes + +### heading + +> | | | +> | ----------- | ----------------------------------------------------------------------------- | +> | state | `required` | +> | description | The wording used in the blue underlined text that a user will click to expand | + +### text + +> | | | +> | ----------- | ---------------------------------------------------- | +> | state | `required` | +> | description | The text you want to display inside an details element | + +The `text` attribute supports plain text and markdown format + +#### plain text + +```Jekyll +{% include components/details.html + heading='plain' + text='This is simple plain text' +%} +``` + +#### markdown + +Please note when using markdown the wording content is aligned all the way to the left. + +```Jekyll +{% include components/details.html + heading='markdown' + text=' +this is with markdown here is a [link](https://service-manual.nhs.uk/design-system/components/details) + +- list item 1 +- list item 2 +- list item 3 + - nested + ' +%} +``` diff --git a/docs/pages/examples/index.md b/docs/pages/examples/index.md index bbda752..38bfec4 100644 --- a/docs/pages/examples/index.md +++ b/docs/pages/examples/index.md @@ -12,6 +12,7 @@ permalink: /examples/ - [Standard link](#standard-link) - [Action link](#action-link) - [Inset text](#inset-text) +- [Details component](#details-component) ## Table @@ -66,3 +67,17 @@ this is with markdown here is a [link](#inset-text) - nested 3.1 ' %} + +## Details component + +{% include components/details.html + heading='Example details expander' + text=' +this is with markdown here is a [link](https://service-manual.nhs.uk/design-system/components/details) + +- list item 1 +- list item 2 +- list item 3 + - nested 3.1 + ' +%} diff --git a/docs/pages/pricing/letters.md b/docs/pages/pricing/letters.md index 7759d98..b9fa2b9 100644 --- a/docs/pages/pricing/letters.md +++ b/docs/pages/pricing/letters.md @@ -18,13 +18,13 @@ Prices include: - double-sided black and white printing - C5 size envelopes with an address window -| Paper | 1st class | 2nd class | -| --------- | -------------------- | -------------------- | -| 1 sheet | Up to 97 pence + VAT | Up to 61 pence + VAT | -| 2 sheets | Up to £1.01 + VAT | Up to 65 pence + VAT | -| 3 sheets | Up to £1.05 + VAT | Up to 68 pence + VAT | -| 4 sheets | Up to £1.11 + VAT | Up to 75 pence + VAT | -| 5 sheets | Up to £1.15 + VAT | Up to 79 pence + VAT | +| Paper | 1st class | 2nd class | +| -------- | -------------------- | -------------------- | +| 1 sheet | Up to 97 pence + VAT | Up to 61 pence + VAT | +| 2 sheets | Up to £1.01 + VAT | Up to 65 pence + VAT | +| 3 sheets | Up to £1.05 + VAT | Up to 68 pence + VAT | +| 4 sheets | Up to £1.11 + VAT | Up to 75 pence + VAT | +| 5 sheets | Up to £1.15 + VAT | Up to 79 pence + VAT | ## Letters in accessible formats @@ -35,7 +35,6 @@ Learn more about NHS Notify’s accessible letter formats. | Accessible format | Cost | | --------------------------- | ------------------------- | | Large print (16 point font) | Same as a standard letter | -| Easy read | £1.70 + VAT | | Braille | £1.98 + VAT | | Audio CD | £2.80 + VAT | diff --git a/docs/pages/pricing/pricing.md b/docs/pages/pricing/pricing.md index 9bb1d58..32aae9f 100644 --- a/docs/pages/pricing/pricing.md +++ b/docs/pages/pricing/pricing.md @@ -15,15 +15,13 @@ There’s also: - no monthly charge - no setup or integration fee -- no procurement cost +- no procurement fees Find out [how to pay]({% link pages/pricing/how-to-pay.md %}). ## Text messages (SMS) -NHS England organisations and service have an annual allowance of free text messages. - -When you've used your annual allowance, it costs 2.27 pence (plus VAT) per text message. +It costs 2.27 pence (plus VAT) for every text message you send. {% include components/action-link.html url='/pricing/text-messages' @@ -32,7 +30,7 @@ When you've used your annual allowance, it costs 2.27 pence (plus VAT) per text ## Letters -It costs up to 61p (plus VAT) to send a 1 sheet letter with both sides printed using 2nd class postage. +It costs up to 61p (plus VAT) to send 1 A4 sheet letter with both sides printed using 2nd class postage. {% include components/action-link.html url='/pricing/letters' diff --git a/docs/pages/pricing/text-messages.md b/docs/pages/pricing/text-messages.md index ec62dbc..7b3e049 100644 --- a/docs/pages/pricing/text-messages.md +++ b/docs/pages/pricing/text-messages.md @@ -9,14 +9,7 @@ nav_order: 2 permalink: /pricing/text-messages --- -NHS England organisations and services have an annual allowances of free text messages. - -The current allowance is: - -- 30,000 free text messages for national services -- 10,000 free text messages for regional services - -When a service has used its annual allowance, it costs 2.27 pence (plus VAT) for each text message you send. +It costs 2.27 pence (plus VAT) for each text message you send. You may pay more for each message, if you: @@ -29,7 +22,7 @@ You may pay more for each message, if you: If a text message is longer than 160 characters (including spaces), it counts as more than one message. | Message length | Charge | -| -------------------- | ----------------| +| -------------------- | --------------- | | Up to 306 characters | 2 text messages | | Up to 459 characters | 3 text messages | | Up to 612 characters | 4 text messages | @@ -44,7 +37,7 @@ Using them can increase the cost of sending text messages. ## Accents and accented characters -Some languages, such as Welsh, use accented characters. +Some languages use accented characters. The following accented characters do not affect the cost of sending text messages: Ä, É, Ö, Ü, à, ä, é, è, ì, ò, ö, ù, ü.