From f98b596fcb8d9871c1e745017dc3600c7c1f9eff Mon Sep 17 00:00:00 2001
From: Carl-OW <142233642+Carl-OW@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:29:33 +0100
Subject: [PATCH 1/3] Fix

---
 .../resources/site/pages/default/default.html | 342 ++++++++++--------
 1 file changed, 186 insertions(+), 156 deletions(-)
diff --git a/src/main/resources/site/pages/default/default.html b/src/main/resources/site/pages/default/default.html
index f94f33778..a45f81787 100644
--- a/src/main/resources/site/pages/default/default.html
+++ b/src/main/resources/site/pages/default/default.html
@@ -1,191 +1,221 @@
 <html data-th-lang="${language.code}">
-
-<head>
-  <script>
-    window.dataLayer = window.dataLayer || [];
-  </script>
-  <!-- Google Tag Manager -->
-  <script th:inline="javascript" data-th-if="${GTM_TRACKING_ID}">
-    (function (w, d, s, l, i) {
-      w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
-      var f = d.getElementsByTagName(s)[0],
-        j = d.createElement(s),
-        dl = l != 'dataLayer' ? '&l=' + l : '';
-      j.defer = true;
-      j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl[(${ GTM_AUTH } ?'+"&gtm_auth=' + ${ GTM_AUTH } +'&gtm_preview=env-3&gtm_cookies_win=x"' : '')];
-      f.parentNode.insertBefore(j, f);
-    })(window, document, 'script', 'dataLayer', [[${ GTM_TRACKING_ID }]]);
-  </script>
-  <!-- End Google Tag Manager -->
-
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta data-th-if="${page.data.metaDescription}" name="description" data-th-content="${page.data.metaDescription}" />
-  <title data-th-text="${pageTitle}"></title>
-  <link rel="preload" data-th-href="${stylesUrl}" as="style" />
-  <link rel="stylesheet" data-th-href="${stylesUrl}" />
-  <link rel="alternate" data-th-if="${alternateLanguageVersionUrl}" data-th-href="${alternateLanguageVersionUrl}"
-    data-th-hreflang="${language.alternate}" />
-  <link data-th-if="${canonicalUrl}" rel="canonical" data-th-href="${canonicalUrl}" />
-
-</head>
-
-<body class="xp-page" data-th-classappend="${bodyClasses}">
-  <!-- Google Tag Manager (noscript) -->
-  <noscript data-th-if="${GTM_TRACKING_ID}">
-    <iframe title="GTM tag"
-      data-th-src="'https://www.googletagmanager.com/ns.html?id=' + ${GTM_TRACKING_ID} + (${GTM_AUTH} ? '&gtm_auth='+${GTM_AUTH}+'&gtm_preview=env-3&gtm_cookies_win=x' : '')"
-      height="0" width="0" style="display:none;visibility:hidden"></iframe>
-  </noscript>
-  <!-- End Google Tag Manager (noscript) -->
-
-  <!-- HEADER -->
-  <div class="header-wrapper" data-th-unless="${hideHeader}">
-    <div class="container">
-      <div class="row">
-        <div class="col">
-          <div data-th-if="${headerBody}" id="header" data-th-utext="${headerBody}" data-th-remove="tag"></div>
+  <head>
+    <script>
+      window.dataLayer = window.dataLayer || []
+    </script>
+    <!-- Google Tag Manager -->
+    <script th:inline="javascript" data-th-if="${GTM_TRACKING_ID}">
+      (function (w, d, s, l, i) {
+        w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
+        var f = d.getElementsByTagName(s)[0],
+          j = d.createElement(s),
+          dl = l != 'dataLayer' ? '&l=' + l : '';
+        j.defer = true;
+        j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl[(${ GTM_AUTH } ?'+"&gtm_auth=' + ${ GTM_AUTH } +'&gtm_preview=env-3&gtm_cookies_win=x"' : '')];
+        f.parentNode.insertBefore(j, f);
+      })(window, document, 'script', 'dataLayer', [[${ GTM_TRACKING_ID }]]);
+    </script>
+    <!-- End Google Tag Manager -->
+
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta data-th-if="${page.data.metaDescription}" name="description" data-th-content="${page.data.metaDescription}" />
+    <title data-th-text="${pageTitle}"></title>
+    <link rel="preload" data-th-href="${stylesUrl}" as="style" />
+    <link rel="stylesheet" data-th-href="${stylesUrl}" />
+    <link
+      rel="alternate"
+      data-th-if="${alternateLanguageVersionUrl}"
+      data-th-href="${alternateLanguageVersionUrl}"
+      data-th-hreflang="${language.alternate}"
+    />
+    <link data-th-if="${canonicalUrl}" rel="canonical" data-th-href="${canonicalUrl}" />
+  </head>
+
+  <body class="xp-page" data-th-classappend="${bodyClasses}">
+    <!-- Google Tag Manager (noscript) -->
+    <noscript data-th-if="${GTM_TRACKING_ID}">
+      <iframe
+        title="GTM tag"
+        data-th-src="'https://www.googletagmanager.com/ns.html?id=' + ${GTM_TRACKING_ID} + (${GTM_AUTH} ? '&gtm_auth='+${GTM_AUTH}+'&gtm_preview=env-3&gtm_cookies_win=x' : '')"
+        height="0"
+        width="0"
+        style="display: none; visibility: hidden"
+      ></iframe>
+    </noscript>
+    <!-- End Google Tag Manager (noscript) -->
+
+    <!-- HEADER -->
+    <div class="header-wrapper" data-th-unless="${hideHeader}">
+      <div class="container">
+        <div class="row">
+          <div class="col">
+            <div data-th-if="${headerBody}" id="header" data-th-utext="${headerBody}" data-th-remove="tag"></div>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-  <script type="application/ld+json" data-th-if="${jsonLd}" th:inline="javascript">[[${jsonLd}]]</script>
-
-  <div data-th-if="${pageMap}" data-th-remove="tag">
-    <!-- PageMap supplies structured data to search engines, for filtering and rich search -->
-    [(${pageMap})]
-  </div>
+    <script type="application/ld+json" data-th-if="${jsonLd}" th:inline="javascript">
+      [[${jsonLd}]]
+    </script>
 
