Commit Graph

8684 Commits

Author SHA1 Message Date
Tom Byers
efe7e2f35e Add JS modules support & use for GOVUKFrontend
The JS for GOVUKFrontend components is available
individually so you can only include what you
need:

https://github.com/alphagov/govuk-frontend/blob/v2.13.0/docs/installation/installing-with-npm.md#option-2-import-javascript

This uses the JS Modules syntax:

*[JS module](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules)

Our JS is delivered as one file so we need to use
a bundler to convert the modules to a single file.

This adds a build step to transpile all modules
into a single file, which is then added to the
files combined into the one that get delivered.

Rollup is used as the simplest bundler to use for
this purpose. It also introduces the least
boilerplate JS.

Note: the CommonJS plugin is needed as GOV.UK
Frontend components are published as UMD modules.

In future, this work should let us work on this
story dependencies:

https://www.pivotaltracker.com/story/show/165380360
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
278a70ecc7 Remove GOVUK Template files
Includes Sass that targeted GOV.UK Template HTML
and also moves some link styles to `globals.scss`.

Also removes bits of frontend build that copied
over GOVUK Template files.
2019-11-22 17:45:45 +00:00
Tom Byers
73f7292840 Fix tests broken by GOV.UK Frontend template
Fix test broken by removal of GOV.UK logo image
- tests/app/main/views/test_notifications.py

Fix tests that ref GOV.UK template CSS files
- tests/app/main/views/test_index.py

Fix test broken by govuk-visually-hidden
- tests/app/main/views/test_send.py

Fix tests broken by header menu link -> button
- tests/app/main/views/test_service_settings.py
- tests/app/main/views/test_template_folders.py

Fix tests broken by removing div#content
- tests/app/main/views/accounts/test_choose_accounts.py
- tests/app/test_navigation.py

Remove references to GOV.UK CSS
- tests/app/main/views/test_index.py

Fix tests querying the header navigation
- tests/app/test_navigation.py
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
19823e8ac1 Add js-hidden class to globals.scss
It's used by the conditional content pattern
from GOV.UK Elements (which uses JS from the
GOV.UK Frontend Toolkit).
2019-11-22 17:44:17 +00:00
Tom Byers
905dce2f49 Replace removed global GOV.UK Template styles
GOV.UK Template included styles targeting elements
by their tag name, so affected all elements of
that type. Removing these files removes certain
styles from the top of the cascade.

Moving all components to GOV.UK Frontend (that are
possible) should fix this further down the
cascade. This adds them back to plug the gap in
the cascade until that work happens.
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
e366bdadb0 Make <main> section position: relative
The content of the GOV.UK Frontend header
component is `position: relative`. This changed
the [default z-index
stacking](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Stacking_without_z-index_
so it was above `<main>`.

This aligns `<main>` with the header, meaning
`<main>` appears above it due to being below it in
the document.
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
d80b42a255 Add GOV.UK Frontend JS
This includes the JS for all GOV.UK Frontend code.
If our frontend build includes a module bundler in
future, we should only include the JS for the
components we use, as with our Sass.
2019-11-22 17:44:17 +00:00
Tom Byers
8fc510384c Make header & footer components look like Notify
Notify has 4 columns of links in the footer and
its header navigation aligns to the right on
desktop.
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
Tom Byers
cd2232e511 Add GOVUK Frontend to the frontend build
- copies across the images
- adds the Sass folder to the Sass include paths

JS is added file-by-file so will be added when
specific files are needed.
2019-11-22 17:44:16 +00:00
Tom Byers
32aba71ab7 Add GOVUK Frontend Sass, configured for this app
Like:

https://github.com/alphagov/govuk-frontend/blob/v2.13.0/package/all.scss

...but specifying the components to include,
starting with the ones that make up the
govuk_template and setting any variables needed.
2019-11-22 17:44:16 +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
Chris Hill-Scott
585189115f re-fix tests 2019-11-22 14:30:12 +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
Chris Hill-Scott
3ef822683f Fix tests
There’s an extra paragraph in the request to go live text now, so we
need to skip it to find the good stuff.
2019-11-22 14:12:25 +00:00
Chris Hill-Scott
57a5163033 Merge pull request #3192 from alphagov/update-get-started-page
Update request to go live content
2019-11-22 14:00:08 +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
Pea (Malgorzata Tyczynska)
d07a370658 Merge pull request #3179 from alphagov/validate-service-and-org-name
Validate service and organisation name
2019-11-20 13:37:10 +00:00
Pea Tyczynska
21e6d994b9 Validate service and organisation name 2019-11-20 13:31:01 +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
ebb29b82a9 Merge pull request #3189 from alphagov/update-tags-new-taxonomy
Update Zendesk tags to reflect new taxonomy
2019-11-20 10:59:17 +00:00
Chris Hill-Scott
e24b72f974 Merge pull request #3190 from alphagov/product-page-pricing-letters-update
Update product page with new letter prices
2019-11-20 10:58:40 +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
Chris Hill-Scott
12b7c5d5e8 Remove notify_go_live_incomplete tag
The new taxonomy doesn't have a `notify_go_live_incomplete` tag. We
replaced this with `notify_go_live_incomplete_mou` because the only way
users can submit an incomplete request is if they do not agree to the
MOU.

These are the incomplete tags:

- `notify_go_live_incomplete_mou`
- `notify_go_live_incomplete_reply_to`
- `notify_go_live_incomplete_shared_email`
- `notify_go_live_incomplete_templates`

Of those, only the first one is applied automatically.
2019-11-19 16:42:25 +00:00
Chris Hill-Scott
7a5d301104 Update Zendesk tags to reflect new taxonomy
Requests to go live and email branding requests come through to Zendesk
with tags attached automatically.

With the revised taxonomy some of these tags need to be updated, as
summarised in this spreadsheet.

In addition, `notify_action` tag has to be added in each of those cases.

Old|New
---|---
`notify_request_to_go_live_complete`|`notify_go_live_complete`
`notify_request_to_go_live_incomplete`|`notify_go_live_incomplete`
`notify_action_add_branding`|`notify_branding`
`notify_request_to_go_live_incomplete_mou`|`notify_go_live_incomplete_mou`
`notify_request_to_go_live`|`notify_go_live`

– https://docs.google.com/spreadsheets/d/1o5ATsFsVK8Qpj7x8QvxX-SfEuBZ75028GEySVcdBFYU/edit#gid=0https://www.pivotaltracker.com/story/show/169842970
2019-11-19 15:46:29 +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
128e0de0e4 Merge pull request #3188 from alphagov/fix-quotes
Fix quotes
2019-11-19 08:37:06 +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