Skip to content

Commit

Permalink
Fix missing default values after update to gov uk template 0.14.0
Browse files Browse the repository at this point in the history
Add missing default values:

- Crown copyright message
- Licence message
- Skiplink message
- Logo link title

Order alphabetically.
  • Loading branch information
gemmaleigh committed Jul 8, 2015
1 parent d5bb2f1 commit f486395
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
10 changes: 7 additions & 3 deletions govuk/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ module.exports = {
bodyEnd: "{{$bodyEnd}}{{/bodyEnd}}",
content: "{{$content}}{{/content}}",
cookieMessage: "{{$cookieMessage}}{{/cookieMessage}}",
crownCopyrightMessage: "{{$crownCopyrightMessage}}© Crown copyright{{/crownCopyrightMessage}}",
footerSupportLinks: "{{$footerSupportLinks}}{{/footerSupportLinks}}",
footerTop: "{{$footerTop}}{{/footerTop}}",
globalHeaderText: "{{$globalHeaderText}}GOV.UK{{/globalHeaderText}}",
head: "{{$head}}{{/head}}",
headerClass: "{{$headerClass}}{{/headerClass}}",
insideHeader: "{{$insideHeader}}{{/insideHeader}}",
homepageUrl: "{{$homepageUrl}}https://www.gov.uk{{/homepageUrl}}",
globalHeaderText: "{{$globalHeaderText}}GOV.UK{{/globalHeaderText}}",
insideHeader: "{{$insideHeader}}{{/insideHeader}}",
licenceMessage: "{{$licenceMessage}}<p>All content is available under the <a href='https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/' rel='license'>Open Government Licence v3.0</a>, except where otherwise stated</p>{{/licenceMessage}}",
logoLinkTitle: "{{$logoLinkTitle}}Go to the GOV.UK homepage{{/logoLinkTitle}}",
pageTitle: "{{$pageTitle}}GOV.UK - The best place to find government services and information{{/pageTitle}}",
propositionHeader: "{{$propositionHeader}}{{/propositionHeader}}"
propositionHeader: "{{$propositionHeader}}{{/propositionHeader}}",
skipLinkMessage: "{{$skipLinkMessage}}Skip to main content{{/skipLinkMessage}}"
};
8 changes: 4 additions & 4 deletions govuk/views/govuk_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

<div id="skiplink-container">
<div>
<a href="#content" class="skiplink"></a>
<a href="#content" class="skiplink">{{$skipLinkMessage}}Skip to main content{{/skipLinkMessage}}</a>
</div>
</div>

Expand All @@ -79,7 +79,7 @@
<div class="header-wrapper">
<div class="header-global">
<div class="header-logo">
<a href="{{$homepageUrl}}https://www.gov.uk{{/homepageUrl}}" title="" id="logo" class="content">
<a href="{{$homepageUrl}}https://www.gov.uk{{/homepageUrl}}" title="{{$logoLinkTitle}}Go to the GOV.UK homepage{{/logoLinkTitle}}" id="logo" class="content">
<img src="{{assetPath}}images/gov.uk_logotype_crown.png?0.14.0" width="35" height="31" alt=""> {{$globalHeaderText}}GOV.UK{{/globalHeaderText}}
</a>
</div>
Expand Down Expand Up @@ -110,13 +110,13 @@
<div class="open-government-licence">
<p class="logo"><a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence</a></p>


{{$licenceMessage}}<p>All content is available under the <a href='https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/' rel='license'>Open Government Licence v3.0</a>, except where otherwise stated</p>{{/licenceMessage}}

</div>
</div>

<div class="copyright">
<a href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/"></a>
<a href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">{{$crownCopyrightMessage}}© Crown copyright{{/crownCopyrightMessage}}</a>
</div>
</div>
</div>
Expand Down

0 comments on commit f486395

Please sign in to comment.