-  <div id="popup" data-th-if="${popupBody}"></div>
-
-  <!-- Metainfo to make the page searchable -->
-  <div id="metainfo-container" data-th-if="${addMetaInfoSearch}"
-    data-th-insert="~{mimir:/site/includes/metainfoSearch.html}" data-th-remove="tag"></div>
+    <div data-th-if="${pageMap}" data-th-remove="tag">
+      <!-- PageMap supplies structured data to search engines, for filtering and rich search -->
+      [(${pageMap})]
+    </div>
 
-  <!-- MAIN -->
-  <main class="xp-region" id="content" data-th-if="${!isFragment}">
-    <div class="container premain">
-      <div class="row">
-        <div class="col">
-          <div class="container bg-white pt-2 pb-4" data-th-unless="${hideBreadcrumb}">
-            <!-- breadcrumbs -->
-            <div data-th-id="${breadcrumbsReactId}" class="d-print-none"></div>
-          </div>
-          <div id="browser-warning" class="container"></div>
-          <!-- Alerts Info and error -->
-          <section class="xp-part" id="alerts"></section>
-          <!-- Statbank title and links -->
-          <div class="statbank-header container mb-2" data-th-if="${statbankWeb}">
-            <div class="row">
-              <div class="col-md-4">
-                <span class="h2 statbank-title roboto-bold">Statistikkbanken</span>
-              </div>
-              <div class="col-md-8 text-end">
-                <div class="col-md-12">
-                  <a data-th-href="${statbankHelpLink}" class="ssb-link mb-0 roboto-bold">
-                    <span class="link-text" data-th-text="${statbankHelpText}">tom boks statbank-hjelp</span>
-                  </a>
-                </div>
-                <div class="col-md-12">
-                  <a data-th-href="${statbankStatisticsUrl}" class="ssb-link roboto-plain">
-                    <span class="link-text" data-th-text="${statbankMainFigures}">tom boks hovedtall</span>
-                  </a>
+    <div id="popup" data-th-if="${popupBody}"></div>
+
+    <!-- Metainfo to make the page searchable -->
+    <div
+      id="metainfo-container"
+      data-th-if="${addMetaInfoSearch}"
+      data-th-insert="~{mimir:/site/includes/metainfoSearch.html}"
+      data-th-remove="tag"
+    ></div>
+
+    <!-- MAIN -->
+    <main class="xp-region" id="content" data-th-if="${!isFragment}">
+      <div class="container premain">
+        <div class="row">
+          <div class="col">
+            <div class="container bg-white pt-2 pb-4" data-th-unless="${hideBreadcrumb}">
+              <!-- breadcrumbs -->
+              <div data-th-id="${breadcrumbsReactId}" class="d-print-none"></div>
+            </div>
+            <div id="browser-warning" class="container"></div>
+            <!-- Alerts Info and error -->
+            <section class="xp-part" id="alerts"></section>
+            <!-- Statbank title and links -->
+            <div class="statbank-header container mb-2" data-th-if="${statbankWeb}">
+              <div class="row">
+                <div class="col-md-4">
+                  <span class="h2 statbank-title roboto-bold">Statistikkbanken</span>
                 </div>
