Commit Graph

3177 Commits

Author SHA1 Message Date
Tom Byers
633a30bcdf Put id back on cookie message for JS to hook onto 2019-11-25 11:43:30 +00:00
Tom Byers
22896596ea Put footer content back into prescribed columns 2019-11-25 11:43:30 +00:00
Tom Byers
d695823d55 Fix issues raised in pull request
Includes:
- replacing of conditional with statement that
  returns the same values
- making lins to GDS page actually go there
2019-11-25 11:43:30 +00:00
Tom Byers
2bd7ce8cf6 Replace all visually-hidden classes
These have been replaced:

https://design-system.service.gov.uk/get-started/updating-your-code/#helper-class-names
2019-11-25 11:43:30 +00:00
Tom Byers
d435301895 Put basic print stylesheet back in
Replicates the GOV.UK template one, adjusted for
the GOV.UK Frontend template HTML.
2019-11-25 11:43:30 +00:00
Tom Byers
b9c035fdab Put cookies message back in
The cookie_message block was part of GOV.UK
template but is not included in the GOV.UK
Frontend template.

This adds it back in along with JS to set the
cookies from GOV.UK template and styles, taken
from the Design System's website (which I assume
has the right colour contrast).
2019-11-25 11:43:30 +00:00
Tom Byers
5b11b63e07 Set vertical spacing for <main>
GOV.UK Frontend gives `<main>` different padding
on the top and bottom to us.

This adds our spacing to `<main>` for pages
without a side nav (except the product page which
is special) and to the row containing the `<main>`
and side nav sections on pages that have a side
nav.
2019-11-25 11:43:30 +00:00
Tom Byers
9415a0bf3f Update content area blocks in descendent pages
GOV.UK Frontend's template wraps all content in a
`<main>` tag and puts it in the main column.

Some of Notify's pages need to reach out of the
main column (product page).

Some have several blocks of navigation before the
main content area.

This adjusts the blocks in all the templates
where this is the case so those conditions can be
met.
2019-11-25 11:43:30 +00:00
Tom Byers
496d5d1de1 Make theme colour (border below masthead) work
Ours is used to indicate the different
environments:
- local
- preview
- staging
- production
2019-11-25 11:43:30 +00:00
Tom Byers
9b89ce4853 Update page title block name on signed out page
Now matches the block from the GOVUKFrontend
template.

This is the only page not suffixed by "GOV.UK
Notify" so has it's specific content for this
block.
2019-11-25 11:43:30 +00:00
Tom Byers
5ce63851e6 Add GOVUK Frontend footer component
Replaces the following blocks/variables with the
`footer` block filled by the `notify_footer`
macro:
- footer_top
- footer_support_links

Our current footer has a few differences
with the GOVUK Frontend one:
1. the columns of links and the meta links have no
  headings, visible or structural
2. the line of text saying GDS built this prefixes
  the meta links whereas theirs sits on a new
  link, after them
2019-11-25 11:43:30 +00:00
Tom Byers
be2f246995 Use header component for masthead
Replaces the following blocks/variables with the
`header` block filled by the `header` component:
- header_class
- proposition_header
- global_header_text
- homepage_url

Also rewrites code that selects header nav items

The original code inserts a class name to mark the
nav item as selected.

The GOVUK Frontend header just needs a boolean to
be passed to indicate an item is selected.

This uses the `header_navigation.is_selected`
method, as before, but changes its return value to
a boolean.
2019-11-25 11:43:30 +00:00
Tom Byers
0d21d5124e Add GOVUK Frontend version of govuk_template
`admin_template.html` is the base layout used by
all pages in the application.

This swaps out its dependance on govuk_template
for the version GOVUK Frontend provides.

Also renames blocks used in `admin_template.html`,
defined in both the old and new govuk_template
whose names have changed, as listed in:

https://design-system.service.gov.uk/styles/page-template/
2019-11-25 11:43:30 +00:00
Tom Byers
e02f94f238 Revert "Replace govuk template with govuk frontend components" 2019-11-25 10:37:35 +00:00
Tom Byers
0c154ad604 Put id back on cookie message for JS to hook onto 2019-11-22 17:45:45 +00:00
Tom Byers
3511f0b726 Put footer content back into prescribed columns 2019-11-22 17:45:45 +00:00
Tom Byers
aa9df17ef3 Fix issues raised in pull request
Includes:
- replacing of conditional with statement that
  returns the same values
- making lins to GDS page actually go there
2019-11-22 17:45:45 +00:00
Tom Byers
c3b2d3c521 Replace all visually-hidden classes
These have been replaced:

https://design-system.service.gov.uk/get-started/updating-your-code/#helper-class-names
2019-11-22 17:45:45 +00:00
Tom Byers
faf2357ddf Put basic print stylesheet back in
Replicates the GOV.UK template one, adjusted for
the GOV.UK Frontend template HTML.
2019-11-22 17:44:17 +00:00
Tom Byers
7f0b207f0a Put cookies message back in
The cookie_message block was part of GOV.UK
template but is not included in the GOV.UK
Frontend template.

This adds it back in along with JS to set the
cookies from GOV.UK template and styles, taken
from the Design System's website (which I assume
has the right colour contrast).
2019-11-22 17:44:17 +00:00
Tom Byers
6957a95121 Set vertical spacing for <main>
GOV.UK Frontend gives `<main>` different padding
on the top and bottom to us.

