From aa7a0926c46f078a7a1c5cbb888f4b22abceec8f Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Tue, 13 Oct 2020 11:04:30 +0200 Subject: [PATCH 1/4] menuRight --- core/core.php | 67 +++++++++++++++++++++--------------------- core/layout/common.css | 21 +++++++++++++ 2 files changed, 55 insertions(+), 33 deletions(-) diff --git a/core/core.php b/core/core.php index 7a2a402f..4e6bd526 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 - $items = ''; + $itemsLeft = ''; $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 - $items .= '
  • '; + $itemsLeft .= '
  • '; if ( $this->getData(['page',$parentPageId,'disable']) === true AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) - {$items .= ''; + {$itemsLeft .= ''; } else { - $items .= ''; + $itemsLeft .= ''; } switch ($this->getData(['page', $parentPageId, 'typeMenu'])) { case '' : - $items .= $this->getData(['page', $parentPageId, 'title']); + $itemsLeft .= $this->getData(['page', $parentPageId, 'title']); break; case 'text' : - $items .= $this->getData(['page', $parentPageId, 'title']); + $itemsLeft .= $this->getData(['page', $parentPageId, 'title']); break; case 'icon' : if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") { - $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; + $itemsLeft .= ''.$this->getData(['page', $parentPageId, 'title']).''; } else { - $items .= $this->getData(['page', $parentPageId, 'title']); + $itemsLeft .= $this->getData(['page', $parentPageId, 'title']); } break; case 'icontitle' : if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") { - $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; + $itemsLeft .= ''.$this->getData(['page', $parentPageId, 'title']).''; } else { - $items .= $this->getData(['page', $parentPageId, 'title']); + $itemsLeft .= $this->getData(['page', $parentPageId, 'title']); } break; } @@ -2388,64 +2388,65 @@ class layout extends common { } if($childrenPageIds && $disableChild !== $totalChild && $this->getdata(['page',$parentPageId,'hideMenuChildren']) === false) { - $items .= template::ico('down', 'left'); + $itemsLeft .= template::ico('down', 'left'); } // ------------------------------------------------ - $items .= ''; + $itemsLeft .= ''; if ($this->getdata(['page',$parentPageId,'hideMenuChildren']) === true || empty($childrenPageIds)) { continue; } - $items .= ''; } // Lien de connexion + $itemsRight = ''; if( ( $this->getData(['theme', 'menu', 'loginLink']) @@ -2453,7 +2454,7 @@ class layout extends common { ) OR $this->getUrl(0) === 'theme' ) { - $items .= '
    • '; - $items .= '
  • ' . template::ico('logout') . '
    • '; + $itemsRight .= '
  • ' . template::ico('user', 'right') . '
    • '; + $itemsRight .= '
  • ' . template::ico('logout') . '
    • '; } // Retourne les items du menu - echo ''; + echo ''; } /** diff --git a/core/layout/common.css b/core/layout/common.css index 7bb2747d..b633b19a 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -518,6 +518,26 @@ 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; } @@ -1393,3 +1413,4 @@ th.col12 { -o-transform:scale(1.25); /* Opera */ transform:scale(1.25); } + From 8821da73a02a938fb94064ecc8e3a5d4f03816fc Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Tue, 13 Oct 2020 15:07:41 +0200 Subject: [PATCH 2/4] modif css menuRight --- core/layout/common.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/layout/common.css b/core/layout/common.css index b633b19a..03a3ea60 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -523,7 +523,6 @@ nav #menuLeft { } nav #menuRight { float: right; - font-size: 12px; } /* fin barre de menu */ nav::after { From 3ebd99c284abb384c8ccfb44ba5f4359810bdd0b Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Tue, 13 Oct 2020 15:13:19 +0200 Subject: [PATCH 3/4] Revert "modif css menuRight" This reverts commit 8821da73a02a938fb94064ecc8e3a5d4f03816fc. --- core/layout/common.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/layout/common.css b/core/layout/common.css index 03a3ea60..b633b19a 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -523,6 +523,7 @@ nav #menuLeft { } nav #menuRight { float: right; + font-size: 12px; } /* fin barre de menu */ nav::after { From 4786942409de46fbe9bb392a2aa6abaa233e91fc Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Tue, 13 Oct 2020 15:13:55 +0200 Subject: [PATCH 4/4] Revert "menuRight" This reverts commit aa7a0926c46f078a7a1c5cbb888f4b22abceec8f. --- core/core.php | 67 +++++++++++++++++++++--------------------- core/layout/common.css | 21 ------------- 2 files changed, 33 insertions(+), 55 deletions(-) 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 .= ''.$this->getData(['page', $parentPageId, 'title']).''; + $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; } else { - $itemsLeft .= $this->getData(['page', $parentPageId, 'title']); + $items .= $this->getData(['page', $parentPageId, 'title']); } break; case 'icontitle' : if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") { - $itemsLeft .= ''.$this->getData(['page', $parentPageId, 'title']).''; + $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; } 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 .= ''; } // 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 '
      ' . $items . '
    '; } /** 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); } -