-                <div class="col-md-12">
-                  <a data-th-href="${language.code == 'en'} ? '/en/statbank' : '/statbank'"
-                    class="ssb-link roboto-plain">
-                    <span class="link-text" data-th-text="${statbankFrontPage}">tom boks statbank-forside</span>
-                  </a>
+                <div class="col-md-8 text-end">
+                  <div class="col-md-12">
+                    <a data-th-href="${statbankHelpLink}" class="ssb-link mb-0 roboto-bold">
+                      <span class="link-text" data-th-text="${statbankHelpText}">tom boks statbank-hjelp</span>
+                    </a>
+                  </div>
+                  <div class="col-md-12">
+                    <a data-th-href="${statbankStatisticsUrl}" class="ssb-link roboto-plain">
+                      <span class="link-text" data-th-text="${statbankMainFigures}">tom boks hovedtall</span>
+                    </a>
+                  </div>
+                  <div class="col-md-12">
+                    <a
+                      data-th-href="${language.code == 'en'} ? '/en/statbank' : '/statbank'"
+                      class="ssb-link roboto-plain"
+                    >
+                      <span class="link-text" data-th-text="${statbankFrontPage}">tom boks statbank-forside</span>
+                    </a>
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-          <!-- Statbank title and placeholder -->
-          <div data-th-if="${statbankWeb}" class="container mb-5">
-            <div class="row">
-              <div class="col">
-                <h1 data-th-text="${statbankStatisticsTitle}"></h1>
+            <!-- Statbank title and placeholder -->
+            <div data-th-if="${statbankWeb}" class="container mb-5">
+              <div class="row">
+                <div class="col">
+                  <h1 data-th-text="${statbankStatisticsTitle}"></h1>
+                </div>
               </div>
+              <div id="statbank-placeholder"></div>
             </div>
-            <div id="statbank-placeholder"></div>
-          </div>
-          <!-- Page Title -->
-          <div data-th-if="${page.data.title}" data-th-unless="${statbankWeb}"
-            class="default-page-title container mb-5">
-            <div class="row">
-              <div class="col">
-                <h1 data-th-text="${page.data.title}"></h1>
+            <!-- Page Title -->
+            <div
+              data-th-if="${page.data.title}"
+              data-th-unless="${statbankWeb}"
+              class="default-page-title container mb-5"
+            >
+              <div class="row">
+                <div class="col">
+                  <h1 data-th-text="${page.data.title}"></h1>
+                </div>
               </div>
             </div>
-          </div>
-          <!-- Page Title Tables in full view -->
-          <div data-th-if="${tableView}" class="default-page-title container mb-5">
-            <div class="row">
-              <div class="col">
-                <h1 data-th-text="${page.displayName}"></h1>
+            <!-- Page Title Tables in full view -->
+            <div data-th-if="${tableView}" class="default-page-title container mb-5">
+              <div class="row">
+                <div class="col">
+                  <h1 data-th-text="${page.displayName}"></h1>
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
 
-    <!-- preview -->
-    <div class="container pt-2" data-th-if="${preview}" data-th-utext="${preview.body}">
-    </div>
+      <!-- preview -->
+      <div class="container pt-2" data-th-if="${preview}" data-th-utext="${preview.body}"></div>
 
-    <div data-th-each="region : ${configRegions}" data-th-remove="tag" data-th-unless="${statbankWeb}">
-      <div data-th-if="${region.showGreyTriangle}" class="grey-triangle"></div>
-      <div
-        data-th-classappend="${region.showDarkGreyBackground ? 'region-dark-grey' : (region.showGreyBackground ? 'region-grey' : (region.topBorder ? 'border-columns' : ''))}">
+      <div data-th-each="region : ${configRegions}" data-th-remove="tag" data-th-unless="${statbankWeb}">
+        <div data-th-if="${region.showGreyTriangle}" class="grey-triangle"></div>
         <div
-          data-th-classappend="${region.view == 'full' ? 'container-fluid full-width' : region.view == 'card' ? 'border-top-green container' : 'container'}">
-          <!-- Subtitle for content in default pages -->
-          <div data-th-if="${region.view != 'card'}" class="default-page-subtitle row">
-            <div class="col">
-              <div class="container">
-                <div class="row">
-                  <div class="col">
-                    <h2 data-th-if="${region.hideTitle && region.title}" class="sr-only sr-only-focusable mb-5"
-                      data-th-text="${region.title}"></h2>
-                    <h2 data-th-if="${!region.hideTitle && region.title}" class="mb-5 mt-2 pt-5"
-                      data-th-text="${region.title}"></h2>
+          data-th-classappend="${region.showDarkGreyBackground ? 'region-dark-grey' : (region.showGreyBackground ? 'region-grey' : (region.topBorder ? 'border-columns' : ''))}"
+        >
+          <div
+            data-th-classappend="${region.view == 'full' ? 'container-fluid full-width' : region.view == 'card' ? 'border-top-green container' : 'container'}"
+          >
+            <!-- Subtitle for content in default pages -->
+            <div data-th-if="${region.view != 'card'}" class="default-page-subtitle row">
+              <div class="col">
+                <div class="container">
+                  <div class="row">
+                    <div class="col">
+                      <h2
+                        data-th-if="${region.hideTitle && region.title}"
+                        style="display: none"
+                        class="sr-only sr-only-focusable mb-5"
+                        data-th-text="${region.title}"
+                      ></h2>
+                      <h2
+                        data-th-if="${!region.hideTitle && region.title}"
+                        class="mb-5 mt-2 pt-5"
+                        data-th-text="${region.title}"
+                      ></h2>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div>
 
