diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index d3be68503c0..43c270c188d 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -326,7 +326,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
}
else if ($showmenu)
{
- print '
'."\n";
+ print ''."\n";
}
}
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 35d73f55dcc..bac7e57bc0d 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -175,8 +175,8 @@ class MenuManager
require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
$this->menu=new Menu();
- if ($mode == 'top') $res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu);
- if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu);
+ if ($mode == 'top') $res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0);
+ if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
if ($mode == 'jmobile')
{
$res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1);
@@ -206,7 +206,7 @@ class MenuManager
//var_dump($canonrelurl);
//var_dump($canonnexturl);
print '';
- if ($canonrelurl != $canonnexturl && $val['mainmenu'] != 'home')
+ if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
{
// We add sub entry
print '- '.$langs->trans("MainArea").'-'.$val['titre'].'
'."\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 34ac773b1d1..1e2bf1c7fa2 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1242,7 +1242,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
}
else if ($showmenu)
{
- print ''."\n";
+ print ''."\n";
}
}
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index d1751ead59c..04be9e3563a 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -131,8 +131,8 @@ class MenuManager
require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
$this->menu=new Menu();
- if ($mode == 'top') $res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu);
- if ($mode == 'left') $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu);
+ if ($mode == 'top') $res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0);
+ if ($mode == 'left') $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
if ($mode == 'jmobile')
{
$res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1);
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 14093ce5995..240953afd57 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -60,8 +60,8 @@ class MenuManager
/**
* Show menu
*
- * @param string $mode 'top' or 'left'
- * @return void
+ * @param string $mode 'top', 'left', 'jmobile'
+ * @return void
*/
function showmenu($mode)
{
@@ -72,23 +72,35 @@ class MenuManager
require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
$this->menu=new Menu();
- if ($mode == 'top')
+ $res='ErrorBadParameterForMode';
+
+ $noout=0;
+ if ($mode == 'jmobile') $noout=1;
+
+ if ($mode == 'top' || $mode == 'jmobile')
{
- print_start_menu_array_empty();
+ if (empty($noout)) print_start_menu_array_empty();
// Home
$showmode=1;
$idsel='home';
$classname='class="tmenusel"';
- print_start_menu_entry_empty($idsel, $classname, $showmode);
- 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($showmode);
+ if (empty($noout)) print_start_menu_entry_empty($idsel, $classname, $showmode);
+ if (empty($noout)) print_text_menu_entry_empty($langs->trans("Home"), 1, dol_buildpath('/index.php',1).'?mainmenu=home&leftmenu=', $id, $idsel, $classname, $this->atarget);
+ if (empty($noout)) print_end_menu_entry_empty($showmode);
+ $this->menu->add(dol_buildpath('/index.php',1), $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '');
- print_end_menu_array_empty();
+ if (empty($noout)) print_end_menu_array_empty();
+
+ if ($mode == 'jmobile')
+ {
+ $this->topmenu=dol_clone($this->menu);
+ unset($this->menu->liste);
+ }
}
- if ($mode == 'left')
+ if ($mode == 'left' || $mode == 'jmobile')
{
// Put here left menu entries
// ***** START *****
@@ -113,65 +125,131 @@ class MenuManager
// do not change code after this
- $alt=0;
- $num=count($this->menu->liste);
- for ($i = 0; $i < $num; $i++)
+ if (empty($noout))
{
- $alt++;
- if (empty($this->menu->liste[$i]['level']))
+ $alt=0;
+ $num=count($this->menu->liste);
+ for ($i = 0; $i < $num; $i++)
{
- if (($alt%2==0))
+ $alt++;
+ if (empty($this->menu->liste[$i]['level']))
{
- print '