Qual: Rewrite of menu manager. next step.

This commit is contained in:
Laurent Destailleur 2013-02-27 21:40:43 +01:00
parent b9848702a8
commit 33feddcd32
5 changed files with 177 additions and 350 deletions

View File

@ -41,6 +41,7 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu)
$mainmenu=$_SESSION["mainmenu"]; $mainmenu=$_SESSION["mainmenu"];
$leftmenu=$_SESSION["leftmenu"]; $leftmenu=$_SESSION["leftmenu"];
$id='mainmenu';
$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL); $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
//$tabMenu=array(); //$tabMenu=array();
@ -79,23 +80,12 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu)
if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"'; if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';
else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"'; else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
else $classname='class="tmenu"'; else $classname='class="tmenu"';
}
else if ($showmode == 2) $classname='class="tmenu"';
print_start_menu_entry_auguria($idsel,$classname); print_start_menu_entry_auguria($idsel,$classname);
print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print_text_menu_entry_auguria($newTabMenu[$i]['titre'], $showmode, $url, $id, $idsel, $classname, $atarget, $newTabMenu[$i]['target']);
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($newTabMenu[$i]['target']?' target="'.$newTabMenu[$i]['target'].'"':($atarget?' target="'.$atarget.'"':'')).'>'; print_end_menu_entry_auguria();
print_text_menu_entry_auguria($newTabMenu[$i]['titre']);
print '</a>';
print_end_menu_entry_auguria();
}
else if ($showmode == 2)
{
print_start_menu_entry_auguria($idsel,'class="tmenu"');
print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry_auguria($newTabMenu[$i]['titre']);
print '</a>';
print_end_menu_entry_auguria();
}
} }
print_end_menu_array_auguria(); print_end_menu_array_auguria();
@ -111,7 +101,6 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu)
*/ */
function print_start_menu_array_auguria() function print_start_menu_array_auguria()
{ {
global $conf;
print '<div class="tmenudiv">'; print '<div class="tmenudiv">';
print '<ul class="tmenu">'; print '<ul class="tmenu">';
} }
@ -133,13 +122,35 @@ function print_start_menu_entry_auguria($idsel,$classname)
* Output menu entry * Output menu entry
* *
* @param string $text Text * @param string $text Text
* @param int $showmode 1 or 2
* @param string $url Url
* @param string $id Id
* @param string $idsel Id sel
* @param string $classname Class name
* @param string $atarget Target
* @param string $menutarget Menu target (may be empty)
* @return void * @return void
*/ */
function print_text_menu_entry_auguria($text) function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menutarget='')
{ {
print '<span class="mainmenuaspan">'; global $langs;
print $text;
print '</span>'; if ($showmode == 1)
{
print '<a class="tmenuimage" href="'.$url.'"'.($menutarget?" target='".$menutarget."'":($atarget?' target="'.$atarget.'"':'')).'>';
print '<div class="'.$id.' '.$idsel.'"><span class="mainmenu_'.$idsel.' '.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($menutarget?" target='".$menutarget."'":($atarget?' target="'.$atarget.'"':'')).'>';
print '<span class="mainmenuaspan">';
print $text;
print '</span>';
print '</a>';
}
if ($showmode == 2)
{
print '<div class="'.$id.' '.$idsel.'"><span class="mainmenu_'.$idsel.' '.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
}
} }
/** /**
@ -149,8 +160,7 @@ function print_text_menu_entry_auguria($text)
*/ */
function print_end_menu_entry_auguria() function print_end_menu_entry_auguria()
{ {
print '</div>'; print '</div></li>';
print '</li>';
print "\n"; print "\n";
} }

View File

