From 3859b186716d58aba4c325c3bd465f4cb19d7370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Thu, 4 Oct 2018 15:07:50 +0200
Subject: [PATCH] Clean HTML source

---
 composer.json                                 |   1 -
 composer.lock                                 | 187 +++++-------------
 .../Layouts/FluidStyledContent/Default.html   |  10 +-
 .../Private/Layouts/Form/Default.html         |   8 +-
 .../Private/Layouts/Gridelements/Default.html |  10 +-
 .../Private/Layouts/Product/Default.html      |   8 +-
 .../Private/Layouts/SocialMedia/Default.html  |   1 -
 .../Private/Partials/Header/Header.html       | 103 +++++-----
 8 files changed, 109 insertions(+), 219 deletions(-)

diff --git a/composer.json b/composer.json
index 555aaa92..024dad24 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,6 @@
     "typo3-ter/media": "^4.5",
     "typo3-ter/ods-redirects": "^1.3",
     "typo3-ter/pb-social": "^1.3",
-    "typo3-ter/sourceopt": "^1.0",
     "typo3-ter/html-compress": "^1.1",
     "yohang/calendr": "^2.1",
     "wyrihaximus/html-compress": "^1.4",
diff --git a/composer.lock b/composer.lock
index 17c5e81a..1a0447c6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "40771053625b784cf25db1a787dc19b4",
+    "content-hash": "5f4841fc9f952af0dcb544320b4a975f",
     "packages": [
         {
             "name": "christophlehmann/imageoptimizer",
@@ -1882,16 +1882,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.4.15",
+            "version": "v3.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73"
+                "reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73",
-                "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73",
+                "url": "https://api.github.com/repos/symfony/console/zipball/3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
+                "reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
                 "shasum": ""
             },
             "require": {
@@ -1947,20 +1947,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:19:56+00:00"
+            "time": "2018-10-02T16:33:53+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "47ead688f1f2877f3f14219670f52e4722ee7052"
+                "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/47ead688f1f2877f3f14219670f52e4722ee7052",
-                "reference": "47ead688f1f2877f3f14219670f52e4722ee7052",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/e3f76ce6198f81994e019bb2b4e533e9de1b9b90",
+                "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90",
                 "shasum": ""
             },
             "require": {
@@ -2003,20 +2003,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-03T11:13:38+00:00"
+            "time": "2018-10-02T16:36:10+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068"
+                "reference": "1f17195b44543017a9c9b2d437c670627e96ad06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/e162f1df3102d0b7472805a5a9d5db9fcf0a8068",
-                "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06",
+                "reference": "1f17195b44543017a9c9b2d437c670627e96ad06",
                 "shasum": ""
             },
             "require": {
@@ -2052,11 +2052,11 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:24:31+00:00"
+            "time": "2018-10-03T08:47:56+00:00"
         },
         {
             "name": "symfony/inflector",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/inflector.git",
@@ -2114,16 +2114,16 @@
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v3.4.15",
+            "version": "v3.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "6debc476953a45969ab39afe8dee0b825f356dc7"
+                "reference": "1cf7d8e704a9cc4164c92e430f2dfa3e6983661d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/6debc476953a45969ab39afe8dee0b825f356dc7",
-                "reference": "6debc476953a45969ab39afe8dee0b825f356dc7",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/1cf7d8e704a9cc4164c92e430f2dfa3e6983661d",
+                "reference": "1cf7d8e704a9cc4164c92e430f2dfa3e6983661d",
                 "shasum": ""
             },
             "require": {
@@ -2164,7 +2164,7 @@
                 "configuration",
                 "options"
             ],
-            "time": "2018-07-26T08:45:46+00:00"
+            "time": "2018-09-17T17:29:18+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2344,16 +2344,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v3.4.15",
+            "version": "v3.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "4d6b125d5293cbceedc2aa10f2c71617e76262e7"
+                "reference": "1dc2977afa7d70f90f3fefbcd84152813558910e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/4d6b125d5293cbceedc2aa10f2c71617e76262e7",
-                "reference": "4d6b125d5293cbceedc2aa10f2c71617e76262e7",
+                "url": "https://api.github.com/repos/symfony/process/zipball/1dc2977afa7d70f90f3fefbcd84152813558910e",
+                "reference": "1dc2977afa7d70f90f3fefbcd84152813558910e",
                 "shasum": ""
             },
             "require": {
@@ -2389,20 +2389,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-03T10:42:44+00:00"
+            "time": "2018-10-02T12:28:39+00:00"
         },
         {
             "name": "symfony/property-access",
-            "version": "v3.4.15",
+            "version": "v3.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-access.git",
-                "reference": "8c892ce455ef55b3e22769cc27a7aa2e0983bff1"
+                "reference": "a62b882330f24b43f4409e50a0692aa433947460"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/8c892ce455ef55b3e22769cc27a7aa2e0983bff1",
-                "reference": "8c892ce455ef55b3e22769cc27a7aa2e0983bff1",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/a62b882330f24b43f4409e50a0692aa433947460",
+                "reference": "a62b882330f24b43f4409e50a0692aa433947460",
                 "shasum": ""
             },
             "require": {
@@ -2457,20 +2457,20 @@
                 "property path",
                 "reflection"
             ],
