diff --git a/core/core.php b/core/core.php
index 4e6bd526..7a2a402f 100644
--- a/core/core.php
+++ b/core/core.php
@@ -2338,7 +2338,7 @@ class layout extends common {
*/
public function showMenu() {
// Met en forme les items du menu
- $itemsLeft = '';
+ $items = '';
$currentPageId = $this->getData(['page', $this->getUrl(0)]) ? $this->getUrl(0) : $this->getUrl(2);
foreach($this->getHierarchy() as $parentPageId => $childrenPageIds) {
// Passer les entrées masquées
@@ -2346,36 +2346,36 @@ class layout extends common {
$active = ($parentPageId === $currentPageId OR in_array($currentPageId, $childrenPageIds)) ? 'active ' : '';
$targetBlank = $this->getData(['page', $parentPageId, 'targetBlank']) ? ' target="_blank"' : '';
// Mise en page de l'item
- $itemsLeft .= '
';
+ $items .= '';
if ( $this->getData(['page',$parentPageId,'disable']) === true
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') )
- {$itemsLeft .= '';
+ {$items .= '';
} else {
- $itemsLeft .= '';
+ $items .= '';
}
switch ($this->getData(['page', $parentPageId, 'typeMenu'])) {
case '' :
- $itemsLeft .= $this->getData(['page', $parentPageId, 'title']);
+ $items .= $this->getData(['page', $parentPageId, 'title']);
break;
case 'text' :
- $itemsLeft .= $this->getData(['page', $parentPageId, 'title']);
+ $items .= $this->getData(['page', $parentPageId, 'title']);
break;
case 'icon' :
if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") {
- $itemsLeft .= '';
+ $items .= '';
} else {
- $itemsLeft .= $this->getData(['page', $parentPageId, 'title']);
+ $items .= $this->getData(['page', $parentPageId, 'title']);
}
break;
case 'icontitle' :
if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") {
- $itemsLeft .= '';
+ $items .= '';
} else {
- $itemsLeft .= $this->getData(['page', $parentPageId, 'title']);
+ $items .= $this->getData(['page', $parentPageId, 'title']);
}
break;
}
@@ -2388,65 +2388,64 @@ class layout extends common {
}
if($childrenPageIds && $disableChild !== $totalChild &&
$this->getdata(['page',$parentPageId,'hideMenuChildren']) === false) {
- $itemsLeft .= template::ico('down', 'left');
+ $items .= template::ico('down', 'left');
}
// ------------------------------------------------
- $itemsLeft .= '';
+ $items .= '';
if ($this->getdata(['page',$parentPageId,'hideMenuChildren']) === true ||
empty($childrenPageIds)) {
continue;
}
- $itemsLeft .= '';
+ $items .= '';
foreach($childrenPageIds as $childKey) {
// Propriétés de l'item
$active = ($childKey === $currentPageId) ? 'active ' : '';
$targetBlank = $this->getData(['page', $childKey, 'targetBlank']) ? ' target="_blank"' : '';
// Mise en page du sous-item
- $itemsLeft .= '- ';
+ $items .= '
- ';
if ( $this->getData(['page',$childKey,'disable']) === true
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) {
- $itemsLeft .= '';
+ $items .= '';
} else {
- $itemsLeft .= '';
+ $items .= '';
}
switch ($this->getData(['page', $childKey, 'typeMenu'])) {
case '' :
- $itemsLeft .= $this->getData(['page', $childKey, 'title']);
+ $items .= $this->getData(['page', $childKey, 'title']);
break;
case 'text' :
- $itemsLeft .= $this->getData(['page', $childKey, 'title']);
+ $items .= $this->getData(['page', $childKey, 'title']);
break;
case 'icon' :
if ($this->getData(['page', $childKey, 'iconUrl']) != "") {
- $itemsLeft .= '';
+ $items .= '';
} else {
- $itemsLeft .= $this->getData(['page', $parentPageId, 'title']);
+ $items .= $this->getData(['page', $parentPageId, 'title']);
}
break;
case 'icontitle' :
if ($this->getData(['page', $childKey, 'iconUrl']) != "") {
- $itemsLeft .= '';
+ $items .= '';
} else {
- $itemsLeft .= $this->getData(['page', $childKey, 'title']);
+ $items .= $this->getData(['page', $childKey, 'title']);
}
break;
case 'icontext' :
if ($this->getData(['page', $childKey, 'iconUrl']) != "") {
- $itemsLeft .= '';
- $itemsLeft .= $this->getData(['page', $childKey, 'title']);
+ $items .= '';
+ $items .= $this->getData(['page', $childKey, 'title']);
} else {
- $itemsLeft .= $this->getData(['page', $childKey, 'title']);
+ $items .= $this->getData(['page', $childKey, 'title']);
}
break;
}
- $itemsLeft .= '
';
+ $items .= '
';
}
- $itemsLeft .= '';
+ $items .= '';
}
// Lien de connexion
- $itemsRight = '';
if(
(
$this->getData(['theme', 'menu', 'loginLink'])
@@ -2454,7 +2453,7 @@ class layout extends common {
)
OR $this->getUrl(0) === 'theme'
) {
- $itemsRight .= '';
- $itemsRight .= '' . template::ico('logout') . '';
+ $items .= '' . template::ico('user', 'right') . '';
+ $items .= '' . template::ico('logout') . '';
}
// Retourne les items du menu
- echo '';
+ echo '';
}
/**
diff --git a/core/layout/common.css b/core/layout/common.css
index b633b19a..7bb2747d 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -518,26 +518,6 @@ nav a {
transition: background .3s ease-out;
}
-nav #menuLeft {
- float: left;
-}
-nav #menuRight {
- float: right;
- font-size: 12px;
-}
-/* fin barre de menu */
-nav::after {
- content: " ";
- clear: both;
- display: flex;
-}
-
-nav::before {
- content: " ";
- clear: left;
- display: flex;
-}
-
nav a:hover {
text-decoration: none;
}
@@ -1413,4 +1393,3 @@ th.col12 {
-o-transform:scale(1.25); /* Opera */
transform:scale(1.25);
}
-