Merge branch 'dev' into 'master'

Dev

See merge request !4

site.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <!-- global extra attributes for all sites -->
+    <attributes>
+        <attribute>quiqqer.megamenu.settings.type</attribute>
+    </attributes>
+
+    <!-- list settings -->
+    <settings>
+
+        <category>
+            <settings>
+                <title>
+                    <locale group="quiqqer/menu" var="menu.settings.category"/>
+                </title>
+
+                <select conf="quiqqer.megamenu.settings.type">
+                    <title>
+                        <locale group="quiqqer/menu" var="menu.settings.title"/>
+                    </title>
+                    <select conf="menu.settings.type">
+                        <text>
+                            <locale group="quiqqer/menu" var="menu.settings.type"/>
+                        </text>
+                        <option value=""></option>
+                        <option value="Standard">
+                            <locale group="quiqqer/menu" var="menu.settings.Standard"/>
+                        </option>
+                        <option value="Icons">
+                            <locale group="quiqqer/menu" var="menu.settings.Icons"/>
+                        </option>
+                        <option value="IconsDescription">
+                            <locale group="quiqqer/menu" var="menu.settings.IconsDescription"/>
+                        </option>
+                        <option value="Image">
+                            <locale group="quiqqer/menu" var="menu.settings.Image"/>
+                        </option>
+                    </select>
+                </select>
+            </settings>
+        </category>
+
+    </settings>
+</site>
\ No newline at end of file

src/QUI/Menu/Mega/Icons.css

@@ -58,7 +58,7 @@
 }
 
 .quiqqer-menu-megaMenu-children-icons-list-short-text {
-    color: rgba(0, 0, 0, 0.4);
+    opacity: 0.6;
 }
 
 .quiqqer-menu-megaMenu-children-icons-entry-short ul {

src/QUI/Menu/Mega/IconsDescription.css

@@ -66,13 +66,15 @@
 
 .quiqqer-menu-megaMenu-children-iconsDesc-list-entry-short-link-title-description {
     clear: both;
-    color: rgba(0, 0, 0, 0.4);
+    /*color: rgba(0, 0, 0, 0.4);*/
     display: block;
+    opacity: 0.7;
     padding: 5px 0;
 }
 
 .quiqqer-menu-megaMenu-children-iconsDesc-list-short-text {
-    color: rgba(0, 0, 0, 0.4);
+    /*color: rgba(0, 0, 0, 0.4);*/
+    opacity: 0.7;
 }
 
 .quiqqer-menu-megaMenu-children-iconsDesc-entry-short ul {

src/QUI/Menu/Mega/Standard.css

@@ -40,6 +40,7 @@
     font-size: 12px;
     font-weight: normal;
     margin: 10px 0 0;
+    opacity: 0.8;
     width: 100%;
 }
 

src/QUI/Menu/MegaMenu.html

@@ -12,6 +12,7 @@
 
         {foreach $children as $Child}
             {assign var=isInPath value=0}
+            {assign var=usedControl value=$childControl}
             {if $Child->getId() == $Site->getId() ||
                 $Rewrite->isIdInPath($Child->getId())
             }
@@ -25,7 +26,11 @@
                 {if count($subchildren)}<span class="fa fa-angle-down"></span>{/if}
             </a>
 
-            {control control=$childControl Site=$Child assign=Control}
+            {if $Child->getAttribute('quiqqer.megamenu.settings.type') && $Child->getAttribute('quiqqer.megamenu.settings.type') !== ''}
+                {assign var=usedControl value=$this->getMenuControl($Child->getAttribute('quiqqer.megamenu.settings.type'))}
+            {/if}
+
+            {control control=$usedControl Site=$Child assign=Control}
             {if $Control->count()}
             <div class="quiqqer-menu-megaMenu-list-item-menu">
                 {$Control->create()}

src/QUI/Menu/MegaMenu.php

@@ -28,7 +28,7 @@ public function __construct($attributes = array())
             'showStart' => false,
             'Start'     => false,
             'data-qui'  => 'package/quiqqer/menu/bin/MegaMenu',
-            'display'   => $this->getProject()->getConfig('menu.settings.type')
+            'display'   => 'Standard'
         ));
 
         parent::__construct($attributes);
@@ -57,30 +57,8 @@ public function __construct($attributes = array())
      */
     public function getBody()
     {
-        $Engine = QUI::getTemplateManager()->getEngine();
-
-        switch ($this->getAttribute('display')) {
-            case 'Image':
-            case QUI\Menu\Mega\Image::class:
-                $childControl = QUI\Menu\Mega\Image::class;
-                break;
-
-            case 'Icons':
-            case QUI\Menu\Mega\Icons::class:
-                $childControl = QUI\Menu\Mega\Icons::class;
-                break;
-
-            case 'IconsDescription':
-            case QUI\Menu\Mega\IconsDescription::class:
-                $childControl = QUI\Menu\Mega\IconsDescription::class;
-                break;
-
-            default:
-            case 'Standard':
-            case QUI\Menu\Mega\Standard::class:
-                $childControl = QUI\Menu\Mega\Standard::class;
-                break;
-        }
+        $Engine       = QUI::getTemplateManager()->getEngine();
+        $childControl = $this->getMenuControl($this->getAttribute('display'));
 
         $this->Mobile->setAttribute('Project', $this->getProject());
         $this->Mobile->setAttribute('Site', $this->getSite());
@@ -122,6 +100,55 @@ public function getStart()
         return $this->getProject()->firstChild();
     }
 
+    /**
+     * Return the menu control class name for a menu control shortcut
+     *
+     * @param $control
+     * @return mixed
+     */
+    public function getMenuControl($control)
+    {
+        switch ($control) {
+            case 'Image':
+            case QUI\Menu\Mega\Image::class:
+                return QUI\Menu\Mega\Image::class;
+
+            case 'Icons':
+            case QUI\Menu\Mega\Icons::class:
+                return QUI\Menu\Mega\Icons::class;
+
+            case 'IconsDescription':
+            case QUI\Menu\Mega\IconsDescription::class:
+                return QUI\Menu\Mega\IconsDescription::class;
+
+            case 'Standard':
+            case QUI\Menu\Mega\Standard::class:
+                return QUI\Menu\Mega\Standard::class;
+        }
+
+        if ($this->getAttribute('display')) {
+            switch ($this->getAttribute('display')) {
+                case 'Image':
+                case QUI\Menu\Mega\Image::class:
+                    return QUI\Menu\Mega\Image::class;
+
+                case 'Icons':
+                case QUI\Menu\Mega\Icons::class:
+                    return QUI\Menu\Mega\Icons::class;
+
+                case 'IconsDescription':
+                case QUI\Menu\Mega\IconsDescription::class:
+                    return QUI\Menu\Mega\IconsDescription::class;
+
+                case 'Standard':
+                case QUI\Menu\Mega\Standard::class:
+                    return QUI\Menu\Mega\Standard::class;
+            }
+        }
+
+        return QUI\Menu\Mega\Standard::class;
+    }
+
     /**
      * Return the current site
      *