Refactoring rendu menus

.gitattributes

@@ -2620,7 +2620,8 @@ library/ZendAfi/View/Helper/ListeNotices.php -text
 library/ZendAfi/View/Helper/MapEvents.php -text
 library/ZendAfi/View/Helper/MapForLieu.php -text
 library/ZendAfi/View/Helper/MemoryFormat.php -text
-library/ZendAfi/View/Helper/Menu/MenuEntry.php -text
+library/ZendAfi/View/Helper/Menu/Base.php -text
+library/ZendAfi/View/Helper/Menu/Entry.php -text
 library/ZendAfi/View/Helper/MenuHorizontal.php -text
 library/ZendAfi/View/Helper/ModuleAbstract.php -text
 library/ZendAfi/View/Helper/NewsBibHelper.php -text

library/Class/Profil.php

@@ -1076,6 +1076,14 @@ class Class_Profil extends Storm_Model_Abstract {
 	}
 
 
+	/**
+	 * @return array
+	 */
+	public function getCfgMenuHorizontal() {
+		return $this->getMenu('H')['menus'];
+	}
+
+
 	/**
 	 * @param array $menu
 	 * @return int

library/Class/Systeme/ModulesMenu.php

@@ -48,6 +48,19 @@ class Class_Systeme_ModulesMenu extends Class_Systeme_ModulesAbstract {
 
 	private $fonctions;
 
+
+	public static function isModuleAccueil($menu) {
+		return (false !== strpos($menu['type_menu'], self::MODULE_ACCUEIL_PREFIX));
+	}
+
+
+	public static function moduleAccueilType($menu) {
+		return str_replace(Class_Systeme_ModulesMenu::MODULE_ACCUEIL_PREFIX, 
+								'', 
+								$menu['type_menu']);
+	}
+
+
 	public function __construct() {
 		$this->fonctions = [
 			"vide" => new Class_Systeme_ModulesMenu_Null(),

library/ZendAfi/View/Helper/Menu/Base.php

+<?php
+/**
+ * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * AFI-OPAC 2.0 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * AFI-OPAC 2.0 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with AFI-OPAC 2.0; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
+ */
+
+abstract class ZendAfi_View_Helper_Menu_Base extends ZendAfi_View_Helper_ModuleAbstract {
+	public function __construct($id_module,$params)	{
+		$params['type_module'] = $params['type_menu'];
+		parent::__construct($id_module, $params);
+	}
+
+
+	public static function getModuleHelperFromParams($id_menu, $menu) {
+		if (!array_isset('preferences', $menu))
+			$menu['preferences'] = array();
+		$menu['preferences']['picto'] = $menu['picto'];
+		$menu['preferences']['libelle'] = $menu['libelle'];
+
+		if (Class_Systeme_ModulesMenu::isModuleAccueil($menu)) {
+			$menu['type_module'] = Class_Systeme_ModulesMenu::moduleAccueilType($menu);
+			return ZendAfi_View_Helper_Accueil_Base::getModuleHelperFromParams($id_menu, $menu);
+		}
+
+		return new ZendAfi_View_Helper_Menu_Entry($id_menu, $menu);
+	}
+}
+
+?>
\ No newline at end of file

library/ZendAfi/View/Helper/Menu/MenuEntry.php → library/ZendAfi/View/Helper/Menu/Entry.php

@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
  */
 