This adds our spacing to `<main>` for pages
without a side nav (except the product page which
is special) and to the row containing the `<main>`
and side nav sections on pages that have a side
nav.
2019-11-22 17:44:17 +00:00
Tom Byers
b03b2f7502 Update content area blocks in descendent pages
GOV.UK Frontend's template wraps all content in a
`<main>` tag and puts it in the main column.

Some of Notify's pages need to reach out of the
main column (product page).

Some have several blocks of navigation before the
main content area.

This adjusts the blocks in all the templates
where this is the case so those conditions can be
met.
2019-11-22 17:44:17 +00:00
Tom Byers
5bb8e7654f Make theme colour (border below masthead) work
Ours is used to indicate the different
environments:
- local
- preview
- staging
- production
2019-11-22 17:44:17 +00:00
Tom Byers
fc1a24c2d6 Update page title block name on signed out page
Now matches the block from the GOVUKFrontend
template.

This is the only page not suffixed by "GOV.UK
Notify" so has it's specific content for this
block.
2019-11-22 17:44:17 +00:00
Tom Byers
ee6922f0d1 Add GOVUK Frontend footer component
Replaces the following blocks/variables with the
`footer` block filled by the `notify_footer`
macro:
- footer_top
- footer_support_links

Our current footer has a few differences
with the GOVUK Frontend one:
1. the columns of links and the meta links have no
  headings, visible or structural
2. the line of text saying GDS built this prefixes
  the meta links whereas theirs sits on a new
  link, after them
2019-11-22 17:44:17 +00:00
Tom Byers
f80a25a9e3 Use header component for masthead
Replaces the following blocks/variables with the
`header` block filled by the `header` component:
- header_class
- proposition_header
- global_header_text
- homepage_url

Also rewrites code that selects header nav items

The original code inserts a class name to mark the
nav item as selected.

The GOVUK Frontend header just needs a boolean to
be passed to indicate an item is selected.

This uses the `header_navigation.is_selected`
method, as before, but changes its return value to
a boolean.
2019-11-22 17:44:17 +00:00
Tom Byers
49b08fad8f Add GOVUK Frontend version of govuk_template
`admin_template.html` is the base layout used by
all pages in the application.

This swaps out its dependance on govuk_template
for the version GOVUK Frontend provides.

Also renames blocks used in `admin_template.html`,
defined in both the old and new govuk_template
whose names have changed, as listed in:

https://design-system.service.gov.uk/styles/page-template/
2019-11-22 17:44:17 +00:00
karlchillmaid
0599f54a83 Merge pull request #3191 from alphagov/update-trial-mode-content
Update trial mode content
2019-11-22 14:59:47 +00:00
karlchillmaid
fd5121b8f1 Amend request to go live content 2019-11-22 14:47:59 +00:00
karlchillmaid
23ab557dbb Update request to go live 2019-11-22 14:24:07 +00:00
karlchillmaid
72ab59f34c Update request to go live content 2019-11-22 14:22:32 +00:00
karlchillmaid
6675793241 Update link text 2019-11-22 14:17:15 +00:00
karlchillmaid
93dcb7e0b8 Update API integration information 2019-11-22 10:13:54 +00:00
karlchillmaid
c926a0175e Add request to go live instructions 2019-11-21 15:53:52 +00:00
karlchillmaid
dfea129564 Replace your with the 2019-11-21 09:33:51 +00:00
karlchillmaid
9ab92adf8f Replace 'set up' with 'add'
This matches the language we use in the service
2019-11-20 14:58:50 +00:00
karlchillmaid
02d9d1042b Update request to go live content 2019-11-20 14:22:46 +00:00
karlchillmaid
4e7a5aaaa1 Update app/templates/views/trial-mode.html
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-11-20 13:45:29 +00:00
karlchillmaid
3d6b66b21d Update content 2019-11-20 11:34:03 +00:00
karlchillmaid
b5fb43212a Update lead in and second bullet 2019-11-20 11:32:42 +00:00
karlchillmaid
1a25ac9676 Update trial mode content 2019-11-20 11:25:36 +00:00
Chris Hill-Scott
a3ae9e8ba0 Update product page with new letter prices
We updated the letter pricing in https://github.com/alphagov/notifications-admin/pull/3128

The minimum price has gone up from 30p to 35p
2019-11-20 10:53:39 +00:00
karlchillmaid
94ee7b16d9 Merge pull request #3180 from alphagov/update-error-page-content
Update error page content
2019-11-19 09:39:14 +00:00
karlchillmaid
2ae8cc6e68 Fix quotes 2019-11-18 17:09:34 +00:00
Chris Hill-Scott
0361fb6991 Fix duplicated ‘GOV.UK Notify’ in page titles
The `per_page_title` block appends ‘– GOV.UK Notify’ – there’s no need
to hard code it (see e4b040b380/app/templates/admin_template.html (L15))
2019-11-18 17:08:20 +00:00
karlchillmaid
7065f158d9 Update Classifications and security vetting 2019-11-18 13:48:54 +00:00
Chris Hill-Scott
32cc08432c Merge pull request #3160 from alphagov/no-min-height-sticky-button
Remove min-height from sticky submit buttons
2019-11-15 12:35:21 +00:00
Chris Hill-Scott
c3b2017f47 Comma-delimit thousands in ‘Send’ button
Matches the style of how we display numbers in the thousands elsewhere.
2019-11-13 13:29:49 +00:00
Chris Hill-Scott
24dc438446 Merge pull request #3176 from alphagov/require-uuids-in-urls
Be stricter about the format of URL parameters
2019-11-13 10:33:31 +00:00
Tom Byers
74e280ce51 Fix reference to main.support in views 2019-11-12 17:02:38 +00:00