Merge branch 'main' into entityRowValuesToLinks

digital-land · Jan 16, 2024 · e5e7488 · e5e7488
2 parents a5a174c + a022f92
commit e5e7488
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 6 deletions.
diff --git 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 %}
   <main id="content">

diff --git 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
@@ -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/index.html b/application/templates/pages/guidance/specifications/index.html
@@ -17,7 +17,9 @@
 
   <ul class="govuk-list govuk-list--spaced">
     <li><a href="article-4-direction">Article 4 Direction data</a></li>
+    <li><a href="https://www.gov.uk/government/publications/brownfield-land-registers-data-standard/publish-your-brownfield-land-data">Brownfield land data</a></li>
     <li><a href="conservation-area">Conservation area data</a></li>
+    <li><a href="https://www.gov.uk/guidance/publish-your-developer-contributions-data">Developer contributions data</a></li>
     <li><a href="listed-building">Listed building data</a></li>
     <li><a href="tree-preservation-order">Tree preservation order data</a></li>
   </ul>

diff --git 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
@@ -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 }})

diff --git 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, <a href="https://docs.google.com/forms/d/e/1FAIpQLSc1yzvw1Duv6nQRS56p379IxxMdAC5EfklMfUnCVMikgbi0Xw/viewform" target="_blank">sign up to take part in research</a>',
+    'html': 'This is a new service – to help us improve it, <a href="https://docs.google.com/forms/d/e/1FAIpQLSc1yzvw1Duv6nQRS56p379IxxMdAC5EfklMfUnCVMikgbi0Xw/viewform" target="_blank" class="govuk-link">sign up to take part in research</a>',
     '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;'
     }
   })
 }}
diff --git 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;

diff --git 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]);
 
         })
     })