From 4786942409de46fbe9bb392a2aa6abaa233e91fc Mon Sep 17 00:00:00 2001
From: Prof Langues <Prof_LVE@EDU.UA>
Date: Tue, 13 Oct 2020 15:13:55 +0200
Subject: [PATCH] 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 .= '<li>';
+			$items .= '<li>';
 
 			if ( $this->getData(['page',$parentPageId,'disable']) === true
 				 AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')	)
 
-					{$itemsLeft .= '<a class="' . $parentPageId . '" href="'.$this->getUrl(1).'">';
+					{$items .= '<a class="' . $parentPageId . '" href="'.$this->getUrl(1).'">';
 			} else {
-					$itemsLeft .= '<a class="' . $active . $parentPageId . '" href="' . helper::baseUrl() . $parentPageId . '"' . $targetBlank . '>';
+					$items .= '<a class="' . $active . $parentPageId . '" href="' . helper::baseUrl() . $parentPageId . '"' . $targetBlank . '>';
 			}
 
 			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 .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $parentPageId, 'iconUrl']).'" />';
+				    $items .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $parentPageId, 'iconUrl']).'" />';
 				    } else {
-				    $itemsLeft .= $this->getData(['page', $parentPageId, 'title']);
+				    $items .= $this->getData(['page', $parentPageId, 'title']);
 				    }
 				    break;
 				case 'icontitle' :
 				    if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") {
-				    	$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $parentPageId, 'iconUrl']).'" data-tippy-content="';
-				   	 	$itemsLeft .= $this->getData(['page', $parentPageId, 'title']).'"/>';
+				    	$items .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $parentPageId, 'iconUrl']).'" data-tippy-content="';
+				   	 	$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 .= '</a>';
+			$items .= '</a>';
 			if ($this->getdata(['page',$parentPageId,'hideMenuChildren']) === true ||
 				empty($childrenPageIds)) {
 				continue;
 			}
-			$itemsLeft .= '<ul class="navLevel2">';
+			$items .= '<ul class="navLevel2">';
 			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 .= '<li>';
+				$items .= '<li>';
 				if ( $this->getData(['page',$childKey,'disable']) === true
 					AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')	) {
-						$itemsLeft .= '<a class="' . $parentPageId . '" href="'.$this->getUrl(1).'">';
+						$items .= '<a class="' . $parentPageId . '" href="'.$this->getUrl(1).'">';
 				} else {
-					$itemsLeft .= '<a class="' . $active . $parentPageId . '" href="' . helper::baseUrl() . $childKey . '"' . $targetBlank  .  '>';
+					$items .= '<a class="' . $active . $parentPageId . '" href="' . helper::baseUrl() . $childKey . '"' . $targetBlank  .  '>';
 				}
 
 				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 .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" />';
+						$items .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" />';
 						} else {
-						$itemsLeft .= $this->getData(['page', $parentPageId, 'title']);
+						$items .= $this->getData(['page', $parentPageId, 'title']);
 						}
 						break;
 					case 'icontitle' :
 						if ($this->getData(['page', $childKey, 'iconUrl']) != "") {
-						$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" data-tippy-content="';
-						$itemsLeft .= $this->getData(['page', $childKey, 'title']).'"/>';
+						$items .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" data-tippy-content="';
+						$items .= $this->getData(['page', $childKey, 'title']).'"/>';
 						} else {
-						$itemsLeft .= $this->getData(['page', $childKey, 'title']);
+						$items .= $this->getData(['page', $childKey, 'title']);
 						}
 						break;
 					case 'icontext' :
 						if ($this->getData(['page', $childKey, 'iconUrl']) != "") {
-						$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" />';
-						$itemsLeft .= $this->getData(['page', $childKey, 'title']);
+						$items .= '<img alt="'.$this->getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" />';
+						$items .= $this->getData(['page', $childKey, 'title']);
 						} else {
-						$itemsLeft .= $this->getData(['page', $childKey, 'title']);
+						$items .= $this->getData(['page', $childKey, 'title']);
 						}
 						break;
 				}
-				$itemsLeft .= '</a></li>';
+				$items .= '</a></li>';
 			}
-			$itemsLeft .= '</ul>';
+			$items .= '</ul>';
 		}
 		// Lien de connexion
-		$itemsRight = '';
 		if(
 			(
 				$this->getData(['theme', 'menu', 'loginLink'])
@@ -2454,7 +2453,7 @@ class layout extends common {
 			)
 			OR $this->getUrl(0) === 'theme'
 		) {
-			$itemsRight .= '<li id="menuLoginLink" ' .
+			$items .= '<li id="menuLoginLink" ' .
 			($this->getUrl(0) === 'theme' ? 'class="displayNone"' : '') .
 			'><a href="' . helper::baseUrl() . 'user/login/' .
 			strip_tags(str_replace('/', '_', $this->getUrl())) .
@@ -2466,11 +2465,11 @@ class layout extends common {
 				|| $this->getData(['theme','footer','displayMemberBar']) === false
 				)
 		) {
-			$itemsRight .= '<li><a href="' . helper::baseUrl() . 'user/edit/' . $this->getUser('id'). '/' . $_SESSION['csrf'] . '" data-tippy-content="Gérer mon compte">' . template::ico('user', 'right') . '</a></li>';
-			$itemsRight .= '<li><a id="barLogout" href="' . helper::baseUrl() . 'user/logout" data-tippy-content="Me déconnecter">' . template::ico('logout') . '</a></li>';
+			$items .= '<li><a href="' . helper::baseUrl() . 'user/edit/' . $this->getUser('id'). '/' . $_SESSION['csrf'] . '" data-tippy-content="Gérer mon compte">' . template::ico('user', 'right') . '</a></li>';
+			$items .= '<li><a id="barLogout" href="' . helper::baseUrl() . 'user/logout" data-tippy-content="Me déconnecter">' . template::ico('logout') . '</a></li>';
 		}
 		// Retourne les items du menu
-		echo '<ul class="navLevel1" id="menuLeft">' . $itemsLeft . '</ul><ul id="menuRight">' . $itemsRight . '</ul>';
+		echo '<ul class="navLevel1">' . $items . '</ul>';
 	}
 
 	/**
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);
 	}
-