-            "time": "2018-08-24T10:16:13+00:00"
+            "time": "2018-10-02T12:28:39+00:00"
         },
         {
             "name": "symfony/serializer",
-            "version": "v3.4.15",
+            "version": "v3.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "40031683816470610af87c2d03ea86d1cf0f0104"
+                "reference": "8bc00ef47a428bfebc4641f29d158e7c56137fcb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/40031683816470610af87c2d03ea86d1cf0f0104",
-                "reference": "40031683816470610af87c2d03ea86d1cf0f0104",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/8bc00ef47a428bfebc4641f29d158e7c56137fcb",
+                "reference": "8bc00ef47a428bfebc4641f29d158e7c56137fcb",
                 "shasum": ""
             },
             "require": {
@@ -2536,20 +2536,20 @@
             ],
             "description": "Symfony Serializer Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:58:24+00:00"
+            "time": "2018-10-02T12:28:39+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "b832cc289608b6d305f62149df91529a2ab3c314"
+                "reference": "367e689b2fdc19965be435337b50bc8adf2746c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314",
-                "reference": "b832cc289608b6d305f62149df91529a2ab3c314",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9",
+                "reference": "367e689b2fdc19965be435337b50bc8adf2746c9",
                 "shasum": ""
             },
             "require": {
@@ -2595,7 +2595,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-18T16:52:46+00:00"
+            "time": "2018-10-02T16:36:10+00:00"
         },
         {
             "name": "tedivm/jshrink",
@@ -2791,40 +2791,6 @@
             "homepage": "https://extensions.typo3.org/extension/pb_social/",
             "time": "2018-02-14T11:05:37+00:00"
         },
