From e1084c76da465428fcd06304f8b99ee1d4db2c70 Mon Sep 17 00:00:00 2001
From: Sebastian Zoglowek <55794780+zoglo@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:42:46 +0100
Subject: [PATCH] Semantic html

* wrap main_above and main_below in main
* change #main to div
* write migration
---
 config/migrations.yaml                        |  7 ++
 contao/templates/frontend/fe_page.html5       | 70 ++++++++-------
 .../scss/ctm_layout/_article-spacing.scss     |  2 +-
 .../CustomLayoutSectionMigration.php          | 86 +++++++++++++++++++
 4 files changed, 131 insertions(+), 34 deletions(-)
 create mode 100644 src/Migration/Version220/CustomLayoutSectionMigration.php

diff --git a/config/migrations.yaml b/config/migrations.yaml
index d0c7eb6..53780dd 100644
--- a/config/migrations.yaml
+++ b/config/migrations.yaml
@@ -19,3 +19,10 @@ services:
             - '@contao.framework'
         tags:
             - { name: contao.migration, priority: 0 }
+
+    ContaoThemeManager\Core\Migration\Version220\CustomLayoutSectionMigration:
+        arguments:
+            - '@database_connection'
+            - '@contao.framework'
+        tags:
+            - { name: contao.migration, priority: 0 }
diff --git a/contao/templates/frontend/fe_page.html5 b/contao/templates/frontend/fe_page.html5
index ef53d0f..9e9c8a4 100644
--- a/contao/templates/frontend/fe_page.html5
+++ b/contao/templates/frontend/fe_page.html5
@@ -45,42 +45,46 @@
       <?php $this->sections('before'); ?>
 
       <?php $this->block('container'); ?>
-        <?php if ($this->main || $this->left || $this->right): ?>
-          <div id="container">
-            <div class="inside">
-
-            <?php $this->block('main'); ?>
-              <main id="main">
-                <div class="inside">
-                  <?= $this->main ?>
-                </div>
-                <?php $this->sections('main'); ?>
-              </main>
-            <?php $this->endblock(); ?>
-
-            <?php $this->block('left'); ?>
-              <?php if ($this->left): ?>
-                <aside id="left" class="grid">
-                  <div class="inside">
-                    <?= $this->left ?>
-                  </div>
-                </aside>
-              <?php endif; ?>
-            <?php $this->endblock(); ?>
-
-            <?php $this->block('right'); ?>
-              <?php if ($this->right): ?>
-                <aside id="right" class="grid">
+        <main id="main-wrapper">
+          <?php $this->section('main-above'); ?>
+          <?php if ($this->main || $this->left || $this->right): ?>
+            <div id="container">
+              <div class="inside">
+
+              <?php $this->block('main'); ?>
+                <div id="main">
                   <div class="inside">
-                    <?= $this->right ?>
+                    <?= $this->main ?>
                   </div>
-                </aside>
-              <?php endif; ?>
-            <?php $this->endblock(); ?>
-
+                  <?php $this->sections('main'); ?>
+                </div>
+              <?php $this->endblock(); ?>
+
+              <?php $this->block('left'); ?>
+                <?php if ($this->left): ?>
+                  <aside id="left" class="grid">
+                    <div class="inside">
+                      <?= $this->left ?>
+                    </div>
+                  </aside>
+                <?php endif; ?>
+              <?php $this->endblock(); ?>
+
+              <?php $this->block('right'); ?>
+                <?php if ($this->right): ?>
+                  <aside id="right" class="grid">
+                    <div class="inside">
+                      <?= $this->right ?>
+                    </div>
+                  </aside>
+                <?php endif; ?>
+              <?php $this->endblock(); ?>
+
+              </div>
             </div>
-          </div>
-        <?php endif; ?>
+          <?php endif; ?>
+          <?php $this->section('main-below'); ?>
+        </main>
       <?php $this->endblock(); ?>
 
       <?php $this->sections('after'); ?>
diff --git a/public/framework/scss/ctm_layout/_article-spacing.scss b/public/framework/scss/ctm_layout/_article-spacing.scss
index d385f16..dfe55b0 100644
--- a/public/framework/scss/ctm_layout/_article-spacing.scss
+++ b/public/framework/scss/ctm_layout/_article-spacing.scss
@@ -19,7 +19,7 @@ $spacings-list-bp: (
 );
 
 // Add default bottom-padding to #main articles
-main {
+#main {
   .mod_article:nth-last-child(n+2) { --mpb:#{$article-main-spacing-bottom}; }
   .article_inside { padding-bottom: var(--mpb,0); }
 }
diff --git a/src/Migration/Version220/CustomLayoutSectionMigration.php b/src/Migration/Version220/CustomLayoutSectionMigration.php
new file mode 100644
index 0000000..012fa83
--- /dev/null
+++ b/src/Migration/Version220/CustomLayoutSectionMigration.php
@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Contao ThemeManager Core.
+ *
+ * (c) https://www.oveleon.de/
+ */
+
+namespace ContaoThemeManager\Core\Migration\Version220;
+
+use Contao\CoreBundle\Migration\AbstractMigration;
+use Contao\CoreBundle\Migration\MigrationResult;
+use Contao\StringUtil;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception;
+
+class CustomLayoutSectionMigration extends AbstractMigration
+{
+    public function __construct(private readonly Connection $connection)
+    {
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function shouldRun(): bool
+    {
+        $schemaManager = $this->connection->createSchemaManager();
+
+        if (!$schemaManager->tablesExist('tl_layout'))
+        {
+            return false;
+        }
+
+        $columns = $schemaManager->listTableColumns('tl_layout');
+
+        if (!isset($columns['sections']))
+        {
+            return false;
+        }
+
+        $test = $this->connection->fetchOne("SELECT TRUE FROM tl_layout WHERE sections LIKE '%s:2:\"id\";s:10:\"main-above\";s:8:\"template\";s:13:\"block_section\";s:8:\"position\";s:6:\"before\";%' OR sections LIKE '%s:2:\"id\";s:10:\"main-below\";s:8:\"template\";s:13:\"block_section\";s:8:\"position\";s:5:\"after\";%' LIMIT 1");
+
+        if (false !== $test)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function run(): MigrationResult
+    {
+        $values = $this->connection->fetchAllKeyValue("SELECT id, sections FROM tl_layout WHERE sections LIKE '%s:2:\"id\";s:10:\"main-above\";s:8:\"template\";s:13:\"block_section\";s:8:\"position\";s:6:\"before\";%' OR sections LIKE '%s:2:\"id\";s:10:\"main-below\";s:8:\"template\";s:13:\"block_section\";s:8:\"position\";s:5:\"after\";%'");
+
+        foreach ($values as $id => $value)
+        {
+            $blnUpdate = false;
+
+            $sections = StringUtil::deserialize($value, true);
+
+            foreach ($sections as &$section)
+            {
+                if (!isset($section['id']) || !in_array($section['id'], ['main-above', 'main-below']))
+                {
+                    continue;
+                }
+
+                $section['position'] = 'manual';
+                $blnUpdate = true;
+            }
+
+            if ($blnUpdate)
+            {
+                $this->connection->update('tl_layout', ['sections' => serialize($sections)], ['id' => (int) $id]);
+            }
+        }
+
+        return $this->createResult(true);
+    }
+}