HTML-escaped displayName and displayNameHTML properties, because we’r…

…e using them to allow theme users to add the service name and home page URL to the login screen. Also corrected theme directory name produced by Gruntfile, and bumped version number
UKHomeOffice · Mar 27, 2017 · 99c7ff9 · 99c7ff9
1 parent 150f310
commit 99c7ff9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/themes/2.5.4_0.19.2_2.2.1/Gruntfile.js b/themes/2.5.4_0.19.2_2.2.1/Gruntfile.js
@@ -3,7 +3,7 @@ module.exports = function (grunt) {
       packageDotJson       = JSON.parse( fs.readFileSync('package.json', 'utf8') ),
       govukTemplateVersion = packageDotJson.dependencies["govuk_template_jinja"],
       govukElementsVersion = packageDotJson.dependencies["govuk-elements-sass"],
-      themeDirectory       = ["govuk", govukTemplateVersion, govukElementsVersion].join("__"),
+      themeDirectory       = ["govuk", govukTemplateVersion, govukElementsVersion].join("_"),
       css_output_paths_to_sass_paths = {};
 
   [

diff --git a/themes/2.5.4_0.19.2_2.2.1/govuk_0.19.2_2.2.1/login/template.ftl b/themes/2.5.4_0.19.2_2.2.1/govuk_0.19.2_2.2.1/login/template.ftl
@@ -33,7 +33,7 @@
             <meta name="${meta?split('==')[0]}" content="${meta?split('==')[1]}"/>
         </#list>
     </#if>
-    <title><#nested "title"> - ${realm.displayName!'GOV.UK'}</title>
+    <title><#nested "title"> - ${realm.displayName?html!'GOV.UK'}</title>
 
     <#-- Start GOV.UK Template <head> content -->
 
@@ -107,8 +107,8 @@
       <div class="header-wrapper">
         <div class="header-global">
           <div class="header-logo">
-            <a href="${realm.displayNameHtml!'https://www.gov.uk'}" title="Go to the homepage" id="logo" class="content">
-              <img src="${url.resourcesPath}/vendor/govuk_template/images/gov.uk_logotype_crown_invert_trans.png?0.19.2" width="36" height="32" alt=""> ${realm.displayName!'GOV.UK'}
+            <a href="${realm.displayNameHtml?html!'https://www.gov.uk'}" title="Go to the ${realm.displayName?html!'GOV.UK'} homepage" id="logo" class="content">
+              <img src="${url.resourcesPath}/vendor/govuk_template/images/gov.uk_logotype_crown_invert_trans.png?0.19.2" width="36" height="32" alt=""> ${realm.displayName?html!'GOV.UK'}
             </a>
           </div>
         </div>
@@ -233,7 +233,6 @@
 
     <#-- End GOV.UK Template footer -->
 
-
 </body>
 </html>
 </#macro>
diff --git a/themes/2.5.4_0.19.2_2.2.1/package.json b/themes/2.5.4_0.19.2_2.2.1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "keycloak-theme-govuk_2.5.4_0.19.2_2.2.1",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "dependencies": {
     "govuk-elements-sass": "2.2.1",
     "govuk_template_jinja": "0.19.2"