-          <!-- Subtitle for content in border-top-green containers -->
-          <h2 data-th-if="${region.view == 'card' && region.hideTitle && region.title}"
-            class="sr-only sr-only-focusable mb-5" data-th-text="${region.title}"></h2>
-          <h2 data-th-if="${region.view == 'card' && !region.hideTitle && region.title}" class="mb-5"
-            data-th-text="${region.title}"></h2>
-
-          <div class="row row-cols-1" data-th-data-portal-region="${region.region}">
-            <div data-th-each="component : ${region.components}" data-th-remove="tag">
-              <div data-portal-component="${component.path}" data-th-remove="tag" />
+            <!-- Subtitle for content in border-top-green containers -->
+            <h2
+              data-th-if="${region.view == 'card' && region.hideTitle && region.title}"
+              style="display: none"
+              class="sr-only sr-only-focusable mb-5"
+              data-th-text="${region.title}"
+            ></h2>
+            <h2
+              data-th-if="${region.view == 'card' && !region.hideTitle && region.title}"
+              class="mb-5"
+              data-th-text="${region.title}"
+            ></h2>
+
+            <div class="row row-cols-1" data-th-data-portal-region="${region.region}">
+              <div data-th-each="component : ${region.components}" data-th-remove="tag">
+                <div data-portal-component="${component.path}" data-th-remove="tag" />
+              </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
-    <div data-th-if="${mainRegionComponents}" data-portal-region="main" data-th-unless="${statbankWeb}">
-      <div data-th-each="component : ${mainRegionComponents}" data-th-remove="tag">
-        <div data-portal-component="${component.path}" data-th-remove="tag"></div>
+      <div data-th-if="${mainRegionComponents}" data-portal-region="main" data-th-unless="${statbankWeb}">
+        <div data-th-each="component : ${mainRegionComponents}" data-th-remove="tag">
+          <div data-portal-component="${component.path}" data-th-remove="tag"></div>
+        </div>
       </div>
-    </div>
-  </main>
-
-  <main class="xp-region" id="content" data-th-if="${isFragment}">
-    <div data-portal-component="fragment" data-th-remove="tag"></div>
-  </main>
+    </main>
 
-  <!-- FOOTER -->
-  <footer data-th-if="${footerBody}" id="footer" data-th-utext="${footerBody}" data-th-remove="tag">
-  </footer>
+    <main class="xp-region" id="content" data-th-if="${isFragment}">
+      <div data-portal-component="fragment" data-th-remove="tag"></div>
+    </main>
 
-  <script data-th-src="${ieUrl}" defer></script>
-</body>
+    <!-- FOOTER -->
+    <footer data-th-if="${footerBody}" id="footer" data-th-utext="${footerBody}" data-th-remove="tag"></footer>
 
-</html>
\ No newline at end of file
+    <script data-th-src="${ieUrl}" defer></script>
+  </body>
+</html>

From e7bff85c7f7d69b4443b38ea2995f5d5c453a2c4 Mon Sep 17 00:00:00 2001
From: Carl-OW <142233642+Carl-OW@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:37:13 +0100
Subject: [PATCH 2/3] Cleaner fix - without prettier added extra changes

---
 .../resources/site/pages/default/default.html | 344 ++++++++----------
 1 file changed, 158 insertions(+), 186 deletions(-)

diff --git a/src/main/resources/site/pages/default/default.html b/src/main/resources/site/pages/default/default.html
index a45f81787..26e2d1ae6 100644
--- a/src/main/resources/site/pages/default/default.html
+++ b/src/main/resources/site/pages/default/default.html
@@ -1,221 +1,193 @@
 <html data-th-lang="${language.code}">
