From 99c7ff9e89d64dc4170c17043dbd9aa55140d21a Mon Sep 17 00:00:00 2001 From: "Paul D. Waite" Date: Mon, 27 Mar 2017 12:26:38 +0100 Subject: [PATCH] =?UTF-8?q?HTML-escaped=20displayName=20and=20displayNameH?= =?UTF-8?q?TML=20properties,=20because=20we=E2=80=99re=20using=20them=20to?= =?UTF-8?q?=20allow=20theme=20users=20to=20add=20the=20service=20name=20an?= =?UTF-8?q?d=20home=20page=20URL=20to=20the=20login=20screen.=20Also=20cor?= =?UTF-8?q?rected=20theme=20directory=20name=20produced=20by=20Gruntfile,?= =?UTF-8?q?=20and=20bumped=20version=20number?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/2.5.4_0.19.2_2.2.1/Gruntfile.js | 2 +- .../govuk_0.19.2_2.2.1/login/template.ftl | 7 +++---- themes/2.5.4_0.19.2_2.2.1/package.json | 2 +- 3 files changed, 5 insertions(+), 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 index 8d9a814..04692ee 100644 --- 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 index 7928de4..e1238d0 100644 --- 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 @@ - <#nested "title"> - ${realm.displayName!'GOV.UK'} + <#nested "title"> - ${realm.displayName?html!'GOV.UK'} <#-- Start GOV.UK Template content --> @@ -107,8 +107,8 @@
@@ -233,7 +233,6 @@ <#-- End GOV.UK Template footer --> - 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 index 0be51ac..bc9fa8f 100644 --- 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"