-        {
-            "name": "typo3-ter/sourceopt",
-            "version": "1.0.0",
-            "dist": {
-                "type": "zip",
-                "url": "https://extensions.typo3.org/extension/download/sourceopt/1.0.0/zip/",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">= 5.6.0",
-                "typo3/cms-core": ">= 7.6.0, <= 8.7.99"
-            },
-            "replace": {
-                "sourceopt": "self.version"
-            },
-            "type": "typo3-cms-extension",
-            "autoload": {
-                "psr-4": {
-                    "HTML\\Sourceopt\\": "Classes/"
-                }
-            },
-            "authors": [
-                {
-                    "name": "Dr. Ronald P. Steiner, Boris Nicolai, Tim Lochmueller",
-                    "email": "ronald.steiner@googlemail.com, boris.nicolai@andavida.com, tim@fruit-lab.de",
-                    "company": "",
-                    "username": "spyker"
-                }
-            ],
-            "description": "Optimization of the final page: reformatting the (x)html output, removal of new lines, and quotes. Move development repository to https://github.com/lochmueller/sourceopt",
-            "homepage": "https://extensions.typo3.org/extension/sourceopt/",
-            "time": "2017-06-15T17:25:53+00:00"
-        },
         {
             "name": "typo3-ter/vidi",
             "version": "2.7.1",
@@ -2860,16 +2826,16 @@
         },
         {
             "name": "typo3/class-alias-loader",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/class-alias-loader.git",
-                "reference": "a9dd295c81ed0b51455644be420ab9210cad688f"
+                "reference": "4972f9f6c2bad07ab1620b5c9717fa626e9b03b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/class-alias-loader/zipball/a9dd295c81ed0b51455644be420ab9210cad688f",
-                "reference": "a9dd295c81ed0b51455644be420ab9210cad688f",
+                "url": "https://api.github.com/repos/TYPO3/class-alias-loader/zipball/4972f9f6c2bad07ab1620b5c9717fa626e9b03b0",
+                "reference": "4972f9f6c2bad07ab1620b5c9717fa626e9b03b0",
                 "shasum": ""
             },
             "require": {
@@ -2882,7 +2848,7 @@
             "require-dev": {
                 "composer/composer": "dev-master",
                 "mikey179/vfsstream": "1.4.*@dev",
-                "phpunit/phpunit": "~4.7.0"
+                "phpunit/phpunit": "^4.8"
             },
             "type": "composer-plugin",
             "extra": {
@@ -2914,7 +2880,7 @@
                 "classloader",
                 "composer"
             ],
-            "time": "2015-10-06T10:25:44+00:00"
+            "time": "2018-10-03T12:49:56+00:00"
         },
         {
             "name": "typo3/cms",
@@ -3579,63 +3545,6 @@
             ],
             "time": "2018-02-27T17:29:10+00:00"
         },
