PP-1798 Add govuk template #318
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There were errors, for info, please see... |
tombye
force-pushed
the
add-govuk_template
branch
from
b24a46d
to
10e03c9
Compare
rauligs
force-pushed
the
add-govuk_template
branch
3 times, most recently
from
f276de1
to
e4bd3c0
Compare
rauligs
approved these changes
Apr 5, 2017
|
👍 Will merge as soon it goes 🍏 |
rauligs
force-pushed
the
add-govuk_template
branch
from
e4bd3c0
to
6dbf346
Compare
Includes the addition of a script (used in pay-frontend) to convert the standard GOVUK Mustache template to the version that supports inheritance. This was added so we didn't need to use the version with inheritance on the GOVUK template repo (which only comes as a tarball so is harder to manage). See this commit for details of the process: alphagov/govuk-prototype-kit@e382758
`vendorViews` was duplicating the paths the template engine searched for templates to compile. We also needed to add the GOVUK template views folder to these paths. The GOVUK template's assets folder also needed to be added to the static asset path.
Because this includes some default HTML to go in
the `{{$content}}` block, this required a new
sub-block called `{{$mainContent}}` for all the
pages that use the base templates to put their
content in.
Moves the 'log out' link out to a partial and uses the propositional navigation pattern to combine it with the 'My Services' link.
Uses the banner built for indicating the phase (alpha/beta) the service is in. See: http://govuk-elements.herokuapp.com/alpha-beta-banners/ Requires some temporary styles to support the wider central column.
Also includes - some fixes for mobile - styles to make it (roughly) match the product page format - fixes for a few visual bugs
The new implementation puts the 'Log out' and 'My Services' links in a propositional navigation partial (used by the GOVUK template). This means the tests that found the navigation by looking for an unordered list fail. This makes the selector for them more specific so they cna find the navigation and fixes some issues with another test due to the new inheritance we're using.
It was previously added on the assumption that the `currentGatewayAccount` variable is always sent through. This is not true so this protects against situations where that isn't the case.
Merges the staff templates with the layout ones to make only one for each state (logged in/out).
The GOVUK template has <link> tags for IE6-8 variants of the main stylesheet. Until these are removed we should provide the files so the network requests are fulfilled. (Without our using any of the associated Sass helpers, they are essentially duplicates of `application.css` and are only delivered to those browsers.)
rauligs
force-pushed
the
add-govuk_template
branch
from
6dbf346
to
3f0262e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
This updates pay-selfservice to use the GOVUK template, like pay-frontend.
How
It adds the NPM package of the mustache version of the GOVUK template. It adds a transpilation script, already used in pay-frontend, to convert its tags to a version supporting block inheritance.
The templating library this app uses, hoganJS, supports this extension so this just works™.
Notes
Apart from making the GOVUK template the base template for all pages, this also separates out the header and side navigation into partials.
It also makes the header look more like that used on the payments product page.
New header full-width
New header small-screen
New header small-screen with menu open