From 0d248be80acca92b4feabc7cb4e5567c6ec16c56 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 31 Aug 2013 19:40:18 +0000 Subject: [PATCH] Improve CFGMENU --- html/js/infobulle.js | 6 +++--- include/menu.inc.php | 17 ++++------------- include/template/menu_detail.php | 17 +++++++++++++++-- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/html/js/infobulle.js b/html/js/infobulle.js index 8770142fa..d6f24d95f 100644 --- a/html/js/infobulle.js +++ b/html/js/infobulle.js @@ -59,9 +59,9 @@ content[28]="Attention Différence entre TVA calculée et donnée"; content[29]="Si vous ne donnez pas de nom, ce sera le nom du fichier qui sera utilisé"; content[30]="Peut contenir une information telle que le message structuré sur le virement"; content[31]="Peut contenir un numéro de bon de commande"; - -function showBulle(p_ctl) -{ +content[32]='

Remarque : choix possibles

'; +content[33]='le type vaut :'; +function showBulle(p_ctl){ d=document.getElementById('bulle'); d.innerHTML=content[p_ctl]; d.style.top=posY+offsetY; diff --git a/include/menu.inc.php b/include/menu.inc.php index e8ccf5cad..918d85900 100644 --- a/include/menu.inc.php +++ b/include/menu.inc.php @@ -112,11 +112,11 @@ $url=$_SERVER['REQUEST_URI']; $table->add('Code',$url,"order by me_code asc","order by me_code desc","codea","coded"); $table->add('Menu',$url,"order by me_menu asc","order by me_menu desc","menua","menud"); $table->add('Description',$url,"order by me_description asc","order by me_description desc","desa","desd"); +$table->add('Type',$url,"order by me_type asc","order by me_type desc","ta","td"); $table->add('Fichier',$url,"order by me_file asc","order by me_file desc","fa","fd"); $table->add('URL',$url,"order by me_url asc","order by me_url desc","urla","urld"); $table->add('Paramètre',$url,"order by me_parametere asc","order by me_parameter desc","paa","pad"); $table->add('Javascript',$url,"order by me_javascript asc","order by me_javascript desc","jsa","jsd"); -$table->add('Type',$url,"order by me_type asc","order by me_type desc","ta","td"); $ord=(isset($_REQUEST['ord']))?$_REQUEST['ord']:'codea'; @@ -147,17 +147,8 @@ $ret=$menu->seek($sql.$order); - Filtre + Filtre -

le type vaut : -

- -

'; echo ''.$table->get_header(0).''; echo ''.$table->get_header(1).''; echo ''.$table->get_header(2).''; -echo ''.$table->get_header(3).''; +echo ''.$table->get_header(3).HtmlInput::infobulle(33).''; echo ''.$table->get_header(4).''; echo ''.$table->get_header(5).''; echo ''.$table->get_header(6).''; @@ -193,11 +184,11 @@ for ($i = 0; $i < Database::num_row($ret); $i++) echo td($js); echo td($row->me_menu); echo td(h($row->me_description)); + echo td(h($row->me_type)); echo td(h($row->me_file)); echo td(h($row->me_url)); echo td(h($row->me_parameter)); echo td(h($row->me_javascript)); - echo td(h($row->me_type)); echo ''; } echo ''; diff --git a/include/template/menu_detail.php b/include/template/menu_detail.php index e3191a922..3101ed61c 100644 --- a/include/template/menu_detail.php +++ b/include/template/menu_detail.php @@ -11,7 +11,12 @@ $str_file=new IText('me_file',$m->me_file); $str_url=new IText('me_url',$m->me_url); $str_parameter=new IText('me_parameter',$m->me_parameter); $str_js=new IText('me_javascript',$m->me_javascript); - +$a_type=array ( + array ('label'=>'Impression','value'=>'PR' ), + array ('label'=>'Menu','value'=>'ME' ) + ); +$str_type=new ISelect("me_type", $a_type); +$str_type->selected=$m->me_type; ?> @@ -37,6 +42,14 @@ $str_js=new IText('me_javascript',$m->me_javascript); + + + +
input()?>
+ Type + + input();?> +
@@ -56,7 +69,7 @@ $str_js=new IText('me_javascript',$m->me_javascript);
- Paramèttre + Paramètre input()?>