@ -30,15 +30,15 @@ class MenuManager
{ {
var $db; var $db;
var $type_user; // Put 0 for internal users, 1 for external users var $type_user; // Put 0 for internal users, 1 for external users
var $atarget=""; // Valeur du target a utiliser dans les liens var $atarget=""; // To store default target to use onto links
var $name="auguria"; var $name="auguria";
var $menu_array; var $menu_array;
var $menu_array_after; var $menu_array_after;
var $tabMenu; var $tabMenu;
/** /**
* Constructor * Constructor
* *
@ -48,14 +48,14 @@ class MenuManager
function __construct($db, $type_user) function __construct($db, $type_user)
{ {
global $conf, $user, $langs; global $conf, $user, $langs;
$this->type_user=$type_user; $this->type_user=$type_user;
$this->db=$db; $this->db=$db;
// On sauve en session le menu principal choisi // On sauve en session le menu principal choisi
if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"]; if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"]; if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"];
// Read mainmenu and leftmenu that define which menu to show // Read mainmenu and leftmenu that define which menu to show
if (isset($_GET["mainmenu"])) if (isset($_GET["mainmenu"]))
{ {
@ -69,13 +69,13 @@ class MenuManager
// On va le chercher en session si non defini par le lien // On va le chercher en session si non defini par le lien
$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:''; $mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
} }
if (isset($_GET["leftmenu"])) if (isset($_GET["leftmenu"]))
{ {
// On sauve en session le menu principal choisi // On sauve en session le menu principal choisi
$leftmenu=$_GET["leftmenu"]; $leftmenu=$_GET["leftmenu"];
$_SESSION["leftmenu"]=$leftmenu; $_SESSION["leftmenu"]=$leftmenu;
if ($_SESSION["leftmenuopened"]==$leftmenu) // To collapse if ($_SESSION["leftmenuopened"]==$leftmenu) // To collapse
{ {
//$leftmenu=""; //$leftmenu="";
@ -89,12 +89,12 @@ class MenuManager
// On va le chercher en session si non defini par le lien // On va le chercher en session si non defini par le lien
$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:''; $leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
} }
require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
$tabMenu=array(); $tabMenu=array();
$menuArbo = new Menubase($db,'auguria'); $menuArbo = new Menubase($db,'auguria');
$menuArbo->menuLoad($mainmenu, $leftmenu, $type_user, 'auguria', $tabMenu); $menuArbo->menuLoad($mainmenu, $leftmenu, $type_user, 'auguria', $tabMenu);
// Modules system tools // Modules system tools
// TODO Find a way to add parent menu only if child menu exists. For the moment, no other method than hard coded methods. // TODO Find a way to add parent menu only if child menu exists. For the moment, no other method than hard coded methods.
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS)) if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS))
@ -134,10 +134,10 @@ class MenuManager
)); ));
} }
} }
$this->tabMenu=$tabMenu; $this->tabMenu=$tabMenu;
} }
/** /**
* Show menu * Show menu
@ -148,7 +148,7 @@ class MenuManager
function showmenu($mode) function showmenu($mode)
{ {
global $conf; global $conf;
require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
if ($this->type_user == 1) if ($this->type_user == 1)
@ -156,7 +156,7 @@ class MenuManager
$conf->global->MAIN_SEARCHFORM_SOCIETE=0; $conf->global->MAIN_SEARCHFORM_SOCIETE=0;
$conf->global->MAIN_SEARCHFORM_CONTACT=0; $conf->global->MAIN_SEARCHFORM_CONTACT=0;
} }
$res='ErrorBadParameterForMode'; $res='ErrorBadParameterForMode';
if ($mode == 'top') $res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu); if ($mode == 'top') $res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu);
if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu); if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu);

View File

@ -48,24 +48,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
// Home // Home
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='home'; $idsel='home';
print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($atarget?" target=$atarget":"").'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($langs->trans("Home"));
print '</a>';
print_end_menu_entry();
print_start_menu_entry($idsel,$classname);
print_text_menu_entry($langs->trans("Home"), 1, DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu=', $id, $idsel, $classname, $atarget);
print_end_menu_entry();
// Third parties // Third parties
$tmpentry=array('enabled'=>(! empty($conf->societe->enabled) || ! empty($conf->fournisseur->enabled)), 'perms'=>(! empty($user->rights->societe->lire) || ! empty($user->rights->fournisseur->lire)), 'module'=>'societe|fournisseur'); $tmpentry=array('enabled'=>(! empty($conf->societe->enabled) || ! empty($conf->fournisseur->enabled)), 'perms'=>(! empty($user->rights->societe->lire) || ! empty($user->rights->fournisseur->lire)), 'module'=>'societe|fournisseur');
@ -76,37 +65,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("suppliers"); $langs->load("suppliers");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='companies'; $idsel='companies';
if ($showmode == 1) print_start_menu_entry($idsel,$classname);
{ print_text_menu_entry($langs->trans("ThirdParties"), $showmode, DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu=', $id, $idsel, $classname, $atarget);
print_start_menu_entry($idsel,$classname); print_end_menu_entry();
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($langs->trans("ThirdParties"));
print '</a>';
print_end_menu_entry();
}
else if ($showmode == 2)
{
print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("ThirdParties"));
print '</a>';
print_end_menu_entry();
}
} }
// Products-Services // Products-Services
@ -117,14 +82,10 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("products"); $langs->load("products");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $idsel='products';
}
else
{
$classname = 'class="tmenu"';
}
$chaine=""; $chaine="";
if (! empty($conf->product->enabled)) { if (! empty($conf->product->enabled)) {
$chaine.=$langs->trans("Products"); $chaine.=$langs->trans("Products");
@ -136,27 +97,9 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$chaine.=$langs->trans("Services"); $chaine.=$langs->trans("Services");
} }
$idsel='products'; print_start_menu_entry($idsel,$classname);
if ($showmode == 1) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu=', $id, $idsel, $classname, $atarget);
{ print_end_menu_entry();
print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($chaine);
print '</a>';
print_end_menu_entry();
}
else if ($showmode == 2)
{
print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($chaine);
print '</a>';
print_end_menu_entry();
}
} }
// Commercial // Commercial
@ -173,36 +116,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("commercial"); $langs->load("commercial");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='commercial'; $idsel='commercial';
if ($showmode == 1)
{ print_start_menu_entry($idsel,$classname);
print_start_menu_entry($idsel,$classname); print_text_menu_entry($langs->trans("Commercial"), $showmode, DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu=', $id, $idsel, $classname, $atarget);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print_end_menu_entry();
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="'.$id.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($langs->trans("Commercial"));
print '</a>';
print_end_menu_entry();
}
else if ($showmode == 2)
{
print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print print_text_menu_entry($langs->trans("Commercial"));
print '</a>';
print_end_menu_entry();
}
} }
// Financial // Financial
@ -215,36 +135,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("compta"); $langs->load("compta");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='accountancy'; $idsel='accountancy';
if ($showmode == 1)
{ print_start_menu_entry($idsel,$classname);
print_start_menu_entry($idsel,$classname); print_text_menu_entry($langs->trans("MenuFinancial"), $showmode, DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu=', $id, $idsel, $classname, $atarget);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print_end_menu_entry();
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($langs->trans("MenuFinancial"));
print '</a>';
print_end_menu_entry();
}
else if ($showmode == 2)
{
print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("MenuFinancial"));
print '</a>';
print_end_menu_entry();
}
} }
// Bank // Bank
@ -258,36 +155,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("banks"); $langs->load("banks");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='bank'; $idsel='bank';
if ($showmode == 1)
{ print_start_menu_entry($idsel,$classname);
print_start_menu_entry($idsel,$classname); print_text_menu_entry($langs->trans("MenuBankCash"), $showmode, DOL_URL_ROOT.'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=', $id, $idsel, $classname, $atarget);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/compta/bank/index.php?mainmenu=bank&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print_end_menu_entry();
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/compta/bank/index.php?mainmenu=bank&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($langs->trans("MenuBankCash"));
print '</a>';
print_end_menu_entry();
}
else if ($showmode == 2)
{
print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("MenuBankCash"));
print '</a>';
print_end_menu_entry();
}
} }
// Projects // Projects
@ -300,36 +174,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("projects"); $langs->load("projects");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='project'; $idsel='project';
if ($showmode == 1)
{ print_start_menu_entry($idsel,$classname);
print_start_menu_entry($idsel,$classname); print_text_menu_entry($langs->trans("Projects"), $showmode, DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu=', $id, $idsel, $classname, $atarget);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print_end_menu_entry();
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($langs->trans("Projects"));
print '</a>';
print_end_menu_entry();
}
else if ($showmode == 2)
{
print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("Projects"));
print '</a>';
print_end_menu_entry();
}
} }
// Tools // Tools
@ -342,36 +193,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("other"); $langs->load("other");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='tools'; $idsel='tools';
if ($showmode == 1)
{ print_start_menu_entry($idsel,$classname);
print_start_menu_entry($idsel,$classname); print_text_menu_entry($langs->trans("Tools"), $showmode, DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu=', $id, $idsel, $classname, $atarget);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print_end_menu_entry();
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($langs->trans("Tools"));
print '</a>';
print_end_menu_entry();
}
else if ($showmode == 2)
{
print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("Tools"));
print '</a>';
print_end_menu_entry();
}
} }
// OSCommerce 1 // OSCommerce 1
@ -384,23 +212,12 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("shop"); $langs->load("shop");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='shop'; $idsel='shop';
print_start_menu_entry($idsel,$classname); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print_text_menu_entry($langs->trans("OSCommerce"), $showmode, DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu=', $id, $idsel, $classname, $atarget);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($langs->trans("OSCommerce"));
print '</a>';
print_end_menu_entry(); print_end_menu_entry();
} }
@ -412,36 +229,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
if ($showmode) if ($showmode)
{ {
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
{ else $classname = 'class="tmenu"';
$classname='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$classname = 'class="tmenu"';
}
$idsel='members'; $idsel='members';
if ($showmode == 1)
{ print_start_menu_entry($idsel,$classname);
print_start_menu_entry($idsel,$classname); print_text_menu_entry($langs->trans("MenuMembers"), $showmode, DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu=', $id, $idsel, $classname, $atarget);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print_end_menu_entry();
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print_text_menu_entry($langs->trans("MenuMembers"));
print '</a>';
print_end_menu_entry();
}
else if ($showmode == 2)
{
print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("MenuMembers"));
print '</a>';
print_end_menu_entry();
}
} }
@ -478,25 +272,12 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"'; if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';
else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"'; else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
else $classname='class="tmenu"'; else $classname='class="tmenu"';
}
else if ($showmode == 2) $classname='class="tmenu"';
print_start_menu_entry($idsel,$classname); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.$url.'"'.($newTabMenu[$i]['target']?" target='".$newTabMenu[$i]['target']."'":($atarget?' target="'.$atarget.'"':'')).'>'; print_text_menu_entry($newTabMenu[$i]['titre'], $showmode, $url, $id, $idsel, $classname, $atarget, $newTabMenu[$i]['target']);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print_end_menu_entry();
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($newTabMenu[$i]['target']?" target='".$newTabMenu[$i]['target']."'":($atarget?' target="'.$atarget.'"':'')).'>';
print_text_menu_entry($newTabMenu[$i]['titre']);
print '</a>';
print_end_menu_entry();
}
else if ($showmode == 2)
{
print_start_menu_entry($idsel,'class="tmenu"');
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($newTabMenu[$i]['titre']);
print '</a>';
print_end_menu_entry();
}
} }
print_end_menu_array(); print_end_menu_array();
@ -531,13 +312,35 @@ function print_start_menu_entry($idsel,$classname)
* Output menu entry * Output menu entry
* *
* @param string $text Text * @param string $text Text
* @param int $showmode 1 or 2
* @param string $url Url
* @param string $id Id
* @param string $idsel Id sel
* @param string $classname Class name
* @param string $atarget Target
* @param string $menutarget Menu target (may be empty)
* @return void * @return void
*/ */
function print_text_menu_entry($text) function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menutarget='')
{ {
print '<span class="mainmenuaspan">'; global $langs;
print $text;
print '</span>'; if ($showmode == 1)
{
print '<a class="tmenuimage" href="'.$url.'"'.($menutarget?" target='".$menutarget."'":($atarget?' target="'.$atarget.'"':'')).'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($menutarget?" target='".$menutarget."'":($atarget?' target="'.$atarget.'"':'')).'>';
print '<span class="mainmenuaspan">';
print $text;
print '</span>';
print '</a>';
}
if ($showmode == 2)
{
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
}
} }
/** /**

View File

@ -29,7 +29,7 @@ class MenuManager
{ {
var $db; var $db;
var $type_user; // Put 0 for internal users, 1 for external users var $type_user; // Put 0 for internal users, 1 for external users
var $atarget=""; // Valeur du target a utiliser dans les liens var $atarget=""; // To store default target to use onto links
var $name="eldy"; var $name="eldy";
var $menu_array; var $menu_array;

View File

@ -27,7 +27,7 @@ class MenuManager
{ {
var $db; var $db;
var $type_user=0; // Put 0 for internal users, 1 for external users var $type_user=0; // Put 0 for internal users, 1 for external users
var $atarget=""; // To store arget to use in menu links var $atarget=""; // To store default target to use onto links
var $menu_array; var $menu_array;
var $menu_array_after; var $menu_array_after;
@ -54,20 +54,17 @@ class MenuManager
{ {
global $user,$conf,$langs,$dolibarr_main_db_name; global $user,$conf,$langs,$dolibarr_main_db_name;
$id='mainmenu';
if ($mode == 'top') if ($mode == 'top')
{ {
print_start_menu_array_empty(); print_start_menu_array_empty();
$idsel='home'; $idsel='home';
$classname='class="tmenu"'; $classname='class="tmenusel"';
print_start_menu_entry_empty($idsel); print_start_menu_entry_empty($idsel, $classname);
print '<a class="tmenuimage" href="'.dol_buildpath('/index.php',1).'?mainmenu=home&amp;leftmenu="'.($this->atarget?' target="'.$this->atarget.'"':'').'>'; print_text_menu_entry_empty($langs->trans("Home"), 1, dol_buildpath('/index.php',1).'?mainmenu=home&amp;leftmenu=', $id, $idsel, $classname, $this->atarget);
print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'"'.($this->atarget?' target="'.$this->atarget.'"':'').'>';
print_text_menu_entry_empty($langs->trans("Home"));
print '</a>';
print_end_menu_entry_empty(); print_end_menu_entry_empty();
print_end_menu_array_empty(); print_end_menu_array_empty();
@ -173,36 +170,56 @@ class MenuManager
*/ */
function print_start_menu_array_empty() function print_start_menu_array_empty()
{ {
global $conf; print '<div class="tmenudiv">';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<table class="tmenu" summary="topmenu"><tr class="tmenu">'; print '<ul class="tmenu">';
else print '<ul class="tmenu">';
} }
/** /**
* Output start menu entry * Output start menu entry
* *
* @param string $idsel Text * @param string $idsel Text
* @param string $classname String to add a css class
* @return void * @return void
*/ */
function print_start_menu_entry_empty($idsel) function print_start_menu_entry_empty($idsel,$classname)
{ {
global $conf; print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<td class="tmenu" id="mainmenutd_'.$idsel.'">'; print '<div class="tmenuleft"></div><div class="tmenucenter">';
else print '<li class="tmenu" id="mainmenutd_'.$idsel.'">';
} }
/** /**
* Output menu entry * Output menu entry
* *
* @param string $text Text * @param string $text Text
* @param int $showmode 1 or 2
* @param string $url Url
* @param string $id Id
* @param string $idsel Id sel
* @param string $classname Class name
* @param string $atarget Target
* @param string $menutarget Menu target (may be empty)
* @return void * @return void
*/ */
function print_text_menu_entry_empty($text) function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menutarget='')
{ {
global $conf; global $conf;
print '<span class="mainmenuaspan">';
print $text; if ($showmode == 1)
print '</span>'; {
print '<a class="tmenuimage" href="'.$url.'"'.($menutarget?" target='".$menutarget."'":($atarget?' target="'.$atarget.'"':'')).'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($menutarget?" target='".$menutarget."'":($atarget?' target="'.$atarget.'"':'')).'>';
print '<span class="mainmenuaspan">';
print $text;
print '</span>';
print '</a>';
}
if ($showmode == 2)
{
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
}
} }
/** /**
@ -212,9 +229,7 @@ function print_text_menu_entry_empty($text)
*/ */
function print_end_menu_entry_empty() function print_end_menu_entry_empty()
{ {
global $conf; print '</div></li>';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</td>';
else print '</li>';
print "\n"; print "\n";
} }
@ -225,9 +240,8 @@ function print_end_menu_entry_empty()
*/ */
function print_end_menu_array_empty() function print_end_menu_array_empty()
{ {
global $conf; print '</ul>';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</tr></table>'; print '</div>';
else print '</ul>';
print "\n"; print "\n";
} }