diff --git a/include/ac_common.php b/include/ac_common.php index 7d64f9b98..5c4dff8dd 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -154,7 +154,8 @@ function html_page_start($p_theme="",$p_script="") echo " Gnu Accountancy - + + "; echo ""; } @@ -260,18 +261,24 @@ function ShowItem($p_array,$p_dir='V',$class="mtitle",$class_ref="mtitle",$defau // direction Vertical if ( $p_dir == 'V') { foreach ($p_array as $all=>$href){ - $ret.=''.$href[1].''; + $title=""; + if ( isset ($href[2] )) + $title=$href[2]; + $ret.=''.$href[1].''; } } //direction Horizontal else if ( $p_dir == 'H' ) { $ret.=""; foreach ($p_array as $all=>$href){ + $title=""; + if ( isset ($href[2] )) + $title=$href[2]; if ( $default== $href[0]) { $ret.=''.$href[1].''; } else { - $ret.=''.$href[1].''; + $ret.=''.$href[1].''; } } $ret.=""; diff --git a/include/user_common.php b/include/user_common.php index 94f62feb4..a582a75ed 100644 --- a/include/user_common.php +++ b/include/user_common.php @@ -332,7 +332,7 @@ function ListJrn($p_cn,$p_jrn,$p_where="",$p_array=null) if ($Max==0) return "No row selected"; $r.=""; $l_sessid=$_REQUEST['PHPSESSID']; - $r.=""; + $r.=""; $r.=""; $r.=""; $r.=""; @@ -346,7 +346,7 @@ function ListJrn($p_cn,$p_jrn,$p_where="",$p_array=null) $row=pg_fetch_array($Res,$i); if ( $i % 2 == 0 ) $tr=''; - else $tr=''; + else $tr=''; $r.=$tr; //internal code // button modify diff --git a/include/user_menu.php b/include/user_menu.php index 1c526148a..863fefae0 100644 --- a/include/user_menu.php +++ b/include/user_menu.php @@ -160,24 +160,36 @@ function ShowMenuCompta($p_dossier) { include_once("postgres.php"); $l_name=GetDossierName($p_dossier); + // find our current menu + $default=basename($_SERVER['SCRIPT_NAME']); + switch ($default) { + case "user_jrn.php": + $default.="?show"; + break; + case "recherche.php": + $default.="?p_dossier=$p_dossier"; + break; + case "fiche.php": + $default.="?p_dossier=$p_dossier"; + break; + } - - $p_array=array(array("user_jrn.php?show","Journaux"), - array("recherche.php?p_dossier=$p_dossier","Recherche"), - array("fiche.php?p_dossier=$p_dossier","Fiche"), - array("user_impress.php","Impression"), - array("user_advanced.php","Avancé"), + $p_array=array(array("user_jrn.php?show","Journaux","Les journaux permettent d'encoder toutes les opérations"), + array("recherche.php?p_dossier=$p_dossier","Recherche","Pour retrouver une opération"), + array("fiche.php?p_dossier=$p_dossier","Fiche","Ajouter, modifier ou effacer des fiches"), + array("user_impress.php","Impression","Impression"), + array("user_advanced.php","Avancé","Opérations délicates"), array("dossier_prefs.php","Paramètre"), - array('user_pref.php','Preference'), - array('login.php','Accueil'), - array('logout.php','logout') + array('user_pref.php','Preference',"Préférence de l'utilisateur"), + array('login.php','Accueil',"Accueil"), + array('logout.php','logout',"Sortie") ); - $result=ShowItem($p_array,'H'); - //echo "
"; + $result=ShowItem($p_array,'H',"mtitle","mtitle",$default); + echo "

$l_name

"; echo $result; - //echo "
"; + @@ -408,7 +420,8 @@ function u_ShowMenuRecherche($p_cn,$p_jrn,$p_sessid,$p_array=null) if ( $p_mont_sel != "" ) $opt.='
Internal Date Echéance