*
* This program is free software; you can redistribute it and/or modify
@@ -36,6 +36,7 @@ if ($user->societe_id > 0)
$socid = $user->societe_id;
}
+$langs->load("admin");
$langs->load("companies");
$langs->load("users");
$langs->load("other");
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 73e582de5c3..4510f487bfa 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -25,6 +25,8 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/interfaces.class.php");
+$langs->load("admin");
+
if (!$user->admin)
accessforbidden();
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index bef6270ba45..4497041c0e4 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -205,9 +205,8 @@ class Conf
// conf->menu_top et conf->menu_left are defined in main.inc.php (according to user choice)
if (! $this->global->MAIN_MENU_BARRETOP) $this->global->MAIN_MENU_BARRETOP="eldy_backoffice.php";
if (! $this->global->MAIN_MENUFRONT_BARRETOP) $this->global->MAIN_MENUFRONT_BARRETOP="eldy_frontoffice.php";
- if (! $this->global->MAIN_MENU_BARRELEFT) $this->global->MAIN_MENU_BARRELEFT="eldy_backoffice.php";
- if (! $this->global->MAIN_MENUFRONT_BARRELEFT) $this->global->MAIN_MENUFRONT_BARRELEFT="eldy_frontoffice.php";
-
+ //if (! $this->global->MAIN_MENU_BARRELEFT) $this->global->MAIN_MENU_BARRELEFT="eldy_backoffice.php";
+ //if (! $this->global->MAIN_MENUFRONT_BARRELEFT) $this->global->MAIN_MENUFRONT_BARRELEFT="eldy_frontoffice.php";
if (empty($this->global->MAIN_MENU_SMARTPHONE)) $this->global->MAIN_MENU_SMARTPHONE="iphone_backoffice.php";
if (empty($this->global->MAIN_MENUFRONT_SMARTPHONE)) $this->global->MAIN_MENUFRONT_SMARTPHONE="iphone_frontoffice.php";
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index 46875d176f0..95679d8ff29 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -66,10 +66,10 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_M
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Longueur maximum des listes',0,0);
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SHOW_WORKBOARD','1','yesno','Affichage tableau de bord de travail Dolibarr',0,0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_BARRETOP','eldy_backoffice.php','chaine','Module de gestion de la barre de menu du haut pour utilisateurs internes',0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_BARRETOP','eldy_frontoffice.php','chaine','Module de gestion de la barre de menu du haut pour utilisateurs externes',0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_BARRELEFT','eldy_backoffice.php','chaine','Module de gestion de la barre de menu gauche pour utilisateurs internes',0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_BARRELEFT','eldy_frontoffice.php','chaine','Module de gestion de la barre de menu gauche pour utilisateurs externes',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_BARRETOP','eldy_backoffice.php','chaine','Module de gestion de la barre de menu pour utilisateurs internes',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_BARRETOP','eldy_frontoffice.php','chaine','Module de gestion de la barre de menu pour utilisateurs externes',0);
+--insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_BARRELEFT','eldy_backoffice.php','chaine','Module de gestion de la barre de menu gauche pour utilisateurs internes',0);
+--insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_BARRELEFT','eldy_frontoffice.php','chaine','Module de gestion de la barre de menu gauche pour utilisateurs externes',0);
insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_SMARTPHONE','iphone_backoffice.php','chaine','Module de gestion de la barre de menu smartphone pour utilisateurs internes',0);
insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_SMARTPHONE','iphone_frontoffice.php','chaine','Module de gestion de la barre de menu smartphone pour utilisateurs externes',0);
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 338bcd0fd13..4e98103cd7f 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -685,9 +685,11 @@ MenuCompanySetup= Société/Institution
MenuNewUser= Nouvel utilisateur
MenuTopManager= Gestionnaire du menu haut
MenuLeftManager= Gestionnaire du menu gauche
+MenuManager= Gestionnaire du menu standard
MenuSmartphoneManager= Gestionnaire du menu smartphone
DefaultMenuTopManager= Gestionnaire du menu haut
DefaultMenuLeftManager= Gestionnaire du menu gauche
+DefaultMenuManager= Gestionnaire du menu standard
DefaultMenuSmartphoneManager= Gestionnaire du menu smartphone
Skin= Thème visuel
DefaultSkin= Thème visuel par défaut
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 07b827aeea7..0179bd06a6b 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -1919,7 +1919,8 @@ function dol_print_error($db='',$error='')
$out.="
\n";
$out.="".$langs->trans("RequestedUrl").": ".$_SERVER["REQUEST_URI"]."
\n";;
$out.="".$langs->trans("Referer").": ".(isset($_SERVER["HTTP_REFERER"])?$_SERVER["HTTP_REFERER"]:'')."
\n";;
- $out.="".$langs->trans("MenuManager").": ".$conf->top_menu.($conf->top_menu||$conf->left_menu?'/':'').$conf->left_menu."
\n";
+ //$out.="".$langs->trans("MenuManager").": ".$conf->top_menu.($conf->top_menu||$conf->left_menu?'/':'').$conf->left_menu."
\n";
+ $out.="".$langs->trans("MenuManager").": ".$conf->top_menu."
\n";
$out.="
\n";
$syslog.="url=".$_SERVER["REQUEST_URI"];
$syslog.=", query_string=".$_SERVER["QUERY_STRING"];
@@ -2194,7 +2195,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
}
else
{
- if ($picto && $titre) print ''.img_picto('',$picto, '', $pictoisfullpath).' | ';
+ if (empty($conf->browser->phone) && $picto && $titre) print ''.img_picto('',$picto, '', $pictoisfullpath).' | ';
print '';
print ' '.$titre.' ';
$pagelist.= $langs->trans('Page').' '.($page+1);
@@ -2203,7 +2204,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
}
else
{
- if ($picto && $titre) print ' | '.img_picto('',$picto, '', $pictoisfullpath).' | ';
+ if (empty($conf->browser->phone) && $picto && $titre) print ''.img_picto('',$picto, '', $pictoisfullpath).' | ';
print ''.$titre.' | ';
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 38101f5b8c7..6353cf2ecf5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -663,21 +663,22 @@ if (! empty($_GET["theme"]))
if (empty($user->societe_id)) // If internal user or not defined
{
$conf->top_menu=$conf->global->MAIN_MENU_BARRETOP;
- $conf->left_menu=$conf->global->MAIN_MENU_BARRELEFT;
+ //$conf->left_menu=$conf->global->MAIN_MENU_BARRELEFT;
$conf->smart_menu=$conf->global->MAIN_MENU_SMARTPHONE;
// For backward compatibility
- if ($conf->left_menu == 'eldy.php') $conf->left_menu='eldy_backoffice.php';
+ if ($conf->top_menu == 'eldy.php') $conf->top_menu='eldy_backoffice.php';
+ //if ($conf->left_menu == 'eldy.php') $conf->left_menu='eldy_backoffice.php';
if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_backoffice.php';
- if ($conf->left_menu == 'rodolphe.php') $conf->left_menu='eldy_backoffice.php';
+ //if ($conf->left_menu == 'rodolphe.php') $conf->left_menu='eldy_backoffice.php';
}
else // If external user
{
$conf->top_menu=$conf->global->MAIN_MENUFRONT_BARRETOP;
- $conf->left_menu=$conf->global->MAIN_MENUFRONT_BARRELEFT;
+ //$conf->left_menu=$conf->global->MAIN_MENUFRONT_BARRELEFT;
$conf->smart_menu=$conf->global->MAIN_MENUFRONT_SMARTPHONE;
// For backward compatibility
if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_frontoffice.php';
- if ($conf->left_menu == 'rodolphe.php') $conf->left_menu='eldy_frontoffice.php';
+ //if ($conf->left_menu == 'rodolphe.php') $conf->left_menu='eldy_frontoffice.php';
}
if (! defined('NOLOGIN'))
@@ -942,7 +943,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$html=new Form($db);
if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php';
- if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php';
+ //if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php';
// For backward compatibility with old modules
@@ -954,17 +955,17 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
/*
* Top menu
*/
- print "\n".''."\n";
- print '