see cl 1.0.8

heimrichhannot · Oct 4, 2019 · b8aa91b · b8aa91b
1 parent fc985df
commit b8aa91b
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.0.8] - 2019-10-04
+
+### Fixed
+- classes
+
 ## [1.0.7] - 2018-08-16
 
 ### Fixed

diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  * @license LGPL-3.0-or-later
  */
 

diff --git a/src/HeimrichHannotBootstrapHoverDropdownBundle.php b/src/HeimrichHannotBootstrapHoverDropdownBundle.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  * @license LGPL-3.0-or-later
  */
 

diff --git a/src/Resources/contao/templates/navigation/nav_hover_dropdown.html5 b/src/Resources/contao/templates/navigation/nav_hover_dropdown.html5
@@ -1,58 +1,57 @@
-    <?php if ($this->level == 'level_1'): ?>
-    <div class="navbar navbar-light navbar-expand-lg">
-        <div class="navbar-toggle-container">
-            <button class="navbar-toggler collapsed" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-expanded="false">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-        </div>
-        <div class="navbar-inner navbar-collapse collapse">
-            <div class="collapse-inner">
-    <?php endif; ?>
-            <ul class="<?php echo $this->level; ?> nav-collapse <?php if ($this->level == 'level_1'): ?> nav navbar-nav<?php else: ?> dropdown-menu<?php endif; ?>" role="menu">
+
+<?php if ($this->level == 'level_1'): ?>
+<div class="navbar navbar-light navbar-expand-lg">
+    <div class="navbar-toggle-container">
+        <button class="navbar-toggler collapsed" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-expanded="false">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+    </div>
+    <div class="navbar-inner navbar-collapse collapse">
+        <div class="collapse-inner">
+            <?php endif; ?>
+            <ul class="<?= $this->level; ?> nav-collapse <?php if ($this->level == 'level_1'): ?> nav navbar-nav<?php else: ?> dropdown-menu<?php endif; ?>" role="menu">
                 <?php if ($this->level != 'level_1'): ?>
-                    <li class="submenu-wrapper">
-                        <ul class="nav">
-                            <?php endif; ?>
-                            <?php foreach ($this->items as $item): ?>
-                                <li <?php if ($item['class']): ?>class="nav-item <?php echo $item['class']; ?><?php if ($this->level != 'level_1' && (strpos($item['class'], 'trail') !== false || (strpos($item['class'], 'active') !== false))): ?> show<?php endif; ?>" <?php endif; ?>>
-                                    <a href="<?php echo $item['href']; ?>"
-                                        <?php if ($item['class'] || $item['subpages'] > 0): ?>
-                                            class="nav-link <?php echo $item['class']; ?><?php if ($item['subitems']): ?> dropdown-toggle<?php endif; ?>"
-                                        <?php endif; ?>
-                                        <?php if ($item['accesskey'] != ''): ?>
-                                            accesskey="<?php echo $item['accesskey']; ?>"
-                                        <?php endif; ?>
-                                        <?php if ($item['tabindex']): ?>
-                                            tabindex="<?php echo $item['tabindex']; ?>"
-                                        <?php endif; ?>
-                                        <?php if ($item['nofollow']): ?>
-                                            rel="nofollow"
+                <li class="submenu-wrapper">
+                    <ul class="nav">
+                        <?php endif; ?>
+                        <?php foreach ($this->items as $item): ?>
+                            <li class="nav-item<?= $item['class'] ? ' ' . $item['class'] : '' ?><?php if ($this->level != 'level_1' && (strpos($item['class'], 'trail') !== false || (strpos($item['class'], 'active') !== false))): ?> show<?php endif; ?>">
+                                <a href="<?= $item['href']; ?>"
+                                   class="nav-link<?= $item['class'] ? ' ' . $item['class'] : '' ?><?= $item['subitems'] ? ' dropdown-toggle' : ''?>"
+                                    <?php if ($item['accesskey'] != ''): ?>
+                                        accesskey="<?= $item['accesskey']; ?>"
+                                    <?php endif; ?>
+                                    <?php if ($item['tabindex']): ?>
+                                        tabindex="<?= $item['tabindex']; ?>"
+                                    <?php endif; ?>
+                                    <?php if ($item['nofollow']): ?>
+                                        rel="nofollow"
+                                    <?php endif; ?>
+                                    <?= $item['target']; ?>
+                                    <?php if ($item['subitems']): ?>
+                                        data-hover="dropdown"
+                                        <?php if ($this->level != 'level_1'): ?>
+                                            data-close-others="true"
+                                            data-delay-open="300"
+                                            data-delay-switch="250"
+                                            data-delay-close="1000"
+                                        <?php else: ?>
+                                            data-delay-open="0"
+                                            data-delay-switch="50"
+                                            data-delay-close="250"
                                         <?php endif; ?>
-                                        <?php echo $item['target']; ?>
-                                        <?php if ($item['subitems']): ?>
-                                            data-hover="dropdown"
-                                            <?php if ($this->level != 'level_1'): ?>
-                                                data-close-others="true"
-                                                data-delay-open="300"
-                                                data-delay-switch="250"
-                                                data-delay-close="1000"
-                                            <?php else: ?>
-                                                data-delay-open="0"
-                                                data-delay-switch="50"
-                                                data-delay-close="250"
-                                            <?php endif; ?>
-                                        <?php endif; ?>>
-                                        <span><?php echo $item['link']; ?></span>
-                                    </a>
-                                    <?php echo $item['subitems']; ?>
-                                </li>
-                            <?php endforeach; ?>
-                            <?php if ($this->level != 'level_1'): ?>
-                        </ul>
-                    </li>
+                                    <?php endif; ?>>
+                                    <span><?= $item['link']; ?></span>
+                                </a>
+                                <?= $item['subitems']; ?>
+                            </li>
+                        <?php endforeach; ?>
+                        <?php if ($this->level != 'level_1'): ?>
+                    </ul>
+                </li>
             <?php endif; ?>
             </ul>
-        <?php if ($this->level == 'level_1'): ?>
+            <?php if ($this->level == 'level_1'): ?>
         </div>
     </div>
 </div>

diff --git a/tests/ContaoManager/PluginTest.php b/tests/ContaoManager/PluginTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  * @license LGPL-3.0-or-later
  */
 

diff --git a/tests/HeimrichHannotBootstrapHoverDropdownBundleTest.php b/tests/HeimrichHannotBootstrapHoverDropdownBundleTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  * @license LGPL-3.0-or-later
  */
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  * @license LGPL-3.0-or-later
  */