-  <head>
-    <script>
-      window.dataLayer = window.dataLayer || []
-    </script>
-    <!-- Google Tag Manager -->
-    <script th:inline="javascript" data-th-if="${GTM_TRACKING_ID}">
-      (function (w, d, s, l, i) {
-        w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
-        var f = d.getElementsByTagName(s)[0],
-          j = d.createElement(s),
-          dl = l != 'dataLayer' ? '&l=' + l : '';
-        j.defer = true;
-        j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl[(${ GTM_AUTH } ?'+"&gtm_auth=' + ${ GTM_AUTH } +'&gtm_preview=env-3&gtm_cookies_win=x"' : '')];
-        f.parentNode.insertBefore(j, f);
-      })(window, document, 'script', 'dataLayer', [[${ GTM_TRACKING_ID }]]);
-    </script>
-    <!-- End Google Tag Manager -->
-
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta data-th-if="${page.data.metaDescription}" name="description" data-th-content="${page.data.metaDescription}" />
-    <title data-th-text="${pageTitle}"></title>
-    <link rel="preload" data-th-href="${stylesUrl}" as="style" />
-    <link rel="stylesheet" data-th-href="${stylesUrl}" />
-    <link
-      rel="alternate"
-      data-th-if="${alternateLanguageVersionUrl}"
-      data-th-href="${alternateLanguageVersionUrl}"
-      data-th-hreflang="${language.alternate}"
-    />
-    <link data-th-if="${canonicalUrl}" rel="canonical" data-th-href="${canonicalUrl}" />
-  </head>
-
-  <body class="xp-page" data-th-classappend="${bodyClasses}">
-    <!-- Google Tag Manager (noscript) -->
-    <noscript data-th-if="${GTM_TRACKING_ID}">
-      <iframe
-        title="GTM tag"
-        data-th-src="'https://www.googletagmanager.com/ns.html?id=' + ${GTM_TRACKING_ID} + (${GTM_AUTH} ? '&gtm_auth='+${GTM_AUTH}+'&gtm_preview=env-3&gtm_cookies_win=x' : '')"
-        height="0"
-        width="0"
-        style="display: none; visibility: hidden"
-      ></iframe>
-    </noscript>
-    <!-- End Google Tag Manager (noscript) -->
-
-    <!-- HEADER -->
-    <div class="header-wrapper" data-th-unless="${hideHeader}">
-      <div class="container">
-        <div class="row">
-          <div class="col">
-            <div data-th-if="${headerBody}" id="header" data-th-utext="${headerBody}" data-th-remove="tag"></div>
-          </div>
+
+<head>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+  </script>
+  <!-- Google Tag Manager -->
+  <script th:inline="javascript" data-th-if="${GTM_TRACKING_ID}">
+    (function (w, d, s, l, i) {
+      w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
+      var f = d.getElementsByTagName(s)[0],
+        j = d.createElement(s),
+        dl = l != 'dataLayer' ? '&l=' + l : '';
+      j.defer = true;
+      j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl[(${ GTM_AUTH } ?'+"&gtm_auth=' + ${ GTM_AUTH } +'&gtm_preview=env-3&gtm_cookies_win=x"' : '')];
+      f.parentNode.insertBefore(j, f);
+    })(window, document, 'script', 'dataLayer', [[${ GTM_TRACKING_ID }]]);
+  </script>
+  <!-- End Google Tag Manager -->
+
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta data-th-if="${page.data.metaDescription}" name="description" data-th-content="${page.data.metaDescription}" />
+  <title data-th-text="${pageTitle}"></title>
+  <link rel="preload" data-th-href="${stylesUrl}" as="style" />
+  <link rel="stylesheet" data-th-href="${stylesUrl}" />
+  <link rel="alternate" data-th-if="${alternateLanguageVersionUrl}" data-th-href="${alternateLanguageVersionUrl}"
+    data-th-hreflang="${language.alternate}" />
+  <link data-th-if="${canonicalUrl}" rel="canonical" data-th-href="${canonicalUrl}" />
+
+</head>
+
+<body class="xp-page" data-th-classappend="${bodyClasses}">
+  <!-- Google Tag Manager (noscript) -->
+  <noscript data-th-if="${GTM_TRACKING_ID}">
+    <iframe title="GTM tag"
+      data-th-src="'https://www.googletagmanager.com/ns.html?id=' + ${GTM_TRACKING_ID} + (${GTM_AUTH} ? '&gtm_auth='+${GTM_AUTH}+'&gtm_preview=env-3&gtm_cookies_win=x' : '')"
+      height="0" width="0" style="display:none;visibility:hidden"></iframe>
+  </noscript>
+  <!-- End Google Tag Manager (noscript) -->
+
+  <!-- HEADER -->
+  <div class="header-wrapper" data-th-unless="${hideHeader}">
+    <div class="container">
+      <div class="row">
+        <div class="col">
+          <div data-th-if="${headerBody}" id="header" data-th-utext="${headerBody}" data-th-remove="tag"></div>
         </div>
       </div>
     </div>
