From 16c75241b369bbfe52995ba0fc76ffee7b760bd8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 May 2007 17:35:51 +0000 Subject: [PATCH] =?UTF-8?q?Debut=20d'impl=E9mentation=20des=20fonctions=20?= =?UTF-8?q?d'=E9dition=20du=20menu=20en=20standard.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/admin/menus.php | 1 + htdocs/admin/menus/index.php | 46 +++++++++++++++++++++------------ htdocs/admin/perms.php | 1 + htdocs/langs/fr_FR/admin.lang | 11 +++++--- mysql/data/data.sql | 2 -- mysql/migration/2.1.0-2.2.0.sql | 1 - 6 files changed, 38 insertions(+), 24 deletions(-) diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 494023b4385..979031017a3 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -22,6 +22,7 @@ /** \file htdocs/admin/menus.php + \ingroup core,menudb \brief Page de configuration des gestionnaires de menu \version $Revision$ */ diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index c1fcba91b35..c7cbf18fce5 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -28,11 +28,23 @@ require("./pre.inc.php"); - if (!$user->rights->menudb->creer && ! $user->admin) accessforbidden(); +$menu_handler_top=$conf->global->MAIN_MENU_BARRETOP; +$menu_handler_left=$conf->global->MAIN_MENU_BARRELEFT; +$menu_handler_top=eregi_replace('_backoffice\.php','',$menu_handler_top); +$menu_handler_top=eregi_replace('_frontoffice\.php','',$menu_handler_top); +$menu_handler_left=eregi_replace('_backoffice\.php','',$menu_handler_left); +$menu_handler_left=eregi_replace('_frontoffice\.php','',$menu_handler_left); + +$menu_handler=$menu_handler_left; + +/* +* Actions +*/ + if (isset($_GET["action"]) && $_GET["action"] == 'up') { @@ -54,6 +66,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'up') // Menu top $sql = "SELECT m.rowid, m.order FROM ".MAIN_DB_PREFIX."menu as m"; $sql.= " WHERE m.order = ".($precedent['order'] - 1)." AND m.type = 'top'"; + $sql.= " AND menu_handler='".$menu_handler_top."'"; $result = $db->query($sql); $num = $db->num_rows(); @@ -207,24 +220,21 @@ if ($_GET["action"] == 'delete') print ''; + +print ''; +print ''; +print ''; + print ''; print ''; - print ''; + print ''; print '
'.$langs->trans("MenuHandler").': '.$menu_handler.'
'.$langs->trans("TreeMenu").'
'; - /************************* * ARBORESCENCE * *************************/ - - -/* cette fonction gère le décallage des éléments - suivant leur position dans l'arborescence -*/ - - $rangLast = 0; $idLast = -1; @@ -233,6 +243,9 @@ if ($conf->use_javascript) print ''; } +/* cette fonction gère le décallage des éléments + suivant leur position dans l'arborescence +*/ function affiche($tab,$rang) { global $rangLast, $idLast; @@ -292,13 +305,9 @@ function affiche($tab,$rang) $rangLast = $rang; $idLast = $tab[0]; - - - - - } + /*fonction récursive d'affichage de l'arbre $tab :tableau des éléments $pere :index de l'élément courrant @@ -338,12 +347,15 @@ function recur($tab,$pere,$rang) { */ //il faut d'abord déclarer un élément racine de l'arbre - $data[] = array(0,-1,"racine"); +$data[] = array(0,-1,"racine"); //puis tous les éléments enfants -$sql = "SELECT m.rowid, m.fk_menu, m.titre, m.langs FROM ".MAIN_DB_PREFIX."menu as m ORDER BY m.order, m.rowid"; +$sql = "SELECT m.rowid, m.fk_menu, m.titre, m.langs"; +$sql.= " FROM ".MAIN_DB_PREFIX."menu as m"; +$sql.= " WHERE menu_handler='".$menu_handler."'"; +$sql.= " ORDER BY m.order, m.rowid"; $res = $db->query($sql); if ($res) diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 9c4e8f2232b..50b1c9137a5 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -22,6 +22,7 @@ /** \file htdocs/admin/perms.php + \ingroup core,menudb \brief Page d'administration/configuration des permissions par defaut \version $Revision$ */ diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 0054fddf809..48e85ad7a70 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -724,16 +724,19 @@ TreeMenu=Arborescence des menus NewMenu=Nouveau menu MenuConf=Configuration des menus Menu=Sélection des menus +MenuHandler=Gestionnaire menu DetailId=Identifiant du menu +DetailMenuHandler=Nom du gestionnaire menu +DetailType=Type de menu (top ou left) DetailTitre=Libellé du menu -DetailMainmenu=Mainmenu auquel il appartient +DetailMainmenu=Groupe auquel il appartient (obsolete) DetailUrl=URL de la page vers laquelle le menu pointe -DetailLeftmenu=Condition d'affichage du menu -DetailRight=Droit que l'utilisateur doit posseder +DetailLeftmenu=Condition d'affichage ou non (obsolete) +DetailRight=Condition d'affichage plein ou grisé DetailLangs=Fichier langs pour la traduction du titre DetailUser=Interne / externe / Tous DetailTarget=Cible -DetailLevel=Niveau du menu (-1:menu top, 0:entete menu, >0 menu et sous menu) +DetailLevel=Niveau (-1:menu top, 0:entete menu, >0 menu et sous menu) ModifMenu=Modification du menu diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 4abde95c1d0..ba8bb730e97 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -1501,5 +1501,3 @@ insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) value insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (107, 4901, 6, 2); insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (108, 5000, 26, 2); insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (109, 5001, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (110, 110, 45, 2); - diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql index dcf4b1e8722..5edba2a4d4a 100644 --- a/mysql/migration/2.1.0-2.2.0.sql +++ b/mysql/migration/2.1.0-2.2.0.sql @@ -509,4 +509,3 @@ insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) value insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (107, 4901, 6, 2); insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (108, 5000, 26, 2); insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (109, 5001, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (110, 110, 45, 2);