Merge pull request #61 from contao-themes-net/2.0.9

2.0.9
contao-themes-net · Jun 20, 2024 · e0b044f · e0b044f
2 parents fc18614 + d8f4ad1
commit e0b044f
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,11 @@ Types of changes
     Security in case of vulnerabilities.
 )
 
+# [2.0.9](https://github.com/contao-themes-net/odd-theme-bundle/tree/2.0.9) – 2024-06-18
+
+- [Fixed] Pagespeed and accessibility optimizations
+- [Changed] Update sql files (remove TMG from imprint)
+
 # [2.0.8](https://github.com/contao-themes-net/odd-theme-bundle/tree/2.0.8) – 2023-09-21
 
 - [Fixed] Fix video element

diff --git a/src/Module/OddThemeSetup.php b/src/Module/OddThemeSetup.php
@@ -6,7 +6,7 @@
 
 class OddThemeSetup extends \BackendModule
 {
-    const VERSION = '2.0.8';
+    const VERSION = '2.0.9';
 
     protected $strTemplate = 'be_oddtheme_setup';
 

diff --git a/src/Resources/contao/templates/elements/ce_sliderStop_odd.html5 b/src/Resources/contao/templates/elements/ce_sliderStop_odd.html5
@@ -0,0 +1,11 @@
+
+</div>
+</div>
+
+<nav class="slider-control">
+    <a href="#" class="slider-prev" title="<?= $this->previous ?>"><?= $this->previous ?></a>
+    <span class="slider-menu"></span>
+    <a href="#" class="slider-next" title="<?= $this->next ?>"><?= $this->next ?></a>
+</nav>
+
+</div>
diff --git a/src/Resources/contao/templates/layout/fe_page_odd.html5 b/src/Resources/contao/templates/layout/fe_page_odd.html5
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="<?= $this->language ?>"<?php if ($this->isRTL): ?> dir="rtl"<?php endif; ?>>
 <head>
-
     <?php $this->block('head'); ?>
         <meta charset="<?= $this->charset ?>">
         <title><?= $this->title ?></title>
@@ -35,10 +34,7 @@
         <?= $this->framework ?>
         <?= $this->stylesheets ?>
         <?= $this->mooScripts ?>
-        <?= $this->head ?>
     <?php $this->endblock(); ?>
-
-    <link rel="stylesheet" type="text/css" media="all" href="<?= ContaoThemesNet\ThemeOddBundle\ThemeUtils::getCombinedStylesheet(); // odd theme css optimization ?>">
 </head>
 <body id="top"<?php if ($this->class): ?> class="<?= $this->class ?>"<?php endif; ?><?php if ($this->onload): ?> onload="<?= $this->onload ?>"<?php endif; ?>>
 
@@ -111,6 +107,8 @@
     <?php $this->sections('bottom'); ?>
 <?php $this->endblock(); ?>
 
+<?= $this->head ?>
+<link rel="stylesheet" type="text/css" media="all" href="<?= ContaoThemesNet\ThemeOddBundle\ThemeUtils::getCombinedStylesheet(); // odd theme css optimization ?>">
 <?= $this->mootools ?>
 <?= $this->jsonLdScripts ?>
 

diff --git a/src/Resources/contao/templates/modules/mod_navigation_odd.html5 b/src/Resources/contao/templates/modules/mod_navigation_odd.html5
@@ -23,7 +23,7 @@
                 data-target="#navbar-responsive-<?= $this->id ?>"
                 aria-controls="navbar-responsive-<?= $this->id ?>"
                 aria-expanded="false"
-                aria-label="<?= $this->togglerLabel ?>">
+                aria-label="Navigation">
             <span class="navbar-toggler-icon"><i class="fas fa-bars"></i></span>
         </button>
 

diff --git a/src/Resources/contao/templates/modules/mod_navigation_odd_sloping.html5 b/src/Resources/contao/templates/modules/mod_navigation_odd_sloping.html5
@@ -23,7 +23,7 @@
                 data-target="#navbar-responsive-<?= $this->id ?>"
                 aria-controls="navbar-responsive-<?= $this->id ?>"
                 aria-expanded="false"
-                aria-label="<?= $this->togglerLabel ?>">
+                aria-label="Navigation">
             <span class="navbar-toggler-icon"><i class="fas fa-bars"></i></span>
         </button>
 

diff --git a/src/Resources/contao/templates/modules/mod_navigation_odd_sloping_topright.html5 b/src/Resources/contao/templates/modules/mod_navigation_odd_sloping_topright.html5
@@ -23,7 +23,7 @@
                 data-target="#navbar-responsive-<?= $this->id ?>"
                 aria-controls="navbar-responsive-<?= $this->id ?>"
                 aria-expanded="false"
-                aria-label="<?= $this->togglerLabel ?>">
+                aria-label="Navigation">
             <span class="navbar-toggler-icon"><i class="fas fa-bars"></i></span>
         </button>
 

diff --git a/src/Resources/contao/templates/modules/nav_default_odd.html5 b/src/Resources/contao/templates/modules/nav_default_odd.html5
@@ -8,7 +8,7 @@
                 <div class="<?php if (!empty($item['subitems'])) echo 'dropdown-toggle'; ?>" <?php if (!empty($item['subitems'])) echo 'data-toggle="dropdown"'; ?>></div><?php endif; ?>
                 <?= $item['subitems'] ?></li>
         <?php else: ?>
-            <li class="<?php if (!empty($item['subitems'])) echo 'dropdown '; ?><?php if ($item['class']) echo $item['class']; ?>"><a href="<?= $item['href'] ?: './' ?>" title="<?= $item['pageTitle'] ?: $item['title'] ?>" class="<?php if ($item['class']) echo $item['class']; ?>" <?php if ($item['accesskey']) echo ' accesskey="' . $item['accesskey'] . '"'; ?><?php if ($item['tabindex']) echo ' tabindex="' . $item['tabindex'] . '"'; ?><?php if ($item['nofollow']) echo ' rel="nofollow"'; ?><?= $item['target'] ?><?php if (!empty($item['subitems'])) echo ' aria-haspopup="true"'; ?> itemprop="url"><span itemprop="name"><?= $item['link'] ?></span>
+            <li class="<?php if (!empty($item['subitems'])) echo 'dropdown '; ?><?php if ($item['class']) echo $item['class']; ?>"><a href="<?= $item['href'] ?: './' ?>" title="<?= $item['pageTitle'] ?: $item['title'] ?>" class="<?php if ($item['class']) echo $item['class']; ?>" <?php if ('' !== $item['accesskey']) echo ' accesskey="' . $item['accesskey'] . '"'; ?><?php if ($item['tabindex']) echo ' tabindex="' . $item['tabindex'] . '"'; ?><?php if ($item['nofollow']) echo ' rel="nofollow"'; ?><?= $item['target'] ?><?php if (!empty($item['subitems'])) echo ' aria-haspopup="true"'; ?> itemprop="url"><span itemprop="name"><?= $item['link'] ?></span>
                 </a>
                 <?php if (!empty($item['subitems'])): ?>
                     <div class="<?php if (!empty($item['subitems'])) echo 'dropdown-toggle'; ?>" <?php if (!empty($item['subitems'])) echo 'data-toggle="dropdown"'; ?>></div><?php endif; ?>

diff --git a/src/templates/odd_theme_contao_demo_4.13.x_installtool.sql b/src/templates/odd_theme_contao_demo_4.13.x_installtool.sql
diff --git a/src/templates/odd_theme_contao_demo_4.13.x_minimal_installtool.sql b/src/templates/odd_theme_contao_demo_4.13.x_minimal_installtool.sql