diff --git a/htdocs/lib/lib_foot.js b/htdocs/lib/lib_foot.js index 2e5a07588ee..40081242ab4 100644 --- a/htdocs/lib/lib_foot.js +++ b/htdocs/lib/lib_foot.js @@ -1,6 +1,6 @@ -// Copyright (C) 2005-2008 Laurent Destailleur +// Copyright (C) 2005-2010 Laurent Destailleur // -// Script javascript mis en bas de page (avant fin de body) +// Javascript code to put at bottom of pages (avant fin de body) // // \file htdocs/lib/lib_foot.js // \brief File that include javascript functions (included if option use_javascript activated) @@ -8,13 +8,13 @@ /*********************************************** -* Cool DHTML tooltip script- © Dynamic Drive DHTML code library (www.dynamicdrive.com) +* Cool DHTML tooltip script- (c) Dynamic Drive DHTML code library (www.dynamicdrive.com) * This notice MUST stay intact for legal use * Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code ***********************************************/ -var offsetxpoint=-60 //Customize x offset of tooltip -var offsetypoint=18 //Customize y offset of tooltip +var offsetxpoint=-40 //Customize x offset of tooltip +var offsetypoint=12 //Customize y offset of tooltip var ie=document.all var ns6=document.getElementById && !document.all var enabletip=false diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 638f713a7f9..936f25211e0 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -909,6 +909,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a { global $user, $conf, $langs, $db, $dolibarr_main_authentication; + $html=new Form($db); + if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php'; if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php'; @@ -939,36 +941,14 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a $menutop->showmenu(); // Link to login card - print ''; - - // Link info - $htmltext=''; $text=''; - if ($_SESSION["dol_authmode"] != 'forceuser' - && $_SESSION["dol_authmode"] != 'http') - { - $htmltext=$langs->trans("Logout").'
'; - $htmltext.="
"; - - $text.='atarget?(' target="'.$menutop->atarget.'"'):''; - $text.='>'; - $text.='trans("Logout")).'" title=""'; - $text.='>'; - $text.=''; - } - else - { - $text.='trans("Logout")).'" title=""'; - $text.='>'; - } - $htmltext.=''.$langs->trans("User").''; - $htmltext.='
'.$langs->trans("Name").': '.$user->fullname; - $htmltext.='
'.$langs->trans("Login").': '.$user->login; - $htmltext.='
'.$langs->trans("Administrator").': '.yn($user->admin); + $loginhtmltext=''; $logintext=''; + $logintext=''; + $loginhtmltext.=''.$langs->trans("User").''; + $loginhtmltext.='
'.$langs->trans("Name").': '.$user->fullname; + $loginhtmltext.='
'.$langs->trans("Login").': '.$user->login; + $loginhtmltext.='
'.$langs->trans("Administrator").': '.yn($user->admin); $type=($user->societe_id?$langs->trans("External"):$langs->trans("Internal")); if ($user->societe_id) { @@ -976,35 +956,54 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a $thirdpartystatic->fetch($user->societe_id); $type.=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')'; } - $htmltext.='
'.$langs->trans("Type").': '.$type; - $htmltext.='
'; - $htmltext.='
'.$langs->trans("Connection").''; - if ($conf->global->MAIN_MODULE_MULTICOMPANY) $htmltext.='
'.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$user->entity.')'; - $htmltext.='
'.$langs->trans("ConnectedSince").': '.dol_print_date($user->datelastlogin,"dayhour"); - $htmltext.='
'.$langs->trans("PreviousConnexion").': '.dol_print_date($user->datepreviouslogin,"dayhour"); - $htmltext.='
'.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"]; - $htmltext.='
'.$langs->trans("CurrentTheme").': '.$conf->theme; - $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT); - $htmltext.='
'.$langs->trans("CurrentUserLanguage").': '.($s?$s.' ':'').$langs->getDefaultLang(); - $htmltext.='
'.$langs->trans("Browser").': '.$conf->browser->name.' ('.$_SERVER['HTTP_USER_AGENT'].')'; - if (! empty($conf->browser->phone)) $htmltext.='
'.$langs->trans("Phone").': '.$conf->browser->phone; + $loginhtmltext.='
'.$langs->trans("Type").': '.$type; + $loginhtmltext.='
'; + $loginhtmltext.='
'.$langs->trans("Connection").''; + if ($conf->global->MAIN_MODULE_MULTICOMPANY) $loginhtmltext.='
'.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$user->entity.')'; + $loginhtmltext.='
'.$langs->trans("ConnectedSince").': '.dol_print_date($user->datelastlogin,"dayhour"); + $loginhtmltext.='
'.$langs->trans("PreviousConnexion").': '.dol_print_date($user->datepreviouslogin,"dayhour"); + $loginhtmltext.='
'.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"]; + $loginhtmltext.='
'.$langs->trans("CurrentTheme").': '.$conf->theme; + $s=picto_from_langcode($langs->getDefaultLang()); + $loginhtmltext.='
'.$langs->trans("CurrentUserLanguage").': '.($s?$s.' ':'').$langs->getDefaultLang(); + $loginhtmltext.='
'.$langs->trans("Browser").': '.$conf->browser->name.' ('.$_SERVER['HTTP_USER_AGENT'].')'; + if (! empty($conf->browser->phone)) $loginhtmltext.='
'.$langs->trans("Phone").': '.$conf->browser->phone; + if (! empty($_SESSION["disablemodules"])) $loginhtmltext.='
'.$langs->trans("DisabledModules").':
'.join('
',explode(',',$_SESSION["disablemodules"])); - if (! empty($_SESSION["disablemodules"])) $htmltext.='
'.$langs->trans("DisabledModules").':
'.join('
',explode(',',$_SESSION["disablemodules"])); + // Link info + $logouthtmltext=''; $logouttext=''; + $logouthtmltext=$langs->trans("Logout").'
'; + //$logouthtmltext.="
"; + if ($_SESSION["dol_authmode"] != 'forceuser' + && $_SESSION["dol_authmode"] != 'http') + { + $logouttext.='atarget?(' target="'.$menutop->atarget.'"'):''; + $logouttext.='>'; + $logouttext.='trans("Logout")).'" title=""'; + $logouttext.='>'; + $logouttext.=''; + } + else + { + $logouttext.='trans("Logout")).'" title=""'; + $logouttext.='>'; + } - // print ''; - $html=new Form($db); - print $html->textwithtooltip('',$htmltext,2,1,$text); + print $html->textwithtooltip('',$loginhtmltext,2,1,$logintext); + + print $html->textwithtooltip('',$logouthtmltext,2,1,$logouttext); // Link to print main content area if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone)) { $text =''; $text.='trans("PrintContentArea")).'" alt="'.dol_escape_htmltag($langs->trans("PrintContentArea")).'">'; + $text.=' title="" alt="">'; $text.=''; - print $text; + print $html->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text); } print "\n\n\n"; diff --git a/htdocs/societe.php b/htdocs/societe.php index 4a3592a9733..fae3e3971c0 100644 --- a/htdocs/societe.php +++ b/htdocs/societe.php @@ -146,8 +146,8 @@ if ($_GET['delsoc']) print '
'.$langs->trans("CompanyDeleted /* REM: Regle sur droits "Voir tous les clients" REM: Exemple, voir la page societe.php dans le mode liste. - Utilisateur interne socid=0 + Droits voir tous clients => Voit toute soci�t� - Utilisateur interne socid=0 + Pas de droits voir tous clients => Ne voit que les soci�t�s li�es comme commercial + Utilisateur interne socid=0 + Droits voir tous clients => Voit toute societe + Utilisateur interne socid=0 + Pas de droits voir tous clients => Ne voit que les societes liees comme commercial Utilisateur externe socid=x + Droits voir tous clients => Ne voit que lui meme Utilisateur externe socid=x + Pas de droits voir tous clients => Ne voit que lui meme */ @@ -225,7 +225,7 @@ if ($resql) $params.= '&search_idprof3='.$search_idprof3; $params.= '&search_idprof4='.$search_idprof4; - print_barre_liste($title, $page, "societe.php",$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords); $langs->load("other"); $textprofid=array(); @@ -240,18 +240,18 @@ if ($resql) } } - print '
'; + print ''; print ''; // Lignes des titres print ''; print ''; - print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom","",$params,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville","",$params,'',$sortfield,$sortorder); - print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),"societe.php","s.siren","",$params,'nowrap="nowrap"',$sortfield,$sortorder); - print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),"societe.php","s.siret","",$params,'nowrap="nowrap"',$sortfield,$sortorder); - print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),"societe.php","s.ape","",$params,'nowrap="nowrap"',$sortfield,$sortorder); - print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),"societe.php","s.idprof4","",$params,'nowrap="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$params,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.ville","",$params,'',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$params,'nowrap="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$params,'nowrap="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$params,'nowrap="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$params,'nowrap="nowrap"',$sortfield,$sortorder); print ''; print "\n"; diff --git a/htdocs/support/online.php b/htdocs/support/online.php index 83d317ebc2d..e676ab57cbb 100644 --- a/htdocs/support/online.php +++ b/htdocs/support/online.php @@ -65,6 +65,12 @@ array('name'=>'Régis Houssin', 'sort'=>2, 'logo'=>'logoUrl='.urlencode('http://www.cap-networks.com/images/logo_small.jpg'), 'id'=>'5391', + 'lang'=>'fr'), +// Widget for Auguria +array('name'=>'Auguria', + 'sort'=>2, + //'logo'=>'logoUrl='.urlencode('http://www.cap-networks.com/images/logo_small.jpg'), + 'id'=>'7196', 'lang'=>'fr') ); $arrayofwidgets=dol_sort_array($arrayofwidgets,'sort','asc',0,0); @@ -97,7 +103,7 @@ foreach ($arrayofwidgets as $arraywidget) // Loop on each user // Only first language found is used for widget $widgetid=$listofwidgets[$pos-1]; - + // Widget V3 print ''; diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index ae0905833a2..047268c1850 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -1269,6 +1269,7 @@ table.valid { #dhtmltooltip { +-moz-border-radius:4px; position: absolute; width: px; border-top: solid 1px #BBBBBB;