From 0de3bff0b7fe12eb4f10a9895864bd45cf33ca30 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 29 Sep 2010 10:10:33 +0000
Subject: [PATCH] Qual: Menu management is simpler (no difference between left
and top in setup).
---
htdocs/admin/menus.php | 18 +++++++------
htdocs/admin/menus/edit.php | 8 +++---
htdocs/admin/menus/index.php | 8 +++---
htdocs/admin/modules.php | 2 +-
htdocs/admin/system/dolibarr.php | 4 +--
htdocs/admin/tools/listevents.php | 3 ++-
htdocs/admin/triggers.php | 2 ++
htdocs/core/class/conf.class.php | 5 ++--
htdocs/install/mysql/data/llx_const.sql | 8 +++---
htdocs/langs/fr_FR/admin.lang | 2 ++
htdocs/lib/functions.lib.php | 7 ++---
htdocs/main.inc.php | 34 +++++++++++++------------
htdocs/public/demo/index.php | 2 +-
htdocs/theme/auguria/style.css.php | 8 ++++++
htdocs/theme/eldy/style.css.php | 8 ++++++
htdocs/theme/freelug/style.css.php | 9 +++++++
htdocs/theme/yellow/style.css.php | 8 ++++++
htdocs/user/param_ihm.php | 2 +-
18 files changed, 90 insertions(+), 48 deletions(-)
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 088181b4b79..95f0d77d8c2 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -62,19 +62,19 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can
$_SESSION["mainmenu"]="home"; // Le gestionnaire de menu a pu changer
dolibarr_set_const($db, "MAIN_MENU_BARRETOP", $_POST["main_menu_barretop"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_MENU_BARRELEFT", $_POST["main_menu_barreleft"],'chaine',0,'',$conf->entity);
+ //dolibarr_set_const($db, "MAIN_MENU_BARRELEFT", $_POST["main_menu_barreleft"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_MENU_SMARTPHONE", $_POST["main_menu_smartphone"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_MENUFRONT_BARRETOP", $_POST["main_menufront_barretop"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_MENUFRONT_BARRELEFT",$_POST["main_menufront_barreleft"],'chaine',0,'',$conf->entity);
+ //dolibarr_set_const($db, "MAIN_MENUFRONT_BARRELEFT",$_POST["main_menufront_barreleft"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_MENUFRONT_SMARTPHONE",$_POST["main_menufront_smartphone"],'chaine',0,'',$conf->entity);
// Define list of menu handlers to initialize
$listofmenuhandler=array();
$listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["main_menu_barretop"])]=1;
$listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["main_menufront_barretop"])]=1;
- $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["main_menu_barreleft"])]=1;
- $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["main_menufront_barreleft"])]=1;
+ //$listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["main_menu_barreleft"])]=1;
+ //$listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["main_menufront_barreleft"])]=1;
if (isset($_POST["main_menu_smartphone"])) $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["main_menu_smartphone"])]=1;
if (isset($_POST["main_menufront_smartphone"])) $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["main_menufront_smartphone"])]=1;
@@ -151,7 +151,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
// Menu top
$var=!$var;
- print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuTopManager").'</td>';
+ print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuManager").'</td>';
print '<td>';
print $htmladmin->select_menu($conf->global->MAIN_MENU_BARRETOP,'main_menu_barretop',$dirtop);
print '</td>';
@@ -161,7 +161,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
print '</tr>';
// Menu left
- $var=!$var;
+ /*$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuLeftManager").'</td>';
print '<td>';
print $htmladmin->select_menu($conf->global->MAIN_MENU_BARRELEFT,'main_menu_barreleft',$dirleft);
@@ -170,6 +170,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
print $htmladmin->select_menu($conf->global->MAIN_MENUFRONT_BARRELEFT,'main_menufront_barreleft',$dirleft);
print '</td>';
print '</tr>';
+ */
// Menu smartphone
if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
@@ -211,7 +212,7 @@ else
print '</tr>';
$var=!$var;
- print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuTopManager").'</td>';
+ print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuManager").'</td>';
print '<td>';
$filelib=preg_replace('/.php$/i','',$conf->global->MAIN_MENU_BARRETOP);
print $filelib;
@@ -222,7 +223,7 @@ else
print '</td>';
print '</tr>';
- $var=!$var;
+ /*$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>'.$langs->trans("DefaultMenuLeftManager").'</td>';
print '<td>';
@@ -234,6 +235,7 @@ else
print $filelib;
print '</td>';
print '</tr>';
+ */
if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
{
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 25b6b215e59..0b540de0cd0 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -44,16 +44,16 @@ $dirmenu = array($dirleft,$dirsmartphone);
$mesg=$_GET["mesg"];
$menu_handler_top=$conf->global->MAIN_MENU_BARRETOP;
-$menu_handler_left=$conf->global->MAIN_MENU_BARRELEFT;
+//$menu_handler_left=$conf->global->MAIN_MENU_BARRELEFT;
$menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE;
$menu_handler_top=preg_replace('/_backoffice.php/i','',$menu_handler_top);
$menu_handler_top=preg_replace('/_frontoffice.php/i','',$menu_handler_top);
-$menu_handler_left=preg_replace('/_backoffice.php/i','',$menu_handler_left);
-$menu_handler_left=preg_replace('/_frontoffice.php/i','',$menu_handler_left);
+//$menu_handler_left=preg_replace('/_backoffice.php/i','',$menu_handler_left);
+//$menu_handler_left=preg_replace('/_frontoffice.php/i','',$menu_handler_left);
$menu_handler_smartphone=preg_replace('/_backoffice.php/i','',$menu_handler_smartphone);
$menu_handler_smartphone=preg_replace('/_frontoffice.php/i','',$menu_handler_smartphone);
-$menu_handler=$menu_handler_left;
+$menu_handler=$menu_handler_top;
if ($_REQUEST["handler_origine"]) $menu_handler=$_REQUEST["handler_origine"];
if ($_REQUEST["menu_handler"]) $menu_handler=$_REQUEST["menu_handler"];
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index b7d69c0ced7..d550c2908bc 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -44,16 +44,16 @@ $dirmenu = array($dirleft,$dirsmartphone);
$mesg=$_GET["mesg"];
$menu_handler_top=$conf->global->MAIN_MENU_BARRETOP;
-$menu_handler_left=$conf->global->MAIN_MENU_BARRELEFT;
+//$menu_handler_left=$conf->global->MAIN_MENU_BARRELEFT;
$menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE;
$menu_handler_top=preg_replace('/_backoffice.php/i','',$menu_handler_top);
$menu_handler_top=preg_replace('/_frontoffice.php/i','',$menu_handler_top);
-$menu_handler_left=preg_replace('/_backoffice.php/i','',$menu_handler_left);
-$menu_handler_left=preg_replace('/_frontoffice.php/i','',$menu_handler_left);
+//$menu_handler_left=preg_replace('/_backoffice.php/i','',$menu_handler_left);
+//$menu_handler_left=preg_replace('/_frontoffice.php/i','',$menu_handler_left);
$menu_handler_smartphone=preg_replace('/_backoffice.php/i','',$menu_handler_smartphone);
$menu_handler_smartphone=preg_replace('/_frontoffice.php/i','',$menu_handler_smartphone);
-$menu_handler=$menu_handler_left;
+$menu_handler=$menu_handler_top;
if ($_REQUEST["handler_origine"]) $menu_handler=$_REQUEST["handler_origine"];
if ($_REQUEST["menu_handler"]) $menu_handler=$_REQUEST["menu_handler"];
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 956e339a140..f875f05aadf 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -256,7 +256,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
$modulequalified=1;
// We discard modules that does not respect constraint on menu handlers
- if (! empty($objMod->needleftmenu) && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
+ //if (! empty($objMod->needleftmenu) && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
if (! empty($objMod->needtopmenu) && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
// We discard modules according to features level (PS: if module is activated we always show it)
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 7d367144c90..e1c739217c5 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -90,8 +90,8 @@ $var=!$var;
print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme."</td></tr>\n";
$var=!$var;
print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentTopMenuHandler").'</td><td colspan="2">'.$conf->top_menu."</td></tr>\n";
-$var=!$var;
-print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentLeftMenuHandler").'</td><td colspan="2">'.$conf->left_menu."</td></tr>\n";
+//$var=!$var;
+//print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentLeftMenuHandler").'</td><td colspan="2">'.$conf->left_menu."</td></tr>\n";
print '</table>';
print '<br>';
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index a7b29b4c9b6..5ca35e13ac1 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
*
* 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.="<br>\n";
$out.="<b>".$langs->trans("RequestedUrl").":</b> ".$_SERVER["REQUEST_URI"]."<br>\n";;
$out.="<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"])?$_SERVER["HTTP_REFERER"]:'')."<br>\n";;
- $out.="<b>".$langs->trans("MenuManager").":</b> ".$conf->top_menu.($conf->top_menu||$conf->left_menu?'/':'').$conf->left_menu."<br>\n";
+ //$out.="<b>".$langs->trans("MenuManager").":</b> ".$conf->top_menu.($conf->top_menu||$conf->left_menu?'/':'').$conf->left_menu."<br>\n";
+ $out.="<b>".$langs->trans("MenuManager").":</b> ".$conf->top_menu."<br>\n";
$out.="<br>\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 '<td class="nobordernopadding" width="40" align="left" valign="middle">'.img_picto('',$picto, '', $pictoisfullpath).'</td>';
+ if (empty($conf->browser->phone) && $picto && $titre) print '<td class="nobordernopadding" width="40" align="left" valign="middle">'.img_picto('',$picto, '', $pictoisfullpath).'</td>';
print '<td class="nobordernopadding">';
print '<div class="titre">'.$titre.'</div>';
$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 '<td class="nobordernopadding" width="40" align="left" valign="middle">'.img_picto('',$picto, '', $pictoisfullpath).'</td>';
+ if (empty($conf->browser->phone) && $picto && $titre) print '<td class="nobordernopadding" width="40" align="left" valign="middle">'.img_picto('',$picto, '', $pictoisfullpath).'</td>';
print '<td class="nobordernopadding"><div class="titre">'.$titre.'</div></td>';
}
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".'<!-- Start top horizontal menu -->'."\n";
- print '<div class="tmenu">'."\n";
-
$top_menu=$conf->top_menu;
if (GETPOST('top_menu')) $top_menu=GETPOST('top_menu');
+ print "\n".'<!-- Start top horizontal menu '.$top_menu.' -->'."\n";
+ print '<div class="tmenu">'."\n";
+
// Load the top menu manager
$result=@include_once(DOL_DOCUMENT_ROOT ."/includes/menus/barre_top/".$top_menu);
if (! $result) // If failed to include, we try with standard
{
- $conf->top_menu='eldy_backoffice.php';
+ $top_menu='eldy_backoffice.php';
include_once(DOL_DOCUMENT_ROOT ."/includes/menus/barre_top/".$top_menu);
}
$menutop = new MenuTop($db);
@@ -1106,18 +1107,19 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
- // Left column
- print '<!-- Begin left vertical menu -->'."\n";
- print '<div class="vmenu">'."\n";
-
- $left_menu=$conf->left_menu;
+ //$left_menu=$conf->left_menu;
+ $left_menu=$conf->top_menu;
if (GETPOST('left_menu')) $left_menu=GETPOST('left_menu');
+ // Left column
+ print '<!-- Begin left vertical menu '.$left_menu.' -->'."\n";
+ print '<div class="vmenu">'."\n";
+
// Load the left menu manager
$result=@include_once(DOL_DOCUMENT_ROOT ."/includes/menus/barre_left/".$left_menu);
if (! $result)
{
- $conf->left_menu='eldy_backoffice.php';
+ $left_menu='eldy_backoffice.php';
include_once(DOL_DOCUMENT_ROOT ."/includes/menus/barre_left/".$left_menu);
}
$menuleft=new MenuLeft($db,$menu_array_before,$menu_array_after);
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 12d2ee20069..e267fd1faac 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -105,7 +105,7 @@ foreach ($dirlist as $dirroot)
$modulequalified=1;
// We discard modules that does not respect constraint on menu handlers
- if ($objMod->needleftmenu && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
+ //if ($objMod->needleftmenu && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
if ($objMod->needtopmenu && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
// We discard modules according to features level (PS: if module is activated we always show it)
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index f181e1aa8b9..109f62855db 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -81,6 +81,14 @@ body {
a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: #000000; text-decoration: none; }
+input {
+ font-size: <?php print $fontsize ?>px;
+ font-family: <?php print $fontlist ?>;
+ background: #FDFDFD;
+ border: 1px solid #ACBCBB;
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
input.flat {
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 892841cd46d..c02fc6f2708 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -84,6 +84,14 @@ body {
a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: #000000; text-decoration: none; }
+input {
+ font-size: <?php print $fontsize ?>px;
+ font-family: <?php print $fontlist ?>;
+ background: #FDFDFD;
+ border: 1px solid #ACBCBB;
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
input.flat {
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php
index 9893f6f9694..5550c94c2b7 100644
--- a/htdocs/theme/freelug/style.css.php
+++ b/htdocs/theme/freelug/style.css.php
@@ -79,6 +79,15 @@ a:link { font-family: helvetica, verdana, arial, sans-serif; font-weight: bol
a:visited { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
a:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
a:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: underline; }
+input
+{
+ font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
+ font-family: helvetica, verdana, arial, sans-serif;
+ background: #FFFFFF;
+ border: 1px solid #8C9C9B;
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
input.flat
{
font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php
index 7a0881f530b..5f183e0fb9b 100644
--- a/htdocs/theme/yellow/style.css.php
+++ b/htdocs/theme/yellow/style.css.php
@@ -77,6 +77,14 @@ a:link { font-family: helvetica, verdana, arial, sans-serif; font-weight: bol
a:visited { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
a:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
a:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: underline; }
+input
+{
+ font-size: 12px;
+ font-family: helvetica, verdana, arial, sans-serif;
+ border: 1px solid #cccccc;
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
input.flat
{
font-size: 12px;
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 4252724404e..bbafc3cff76 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -93,7 +93,7 @@ if ($_POST["action"] == 'update' && ($caneditfield || $user->admin))
else $tabparam["MAIN_LANG_DEFAULT"]='';
$tabparam["MAIN_MENU_BARRETOP"]=$_POST["main_menu_barretop"];
- $tabparam["MAIN_MENU_BARRELEFT"]=$_POST["main_menu_barreleft"];
+ //$tabparam["MAIN_MENU_BARRELEFT"]=$_POST["main_menu_barreleft"];
if ($_POST["check_SIZE_LISTE_LIMIT"]=="on") $tabparam["MAIN_SIZE_LISTE_LIMIT"]=$_POST["main_size_liste_limit"];
else $tabparam["MAIN_SIZE_LISTE_LIMIT"]='';
--
GitLab