-    <script type="application/ld+json" data-th-if="${jsonLd}" th:inline="javascript">
-      [[${jsonLd}]]
-    </script>
+  </div>
+  <script type="application/ld+json" data-th-if="${jsonLd}" th:inline="javascript">[[${jsonLd}]]</script>
 
-    <div data-th-if="${pageMap}" data-th-remove="tag">
-      <!-- PageMap supplies structured data to search engines, for filtering and rich search -->
-      [(${pageMap})]
-    </div>
+  <div data-th-if="${pageMap}" data-th-remove="tag">
+    <!-- PageMap supplies structured data to search engines, for filtering and rich search -->
+    [(${pageMap})]
+  </div>
 
-    <div id="popup" data-th-if="${popupBody}"></div>
-
-    <!-- Metainfo to make the page searchable -->
-    <div
-      id="metainfo-container"
-      data-th-if="${addMetaInfoSearch}"
-      data-th-insert="~{mimir:/site/includes/metainfoSearch.html}"
-      data-th-remove="tag"
-    ></div>
-
-    <!-- MAIN -->
-    <main class="xp-region" id="content" data-th-if="${!isFragment}">
-      <div class="container premain">
-        <div class="row">
-          <div class="col">
-            <div class="container bg-white pt-2 pb-4" data-th-unless="${hideBreadcrumb}">
-              <!-- breadcrumbs -->
-              <div data-th-id="${breadcrumbsReactId}" class="d-print-none"></div>
-            </div>
-            <div id="browser-warning" class="container"></div>
-            <!-- Alerts Info and error -->
-            <section class="xp-part" id="alerts"></section>
-            <!-- Statbank title and links -->
-            <div class="statbank-header container mb-2" data-th-if="${statbankWeb}">
-              <div class="row">
-                <div class="col-md-4">
-                  <span class="h2 statbank-title roboto-bold">Statistikkbanken</span>
+  <div id="popup" data-th-if="${popupBody}"></div>
+
+  <!-- Metainfo to make the page searchable -->
+  <div id="metainfo-container" data-th-if="${addMetaInfoSearch}"
+    data-th-insert="~{mimir:/site/includes/metainfoSearch.html}" data-th-remove="tag"></div>
+
+  <!-- MAIN -->
+  <main class="xp-region" id="content" data-th-if="${!isFragment}">
+    <div class="container premain">
+      <div class="row">
+        <div class="col">
+          <div class="container bg-white pt-2 pb-4" data-th-unless="${hideBreadcrumb}">
+            <!-- breadcrumbs -->
+            <div data-th-id="${breadcrumbsReactId}" class="d-print-none"></div>
+          </div>
+          <div id="browser-warning" class="container"></div>
+          <!-- Alerts Info and error -->
+          <section class="xp-part" id="alerts"></section>
+          <!-- Statbank title and links -->
+          <div class="statbank-header container mb-2" data-th-if="${statbankWeb}">
+            <div class="row">
+              <div class="col-md-4">
+                <span class="h2 statbank-title roboto-bold">Statistikkbanken</span>
+              </div>
+              <div class="col-md-8 text-end">
+                <div class="col-md-12">
+                  <a data-th-href="${statbankHelpLink}" class="ssb-link mb-0 roboto-bold">
+                    <span class="link-text" data-th-text="${statbankHelpText}">tom boks statbank-hjelp</span>
+                  </a>
                 </div>
-                <div class="col-md-8 text-end">
-                  <div class="col-md-12">
-                    <a data-th-href="${statbankHelpLink}" class="ssb-link mb-0 roboto-bold">
-                      <span class="link-text" data-th-text="${statbankHelpText}">tom boks statbank-hjelp</span>
-                    </a>
-                  </div>
-                  <div class="col-md-12">
-                    <a data-th-href="${statbankStatisticsUrl}" class="ssb-link roboto-plain">
-                      <span class="link-text" data-th-text="${statbankMainFigures}">tom boks hovedtall</span>
-                    </a>
-                  </div>
-                  <div class="col-md-12">
-                    <a
-                      data-th-href="${language.code == 'en'} ? '/en/statbank' : '/statbank'"
-                      class="ssb-link roboto-plain"
-                    >
-                      <span class="link-text" data-th-text="${statbankFrontPage}">tom boks statbank-forside</span>
-                    </a>
-                  </div>
+                <div class="col-md-12">
+                  <a data-th-href="${statbankStatisticsUrl}" class="ssb-link roboto-plain">
+                    <span class="link-text" data-th-text="${statbankMainFigures}">tom boks hovedtall</span>
+                  </a>
+                </div>
+                <div class="col-md-12">
+                  <a data-th-href="${language.code == 'en'} ? '/en/statbank' : '/statbank'"
+                    class="ssb-link roboto-plain">
+                    <span class="link-text" data-th-text="${statbankFrontPage}">tom boks statbank-forside</span>
+                  </a>
                 </div>
               </div>
             </div>
