diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 1fd6882caa9..03141313182 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -41,6 +41,7 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu)
$mainmenu=$_SESSION["mainmenu"];
$leftmenu=$_SESSION["leftmenu"];
+ $id='mainmenu';
$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
//$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"';
else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
else $classname='class="tmenu"';
+ }
+ else if ($showmode == 2) $classname='class="tmenu"';
- print_start_menu_entry_auguria($idsel,$classname);
- print '
';
- print '';
- print_text_menu_entry_auguria($newTabMenu[$i]['titre']);
- print '';
- print_end_menu_entry_auguria();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry_auguria($idsel,'class="tmenu"');
- print '
';
- print '';
- print_text_menu_entry_auguria($newTabMenu[$i]['titre']);
- print '';
- print_end_menu_entry_auguria();
- }
+ print_start_menu_entry_auguria($idsel,$classname);
+ print_text_menu_entry_auguria($newTabMenu[$i]['titre'], $showmode, $url, $id, $idsel, $classname, $atarget, $newTabMenu[$i]['target']);
+ print_end_menu_entry_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()
{
- global $conf;
print '';
- print '';
+ print '';
print "\n";
}
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index a7af0727301..36ca1269761 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -30,15 +30,15 @@ class MenuManager
{
var $db;
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 $menu_array;
var $menu_array_after;
var $tabMenu;
-
-
+
+
/**
* Constructor
*
@@ -48,14 +48,14 @@ class MenuManager
function __construct($db, $type_user)
{
global $conf, $user, $langs;
-
+
$this->type_user=$type_user;
$this->db=$db;
-
+
// On sauve en session le menu principal choisi
if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"];
-
+
// Read mainmenu and leftmenu that define which menu to show
if (isset($_GET["mainmenu"]))
{
@@ -69,13 +69,13 @@ class MenuManager
// On va le chercher en session si non defini par le lien
$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
}
-
+
if (isset($_GET["leftmenu"]))
{
// On sauve en session le menu principal choisi
$leftmenu=$_GET["leftmenu"];
$_SESSION["leftmenu"]=$leftmenu;
-
+
if ($_SESSION["leftmenuopened"]==$leftmenu) // To collapse
{
//$leftmenu="";
@@ -89,12 +89,12 @@ class MenuManager
// On va le chercher en session si non defini par le lien
$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
}
-
+
require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
$tabMenu=array();
$menuArbo = new Menubase($db,'auguria');
$menuArbo->menuLoad($mainmenu, $leftmenu, $type_user, 'auguria', $tabMenu);
-
+
// 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.
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;
}
-
+
/**
* Show menu
@@ -148,7 +148,7 @@ class MenuManager
function showmenu($mode)
{
global $conf;
-
+
require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
if ($this->type_user == 1)
@@ -156,7 +156,7 @@ class MenuManager
$conf->global->MAIN_SEARCHFORM_SOCIETE=0;
$conf->global->MAIN_SEARCHFORM_CONTACT=0;
}
-
+
$res='ErrorBadParameterForMode';
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);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4aa007e47d6..c6aaa2e392c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -48,24 +48,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
// Home
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
$idsel='home';
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($langs->trans("Home"));
- print '';
- 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&leftmenu=', $id, $idsel, $classname, $atarget);
+ print_end_menu_entry();
// 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');
@@ -76,37 +65,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("suppliers");
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
$idsel='companies';
- if ($showmode == 1)
- {
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($langs->trans("ThirdParties"));
- print '';
- print_end_menu_entry();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry($idsel,$classname);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("ThirdParties"));
- print '';
- print_end_menu_entry();
- }
+ print_start_menu_entry($idsel,$classname);
+ print_text_menu_entry($langs->trans("ThirdParties"), $showmode, DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&leftmenu=', $id, $idsel, $classname, $atarget);
+ print_end_menu_entry();
}
// Products-Services
@@ -117,14 +82,10 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("products");
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
+ $idsel='products';
+
$chaine="";
if (! empty($conf->product->enabled)) {
$chaine.=$langs->trans("Products");
@@ -136,27 +97,9 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$chaine.=$langs->trans("Services");
}
- $idsel='products';
- if ($showmode == 1)
- {
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($chaine);
- print '';
- print_end_menu_entry();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry($idsel,$classname);
- print '
';
- print '';
- print_text_menu_entry($chaine);
- print '';
- print_end_menu_entry();
- }
+ print_start_menu_entry($idsel,$classname);
+ print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/product/index.php?mainmenu=products&leftmenu=', $id, $idsel, $classname, $atarget);
+ print_end_menu_entry();
}
// Commercial
@@ -173,36 +116,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("commercial");
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
$idsel='commercial';
- if ($showmode == 1)
- {
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($langs->trans("Commercial"));
- print '';
- print_end_menu_entry();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry($idsel,$classname);
- print '
';
- print '';
- print print_text_menu_entry($langs->trans("Commercial"));
- print '';
- print_end_menu_entry();
- }
+
+ print_start_menu_entry($idsel,$classname);
+ print_text_menu_entry($langs->trans("Commercial"), $showmode, DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&leftmenu=', $id, $idsel, $classname, $atarget);
+ print_end_menu_entry();
}
// Financial
@@ -215,36 +135,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("compta");
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
$idsel='accountancy';
- if ($showmode == 1)
- {
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($langs->trans("MenuFinancial"));
- print '';
- print_end_menu_entry();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry($idsel,$classname);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("MenuFinancial"));
- print '';
- print_end_menu_entry();
- }
+
+ print_start_menu_entry($idsel,$classname);
+ print_text_menu_entry($langs->trans("MenuFinancial"), $showmode, DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&leftmenu=', $id, $idsel, $classname, $atarget);
+ print_end_menu_entry();
}
// Bank
@@ -258,36 +155,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("banks");
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
$idsel='bank';
- if ($showmode == 1)
- {
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($langs->trans("MenuBankCash"));
- print '';
- print_end_menu_entry();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry($idsel,$classname);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("MenuBankCash"));
- print '';
- print_end_menu_entry();
- }
+
+ print_start_menu_entry($idsel,$classname);
+ print_text_menu_entry($langs->trans("MenuBankCash"), $showmode, DOL_URL_ROOT.'/compta/bank/index.php?mainmenu=bank&leftmenu=', $id, $idsel, $classname, $atarget);
+ print_end_menu_entry();
}
// Projects
@@ -300,36 +174,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("projects");
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
$idsel='project';
- if ($showmode == 1)
- {
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($langs->trans("Projects"));
- print '';
- print_end_menu_entry();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry($idsel,$classname);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("Projects"));
- print '';
- print_end_menu_entry();
- }
+
+ print_start_menu_entry($idsel,$classname);
+ print_text_menu_entry($langs->trans("Projects"), $showmode, DOL_URL_ROOT.'/projet/index.php?mainmenu=project&leftmenu=', $id, $idsel, $classname, $atarget);
+ print_end_menu_entry();
}
// Tools
@@ -342,36 +193,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("other");
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
$idsel='tools';
- if ($showmode == 1)
- {
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($langs->trans("Tools"));
- print '';
- print_end_menu_entry();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry($idsel,$classname);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("Tools"));
- print '';
- print_end_menu_entry();
- }
+
+ print_start_menu_entry($idsel,$classname);
+ print_text_menu_entry($langs->trans("Tools"), $showmode, DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&leftmenu=', $id, $idsel, $classname, $atarget);
+ print_end_menu_entry();
}
// OSCommerce 1
@@ -384,23 +212,12 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
$langs->load("shop");
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
$idsel='shop';
+
print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($langs->trans("OSCommerce"));
- print '';
+ print_text_menu_entry($langs->trans("OSCommerce"), $showmode, DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&leftmenu=', $id, $idsel, $classname, $atarget);
print_end_menu_entry();
}
@@ -412,36 +229,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
if ($showmode)
{
$classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
$idsel='members';
- if ($showmode == 1)
- {
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($langs->trans("MenuMembers"));
- print '';
- print_end_menu_entry();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry($idsel,$classname);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("MenuMembers"));
- print '';
- print_end_menu_entry();
- }
+
+ print_start_menu_entry($idsel,$classname);
+ print_text_menu_entry($langs->trans("MenuMembers"), $showmode, DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&leftmenu=', $id, $idsel, $classname, $atarget);
+ 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"';
else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
else $classname='class="tmenu"';
+ }
+ else if ($showmode == 2) $classname='class="tmenu"';
- print_start_menu_entry($idsel,$classname);
- print '';
- print '';
- print_text_menu_entry($newTabMenu[$i]['titre']);
- print '';
- print_end_menu_entry();
- }
- else if ($showmode == 2)
- {
- print_start_menu_entry($idsel,'class="tmenu"');
- print '
';
- print '';
- print_text_menu_entry($newTabMenu[$i]['titre']);
- print '';
- print_end_menu_entry();
- }
+ print_start_menu_entry($idsel,$classname);
+ print_text_menu_entry($newTabMenu[$i]['titre'], $showmode, $url, $id, $idsel, $classname, $atarget, $newTabMenu[$i]['target']);
+ print_end_menu_entry();
}
print_end_menu_array();
@@ -531,13 +312,35 @@ function print_start_menu_entry($idsel,$classname)
* Output menu entry
*
* @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
*/
-function print_text_menu_entry($text)
+function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menutarget='')
{
- print '';
- print $text;
- print '';
+ global $langs;
+
+ if ($showmode == 1)
+ {
+ print '';
+ print '';
+ print '';
+ print $text;
+ print '';
+ print '';
+ }
+ if ($showmode == 2)
+ {
+ print '
';
+ print '';
+ }
}
/**
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index c9902b4009f..afebe8d9e6a 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -29,7 +29,7 @@ class MenuManager
{
var $db;
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 $menu_array;
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 705dc2cf293..0742df8ac4e 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -27,7 +27,7 @@ class MenuManager
{
var $db;
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_after;
@@ -54,20 +54,17 @@ class MenuManager
{
global $user,$conf,$langs,$dolibarr_main_db_name;
+ $id='mainmenu';
+
if ($mode == 'top')
{
print_start_menu_array_empty();
$idsel='home';
- $classname='class="tmenu"';
+ $classname='class="tmenusel"';
- print_start_menu_entry_empty($idsel);
- print '';
- print 'atarget?' target="'.$this->atarget.'"':'').'>';
- print_text_menu_entry_empty($langs->trans("Home"));
- print '';
+ print_start_menu_entry_empty($idsel, $classname);
+ print_text_menu_entry_empty($langs->trans("Home"), 1, dol_buildpath('/index.php',1).'?mainmenu=home&leftmenu=', $id, $idsel, $classname, $this->atarget);
print_end_menu_entry_empty();
print_end_menu_array_empty();
@@ -173,36 +170,56 @@ class MenuManager
*/
function print_start_menu_array_empty()
{
- global $conf;
- if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '';
- else print '';
+ print '';
+ print '';
print "\n";
}