From 1ec4ffc7460089b3d70d885a0e103a84e94e0cd2 Mon Sep 17 00:00:00 2001 From: Jeremy-Hodge <105053544+Jeremy-Hodge@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:21:51 +0000 Subject: [PATCH 1/5] Content changes 23/11/23 - add version numbers (#227) * Update article-4-direction.md with version number 1.2.2 * Update conservation-area.md with version number 1.2.2 * Update listed-building.md with version number 1.1.1 * Update tree-preservation-order.md with version number 1.2.2 --- .../pages/guidance/specifications/article-4-direction.md | 6 ++++++ .../pages/guidance/specifications/conservation-area.md | 6 ++++++ .../pages/guidance/specifications/listed-building.md | 6 ++++++ .../guidance/specifications/tree-preservation-order.md | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/application/templates/pages/guidance/specifications/article-4-direction.md b/application/templates/pages/guidance/specifications/article-4-direction.md index 42f50f44..67e2616c 100644 --- a/application/templates/pages/guidance/specifications/article-4-direction.md +++ b/application/templates/pages/guidance/specifications/article-4-direction.md @@ -1,3 +1,9 @@ +Version: 1.2.2 + +Published: 11 September 2023 + +--- + There are 2 datasets you must provide for article 4 directions: - [article 4 direction dataset](#{{ 'article 4 direction dataset' | slugify }}) diff --git a/application/templates/pages/guidance/specifications/conservation-area.md b/application/templates/pages/guidance/specifications/conservation-area.md index 0c42a51f..b34bf314 100644 --- a/application/templates/pages/guidance/specifications/conservation-area.md +++ b/application/templates/pages/guidance/specifications/conservation-area.md @@ -1,3 +1,9 @@ +Version: 1.2.2 + +Published: 8 September 2023 + +--- + There are 2 datasets you must provide for conservation area data: - [conservation area dataset](#{{ 'conservation area dataset' | slugify }}) diff --git a/application/templates/pages/guidance/specifications/listed-building.md b/application/templates/pages/guidance/specifications/listed-building.md index f8590e20..4704fba3 100644 --- a/application/templates/pages/guidance/specifications/listed-building.md +++ b/application/templates/pages/guidance/specifications/listed-building.md @@ -1,3 +1,9 @@ +Version: 1.1.1 + +Published: 9 June 2023 + +--- + You must provide one dataset for listed buildings. Format diff --git a/application/templates/pages/guidance/specifications/tree-preservation-order.md b/application/templates/pages/guidance/specifications/tree-preservation-order.md index 47b840e9..586b8ebf 100644 --- a/application/templates/pages/guidance/specifications/tree-preservation-order.md +++ b/application/templates/pages/guidance/specifications/tree-preservation-order.md @@ -1,3 +1,9 @@ +Version: 1.2.2 + +Published: 8 September 2023 + +--- + There are 3 datasets you must provide for tree preservation orders: - [tree preservation order dataset](#{{ 'tree preservation order dataset' | slugify }}) From 553c09efd7cb1e5db3c33ada1a2522d5f367dbed Mon Sep 17 00:00:00 2001 From: George Goodall Date: Thu, 30 Nov 2023 16:04:45 +0000 Subject: [PATCH 2/5] removed boarder from phase banner on home page --- application/templates/homepage.html | 1 + application/templates/partials/phase-banner.html | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/application/templates/homepage.html b/application/templates/homepage.html index eb709815..0a947e06 100644 --- a/application/templates/homepage.html +++ b/application/templates/homepage.html @@ -2,6 +2,7 @@ {% extends "layouts/layout.html" %} {% block pageTitle %}Planning Data{% endblock %} {% set templateName = "dl-info/homepage.html" %} +{% set hideBannerBorder = true %} {% block main %}
diff --git a/application/templates/partials/phase-banner.html b/application/templates/partials/phase-banner.html index d8b36f5a..063e74fe 100644 --- a/application/templates/partials/phase-banner.html +++ b/application/templates/partials/phase-banner.html @@ -1,11 +1,12 @@ {% from "components/phase-banner/macro.jinja" import dlPhaseBanner %} + {{ dlPhaseBanner({ 'phase': 'Beta', - 'html': 'This is a new service – to help us improve it, sign up to take part in research', + 'html': 'This is a new service – to help us improve it, sign up to take part in research', 'classes': 'govuk-width-container govuk-width-container' if not fullWidthHeader else 'govuk-width-container', 'attributes': { - 'style': '' if not fullWidthHeader else 'padding: 10px 30px; max-width: unset;' + 'style': 'border-bottom: 0px' if hideBannerBorder else '' + '' if not fullWidthHeader else 'padding: 10px 30px; max-width: unset;' } }) }} From 4a2d9b9f15446efd0636eae3f87639bc45731e33 Mon Sep 17 00:00:00 2001 From: Jeremy-Hodge <105053544+Jeremy-Hodge@users.noreply.github.com> Date: Fri, 1 Dec 2023 09:27:13 +0000 Subject: [PATCH 3/5] Update index.html --- application/templates/pages/guidance/specifications/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/templates/pages/guidance/specifications/index.html b/application/templates/pages/guidance/specifications/index.html index b64cca12..5f1b0f96 100644 --- a/application/templates/pages/guidance/specifications/index.html +++ b/application/templates/pages/guidance/specifications/index.html @@ -17,7 +17,9 @@ From a3cbae9802678cec8c1c19f7e8f559ac627c61ac Mon Sep 17 00:00:00 2001 From: George Goodall Date: Fri, 8 Dec 2023 14:18:37 +0000 Subject: [PATCH 4/5] force do not track --- assets/javascripts/cookies.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/javascripts/cookies.js b/assets/javascripts/cookies.js index c9787371..4ef8b5ff 100644 --- a/assets/javascripts/cookies.js +++ b/assets/javascripts/cookies.js @@ -89,7 +89,7 @@ export function showCookieConfirmation () { export function setTrackingCookies () { var cookiesPolicy = JSON.parse(getCookie('cookies_policy')) - var doNotTrack = cookiesPolicy == null || !cookiesPolicy.usage + var doNotTrack = true; //cookiesPolicy == null || !cookiesPolicy.usage if (doNotTrack) { if(window.gaMeasurementId){ window[`ga-disable-${window.gaMeasurementId}`] = true; From 3ea71cbce13554c4d41d2fd63373d3698b98da6f Mon Sep 17 00:00:00 2001 From: George Goodall Date: Fri, 8 Dec 2023 14:25:12 +0000 Subject: [PATCH 5/5] fixed test --- tests/unit/javascript/cookies.test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/javascript/cookies.test.js b/tests/unit/javascript/cookies.test.js index 5608bfa7..d8554ff1 100644 --- a/tests/unit/javascript/cookies.test.js +++ b/tests/unit/javascript/cookies.test.js @@ -141,10 +141,10 @@ describe('cookies.js', () => { window.gaMeasurementId = fakeMeasurementId; setCookie('cookies_policy', JSON.stringify({usage: true})); setTrackingCookies(); - expect(window[`ga-disable-${fakeMeasurementId}`]).toBe(false); + expect(window[`ga-disable-${fakeMeasurementId}`]).toBe(true); - expect(Array.from(dataLayer[0])).toEqual(['js', new Date()]); - expect(Array.from(dataLayer[1])).toEqual(['config', fakeMeasurementId]); + // expect(Array.from(dataLayer[0])).toEqual(['js', new Date()]); + // expect(Array.from(dataLayer[1])).toEqual(['config', fakeMeasurementId]); }) })