-            <!-- Statbank title and placeholder -->
-            <div data-th-if="${statbankWeb}" class="container mb-5">
-              <div class="row">
-                <div class="col">
-                  <h1 data-th-text="${statbankStatisticsTitle}"></h1>
-                </div>
+          </div>
+          <!-- Statbank title and placeholder -->
+          <div data-th-if="${statbankWeb}" class="container mb-5">
+            <div class="row">
+              <div class="col">
+                <h1 data-th-text="${statbankStatisticsTitle}"></h1>
               </div>
-              <div id="statbank-placeholder"></div>
             </div>
-            <!-- Page Title -->
-            <div
-              data-th-if="${page.data.title}"
-              data-th-unless="${statbankWeb}"
-              class="default-page-title container mb-5"
-            >
-              <div class="row">
-                <div class="col">
-                  <h1 data-th-text="${page.data.title}"></h1>
-                </div>
+            <div id="statbank-placeholder"></div>
+          </div>
+          <!-- Page Title -->
+          <div data-th-if="${page.data.title}" data-th-unless="${statbankWeb}"
+            class="default-page-title container mb-5">
+            <div class="row">
+              <div class="col">
+                <h1 data-th-text="${page.data.title}"></h1>
               </div>
             </div>
-            <!-- Page Title Tables in full view -->
-            <div data-th-if="${tableView}" class="default-page-title container mb-5">
-              <div class="row">
-                <div class="col">
-                  <h1 data-th-text="${page.displayName}"></h1>
-                </div>
+          </div>
+          <!-- Page Title Tables in full view -->
+          <div data-th-if="${tableView}" class="default-page-title container mb-5">
+            <div class="row">
+              <div class="col">
+                <h1 data-th-text="${page.displayName}"></h1>
               </div>
             </div>
           </div>
         </div>
       </div>
+    </div>
 
-      <!-- preview -->
-      <div class="container pt-2" data-th-if="${preview}" data-th-utext="${preview.body}"></div>
+    <!-- preview -->
+    <div class="container pt-2" data-th-if="${preview}" data-th-utext="${preview.body}">
+    </div>
 
-      <div data-th-each="region : ${configRegions}" data-th-remove="tag" data-th-unless="${statbankWeb}">
-        <div data-th-if="${region.showGreyTriangle}" class="grey-triangle"></div>
+    <div data-th-each="region : ${configRegions}" data-th-remove="tag" data-th-unless="${statbankWeb}">
+      <div data-th-if="${region.showGreyTriangle}" class="grey-triangle"></div>
+      <div
+        data-th-classappend="${region.showDarkGreyBackground ? 'region-dark-grey' : (region.showGreyBackground ? 'region-grey' : (region.topBorder ? 'border-columns' : ''))}">
         <div
-          data-th-classappend="${region.showDarkGreyBackground ? 'region-dark-grey' : (region.showGreyBackground ? 'region-grey' : (region.topBorder ? 'border-columns' : ''))}"
-        >
-          <div
-            data-th-classappend="${region.view == 'full' ? 'container-fluid full-width' : region.view == 'card' ? 'border-top-green container' : 'container'}"
-          >
-            <!-- Subtitle for content in default pages -->
-            <div data-th-if="${region.view != 'card'}" class="default-page-subtitle row">
-              <div class="col">
-                <div class="container">
-                  <div class="row">
-                    <div class="col">
-                      <h2
-                        data-th-if="${region.hideTitle && region.title}"
-                        style="display: none"
-                        class="sr-only sr-only-focusable mb-5"
-                        data-th-text="${region.title}"
-                      ></h2>
-                      <h2
-                        data-th-if="${!region.hideTitle && region.title}"
-                        class="mb-5 mt-2 pt-5"
-                        data-th-text="${region.title}"
-                      ></h2>
-                    </div>
+          data-th-classappend="${region.view == 'full' ? 'container-fluid full-width' : region.view == 'card' ? 'border-top-green container' : 'container'}">
+          <!-- Subtitle for content in default pages -->
+          <div data-th-if="${region.view != 'card'}" class="default-page-subtitle row">
+            <div class="col">
+              <div class="container">
+                <div class="row">
+                  <div class="col">
+                    <h2 data-th-if="${region.hideTitle && region.title}" class="sr-only sr-only-focusable mb-5" 
+                      style="display: none;"
+                      data-th-text="${region.title}"></h2>
+                    <h2 data-th-if="${!region.hideTitle && region.title}" class="mb-5 mt-2 pt-5"
+                      data-th-text="${region.title}"></h2>
                   </div>
                 </div>
               </div>
             </div>
