Skip to content

Commit

Permalink
Cleaner fix - without prettier added extra changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Carl-OW committed Nov 14, 2024
1 parent f98b596 commit e7bff85
Showing 1 changed file with 158 additions and 186 deletions.
344 changes: 158 additions & 186 deletions src/main/resources/site/pages/default/default.html
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit e7bff85

Please sign in to comment.