-        {
-            "name": "league/period",
-            "version": "3.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/period.git",
-                "reference": "280b54d737b4d9d804d19f865a6496b82d1cee2a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/period/zipball/280b54d737b4d9d804d19f865a6496b82d1cee2a",
-                "reference": "280b54d737b4d9d804d19f865a6496b82d1cee2a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^1.10",
-                "phpunit/phpunit": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Period\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ignace Nyamagana Butera",
-                    "email": "nyamsprod@gmail.com",
-                    "homepage": "https://github.com/nyamsprod/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A time range immutable value object",
-            "homepage": "http://period.thephpleague.com",
-            "keywords": [
-                "date",
-                "dateinterval",
-                "dateperiod",
-                "datetime",
-                "interval",
-                "range",
-                "time"
-            ],
-            "time": "2017-11-17T11:28:33+00:00"
-        },
         {
             "name": "pimple/pimple",
             "version": "v3.2.3",
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/FluidStyledContent/Default.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/FluidStyledContent/Default.html
index 786dfc1d..ab9c92cb 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/FluidStyledContent/Default.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/FluidStyledContent/Default.html
@@ -1,8 +1,2 @@
-<html data-namespace-typo3-fluid="true" lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
-
-    <a id="c{data.uid}"></a>
-    <f:render section="Main" optional="true"/>
-
-</html>
+<a id="c{data.uid}"></a>
+<f:render section="Main" optional="true"/>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Form/Default.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Form/Default.html
index 50c16b27..80278619 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Form/Default.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Form/Default.html
@@ -1,7 +1 @@
-<html data-namespace-typo3-fluid="true" lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
-
-    <f:render section="Main"/>
-
-</html>
+<f:render section="Main"/>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Gridelements/Default.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Gridelements/Default.html
index 8f42f5a0..5852942b 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Gridelements/Default.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Gridelements/Default.html
@@ -1,8 +1,2 @@
-<html data-namespace-typo3-fluid="true" lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
-
-    <a id="c{data.uid}"></a>
-    <f:render section="Main"/>
-
-</html>
+<a id="c{data.uid}"></a>
+<f:render section="Main"/>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Product/Default.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Product/Default.html
index 50c16b27..80278619 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Product/Default.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Product/Default.html
@@ -1,7 +1 @@
-<html data-namespace-typo3-fluid="true" lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
-
-    <f:render section="Main"/>
-
-</html>
+<f:render section="Main"/>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/SocialMedia/Default.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/SocialMedia/Default.html
index fc9b6979..f37ab663 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/SocialMedia/Default.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/SocialMedia/Default.html
@@ -1,4 +1,3 @@
-
 <div class="tx-pb-social socialmedia col-xs-12">
 	<f:render section="main" />
 </div>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Header/Header.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Header/Header.html
index 79807b70..21925999 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Header/Header.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Header/Header.html
@@ -1,48 +1,55 @@
-<html data-namespace-typo3-fluid="true" lang="en"
-      xmlns="http://www.w3.org/1999/xhtml">
-
-    <f:if condition="{header}">
-        <f:switch expression="{layout}">
-            <f:case value="1">
-                <h1 class="headline headline--primary"><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h1>
-            </f:case>
-            <f:case value="2">
-                <h2 class="headline headline--secondary"><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h2>
-            </f:case>
-            <f:case value="3">
-                <h3><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h3>
-            </f:case>
-            <f:case value="4">
-                <h4><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h4>
-            </f:case>
-            <f:case value="5">
-                <h5><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h5>
-            </f:case>
-            <f:case value="6">
-                <h1 class="headline headline--primary headline--underlined"><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h1>
-            </f:case>
-            <f:case value="7">
-                <h2 class="headline headline--secondary headline--underlined"><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h2>
-            </f:case>
-            <f:case value="8">
-                <h1 class="headline headline--primary headline--underlined{f:if(condition: subheader, then: ' headline--has-subline')}"><f:if condition="{subheader}"><span class="headline__subline">{subheader -> f:format.raw()}</span><br></f:if>{header -> f:format.raw()}</h1>
-            </f:case>
-            <f:case value="9">
-                <h2 class="headline headline--secondary headline--underlined{f:if(condition: subheader, then: ' headline--has-subline')}"><f:if condition="{subheader}"><span class="headline__subline">{subheader -> f:format.raw()}</span><br></f:if>{header -> f:format.raw()}</h2>
-            </f:case>
-            <f:case value="100">
-                <f:comment> -- do not show header -- </f:comment>
-            </f:case>
-            <f:case default="true">
-                <f:if condition="{default}">
-                    <f:render partial="Header/Header" arguments="{
-                    header: header,
-                    subheader: subheader,
-                    layout: default,
-                    link: link}" />
-                </f:if>
-            </f:case>
-        </f:switch>
-    </f:if>
-
-</html>
+<f:if condition="{header}">
+    <f:switch expression="{layout}">
+        <f:case value="1">
+            <h1 class="headline headline--primary">
+                <f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink>
+            </h1>
+        </f:case>
+        <f:case value="2">
+            <h2 class="headline headline--secondary">
+                <f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink>
+            </h2>
+        </f:case>
+        <f:case value="3">
+            <h3><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h3>
+        </f:case>
+        <f:case value="4">
+            <h4><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h4>
+        </f:case>
+        <f:case value="5">
+            <h5><f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink></h5>
+        </f:case>
+        <f:case value="6">
+            <h1 class="headline headline--primary headline--underlined">
+                <f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink>
+            </h1>
+        </f:case>
+        <f:case value="7">
+            <h2 class="headline headline--secondary headline--underlined">
+                <f:link.typolink parameter="{link}">{header -> f:format.raw()}</f:link.typolink>
+            </h2>
+        </f:case>
+        <f:case value="8">
+            <h1 class="headline headline--primary headline--underlined{f:if(condition: subheader, then: ' headline--has-subline')}">
+                <f:if condition="{subheader}"><span class="headline__subline">{subheader -> f:format.raw()}</span><br></f:if>{header -> f:format.raw()}
+            </h1>
+        </f:case>
+        <f:case value="9">
+            <h2 class="headline headline--secondary headline--underlined{f:if(condition: subheader, then: ' headline--has-subline')}">
+                <f:if condition="{subheader}"><span class="headline__subline">{subheader -> f:format.raw()}</span><br></f:if>{header -> f:format.raw()}
+            </h2>
+        </f:case>
+        <f:case value="100">
+            <f:comment> -- do not show header -- </f:comment>
+        </f:case>
+        <f:case default="true">
+            <f:if condition="{default}">
+                <f:render partial="Header/Header" arguments="{
+                header: header,
+                subheader: subheader,
+                layout: default,
+                link: link}" />
+            </f:if>
+        </f:case>
+    </f:switch>
+</f:if>