+          </div>
 
-            <!-- Subtitle for content in border-top-green containers -->
-            <h2
-              data-th-if="${region.view == 'card' && region.hideTitle && region.title}"
-              style="display: none"
-              class="sr-only sr-only-focusable mb-5"
-              data-th-text="${region.title}"
-            ></h2>
-            <h2
-              data-th-if="${region.view == 'card' && !region.hideTitle && region.title}"
-              class="mb-5"
-              data-th-text="${region.title}"
-            ></h2>
-
-            <div class="row row-cols-1" data-th-data-portal-region="${region.region}">
-              <div data-th-each="component : ${region.components}" data-th-remove="tag">
-                <div data-portal-component="${component.path}" data-th-remove="tag" />
-              </div>
+          <!-- Subtitle for content in border-top-green containers -->
+          <h2 data-th-if="${region.view == 'card' && region.hideTitle && region.title}"
+            style="display: none;"
+            class="sr-only sr-only-focusable mb-5" data-th-text="${region.title}"></h2>
+          <h2 data-th-if="${region.view == 'card' && !region.hideTitle && region.title}" class="mb-5"
+            data-th-text="${region.title}"></h2>
+
+          <div class="row row-cols-1" data-th-data-portal-region="${region.region}">
+            <div data-th-each="component : ${region.components}" data-th-remove="tag">
+              <div data-portal-component="${component.path}" data-th-remove="tag" />
             </div>
           </div>
         </div>
       </div>
-      <div data-th-if="${mainRegionComponents}" data-portal-region="main" data-th-unless="${statbankWeb}">
-        <div data-th-each="component : ${mainRegionComponents}" data-th-remove="tag">
-          <div data-portal-component="${component.path}" data-th-remove="tag"></div>
-        </div>
+    </div>
+    <div data-th-if="${mainRegionComponents}" data-portal-region="main" data-th-unless="${statbankWeb}">
+      <div data-th-each="component : ${mainRegionComponents}" data-th-remove="tag">
+        <div data-portal-component="${component.path}" data-th-remove="tag"></div>
       </div>
-    </main>
+    </div>
+  </main>
+
+  <main class="xp-region" id="content" data-th-if="${isFragment}">
+    <div data-portal-component="fragment" data-th-remove="tag"></div>
+  </main>
 
-    <main class="xp-region" id="content" data-th-if="${isFragment}">
-      <div data-portal-component="fragment" data-th-remove="tag"></div>
-    </main>
+  <!-- FOOTER -->
+  <footer data-th-if="${footerBody}" id="footer" data-th-utext="${footerBody}" data-th-remove="tag">
+  </footer>
 
-    <!-- FOOTER -->
-    <footer data-th-if="${footerBody}" id="footer" data-th-utext="${footerBody}" data-th-remove="tag"></footer>
+  <script data-th-src="${ieUrl}" defer></script>
+</body>
 
-    <script data-th-src="${ieUrl}" defer></script>
-  </body>
-</html>
+</html>
\ No newline at end of file

From 3863c1bc4a553a35805919aaf1e4e2fa819367f8 Mon Sep 17 00:00:00 2001
From: Carl-OW <142233642+Carl-OW@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:38:49 +0100
Subject: [PATCH 3/3] d-none

---
 src/main/resources/site/pages/default/default.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/site/pages/default/default.html b/src/main/resources/site/pages/default/default.html
index 26e2d1ae6..b35ab04a2 100644
--- a/src/main/resources/site/pages/default/default.html
+++ b/src/main/resources/site/pages/default/default.html
@@ -146,8 +146,7 @@ <h1 data-th-text="${page.displayName}"></h1>
               <div class="container">
                 <div class="row">
                   <div class="col">
-                    <h2 data-th-if="${region.hideTitle && region.title}" class="sr-only sr-only-focusable mb-5" 
-                      style="display: none;"
+                    <h2 data-th-if="${region.hideTitle && region.title}" class="d-none mb-5" 
                       data-th-text="${region.title}"></h2>
                     <h2 data-th-if="${!region.hideTitle && region.title}" class="mb-5 mt-2 pt-5"
                       data-th-text="${region.title}"></h2>
@@ -159,8 +158,7 @@ <h1 data-th-text="${page.displayName}"></h1>
 
           <!-- Subtitle for content in border-top-green containers -->
           <h2 data-th-if="${region.view == 'card' && region.hideTitle && region.title}"
-            style="display: none;"
-            class="sr-only sr-only-focusable mb-5" data-th-text="${region.title}"></h2>
+            class="d-none mb-5" data-th-text="${region.title}"></h2>
           <h2 data-th-if="${region.view == 'card' && !region.hideTitle && region.title}" class="mb-5"
             data-th-text="${region.title}"></h2>
 