-class ZendAfi_View_Helper_Menu_MenuEntry extends ZendAfi_View_Helper_ModuleAbstract {
+class ZendAfi_View_Helper_Menu_Entry extends ZendAfi_View_Helper_Menu_Base {
 	public function getBoite()	{
 		$modMenus = new Class_Systeme_ModulesMenu();
 		$params = $modMenus->getUrl($this->type_module, $this->preferences);

library/ZendAfi/View/Helper/MenuHorizontal.php

@@ -24,86 +24,52 @@
 // Ressources :	- Javascript : menu.js
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 class ZendAfi_View_Helper_MenuHorizontal extends ZendAfi_View_Helper_BaseHelper {
-	private $cls_menu;
 	private $profil;
 	
 	function __construct() {
-		$this->cls_menu = new Class_Systeme_ModulesMenu();
 		$this->profil = Class_Profil::getCurrentProfil();
 	}
 
-	
-	function get_menus(){
-		$menus=$this->profil->getCfgMenusAsArray();
-		return $menus["H"]["menus"];
-	}
-
-	
-	function renderModule($id_menu, $menu){
-		if (!array_isset('preferences', $menu))
-			$menu['preferences'] = array();
-
-		$helper = $this->getModuleHelperFromParams($id_menu, $menu);
-		return $helper->getBoite();
-	}
-
-
-	public function getModuleHelperFromParams($id_menu, $menu) {
-		$menu['preferences']['picto'] = $menu['picto'];
-		$menu['preferences']['libelle'] = $menu['libelle'];
+	public function menuHorizontal() {
+		$menus = $this->profil->getCfgMenuHorizontal();
+		if(!count($menus))
+			return $this->retourErreur($this->translate()->_("Ce menu ne contient aucune entrée."));
 
-		if ($this->isModuleAccueil($menu)) {
-			$menu['type_module'] = str_replace(Class_Systeme_ModulesMenu::MODULE_ACCUEIL_PREFIX, 
-																				 '', 
-																				 $menu['type_menu']);
-			$helper = ZendAfi_View_Helper_Accueil_Base::getModuleHelperFromParams($id_menu, $menu);
-		}	else {
-			$menu['type_module'] = $menu['type_menu'];
-			$helper = new ZendAfi_View_Helper_Menu_MenuEntry($id_menu, $menu);
-		}
-			
-		$helper->setView($this->view);
-		return $helper;
+		return '<div id="menu_horizontal">'
+					 .$this->tagEditMenu()
+					 .$this->renderMenus($menus, '', 'menu')
+					 .'</div>';
 	}
 
 
-	public function isModuleAccueil($menu) {
-		return (false !== strpos($menu['type_menu'], Class_Systeme_ModulesMenu::MODULE_ACCUEIL_PREFIX));
-	}
+	public function renderMenus($menus, $ul_class, $li_class='') {
+		$html = '<ul class="'.$ul_class.'">';
 
-//---------------------------------------------------------------------
-// Fabrique le html (nombre d'entrees principales limite a 10)
-//---------------------------------------------------------------------  
-	public function menuHorizontal() {
-		$menus=$this->get_menus();
-		if(!count($menus)) {
-			return $this->retourErreur($this->translate()->_("Ce menu ne contient aucune entrée."));
-		}
-
-		$html='<div id="menu_horizontal">'.$this->tagEditMenu().'<ul>';
 		foreach($menus as $id_menu => $entree) {
-			$class = $this->isModuleAccueil($entree) ? 'menu boite' : 'menu';
-			$html.='<li class="'.$class.'" 
-				        onmouseover="menu_horizontal_mouse_over(this)"
-								onmouseout="menu_horizontal_mouse_out(this)">';
+			if (Class_Systeme_ModulesMenu::isModuleAccueil($entree))
+				$li_class .= ' boite';
+		
+			$html.='<li class="'.trim($li_class).'">';
 			$html.=$this->renderModule($id_menu, $entree);
 
-			if(array_isset("sous_menus", $entree)) {
-				$html.='<ul class="sous_menu">';
-				foreach($entree["sous_menus"] as $sous_menu) {
-					$html.= $this->isModuleAccueil($sous_menu) ? '<li class="boite">' : '<li>';
-					$html.=$this->renderModule($id_menu, $sous_menu);
-					$html.='</li>';
-				}
-				$html.='</ul>';
-			}
+			if(array_isset('sous_menus', $entree))
+				$html .= $this->renderMenus($entree['sous_menus'], 'sous_menu');
+
 			$html.='</li>';
 		}
-		$html.='</ul></div>';
+
+		$html.='</ul>';
 		return $html;
 	}
 
 
+	function renderModule($id_menu, $menu){
+		$helper = ZendAfi_View_Helper_Menu_Base::getModuleHelperFromParams($id_menu, $menu);
+		$helper->setView($this->view);
+		return $helper->getBoite();
+	}
+
+
 	public function tagEditMenu() {
 		return $this->view->tagAnchor($this->view->url(['module' => 'admin',
 																										'controller' => 'profil',
@@ -120,8 +86,7 @@ class ZendAfi_View_Helper_MenuHorizontal extends ZendAfi_View_Helper_BaseHelper
 //---------------------------------------------------------------------
 // Retour en erreur
 //---------------------------------------------------------------------
-	protected function retourErreur($erreur)
-	{
+	protected function retourErreur($erreur) {
 		return '<br/><span style=background-color:red;color:#FFFFFF;padding:3px;font-size:12px;font-weight:bold;width:auto">'.$erreur.'</span><br/>';
 	}
 }
\ No newline at end of file

public/opac/js/menu.js

@@ -6,8 +6,7 @@ var menuWillOpen = null;
 var menuTimer = null;
 var menuClose = false;
 
-function afficher_sous_menu(anchor)
-{
+function afficher_sous_menu(anchor) {
 		var li=$(anchor).parent('li');
 		if (li.next().children().first().is('ul')) {
 				li.next().toggle('fast');
@@ -61,12 +60,18 @@ function menu_execute_display() {
 
 }
 
+
 function menu_refresh_timer(delay) {
 	if (menuTimer) {
 		clearTimeout(menuTimer);
-
 	}
-
 	menuTimer = setTimeout('menu_execute_display()', delay);
+}
+
+
+function menu_horizontal_init() {
+	$('#menu_horizontal>ul>li').hover(function() {menu_horizontal_mouse_over(this)},
+																		function() {menu_horizontal_mouse_out(this)});
+}
 
-}
\ No newline at end of file
+$(menu_horizontal_init);