diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index e34cd54863b..10a65cab2fe 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -138,7 +138,7 @@ if (empty($reshook)) if ($result > 0) { - setEventMessages($langs->trans("ChartLoaded"), null); + setEventMessages($langs->trans("ChartLoaded"), null, 'mesgs'); } else { diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php index 2ed9eb4c2bd..8a04e8b621a 100644 --- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php +++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php @@ -197,6 +197,7 @@ if ($resql) { $param="&socid=".$socid; print '
'; + print ''; print ''; $letteringbutton = ''; diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php index b381fc597ce..f9cf57df344 100644 --- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php +++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php @@ -195,6 +195,7 @@ if ($resql) { $param="&socid=".$socid; print ''; + print ''; print ''; $letteringbutton = ''; diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 177e2eef18f..e7686a0a055 100644 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -259,6 +259,7 @@ print '
'; print img_picto('', 'puce').' '.$langs->trans("DocForAllMembersCards", ($conf->global->ADHERENT_CARD_TYPE?$conf->global->ADHERENT_CARD_TYPE:$langs->transnoentitiesnoconv("None"))).' '; print ''; +print ''; print ''; print ''; print ''; @@ -278,6 +279,7 @@ print '

'; print img_picto('', 'puce').' '.$langs->trans("DocForOneMemberCards", ($conf->global->ADHERENT_CARD_TYPE?$conf->global->ADHERENT_CARD_TYPE:$langs->transnoentitiesnoconv("None"))).' '; print ''; +print ''; print ''; print ''; print $langs->trans("DescADHERENT_CARD_TYPE").' '; @@ -297,6 +299,7 @@ print '

'; print img_picto('', 'puce').' '.$langs->trans("DocForLabels", $conf->global->ADHERENT_ETIQUETTE_TYPE).' '; print ''; +print ''; print ''; print ''; print $langs->trans("DescADHERENT_ETIQUETTE_TYPE").' '; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 97b0eae7ed0..718ebfdc64d 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -617,6 +617,7 @@ if ($rowid > 0) } print ''; + print ''; print ''; print '
'; diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index beccc9e9d5a..17fc773904f 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -324,6 +324,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) } print ''; +print ''; print ''; print ''."\n"; diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php index 57a20b8bf42..614d4ef4407 100644 --- a/htdocs/admin/agenda_reminder.php +++ b/htdocs/admin/agenda_reminder.php @@ -180,6 +180,7 @@ $head=agenda_prepare_head(); dol_fiche_head($head, 'reminders', $langs->trans("Agenda"), -1, 'action'); print ''; +print ''; print ''; print '
'."\n"; diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 0c3514015f2..92919886512 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -119,6 +119,7 @@ if (! empty($conf->global->CLICKTODIAL_URL)) if (GETPOST('phonefortest')) $phonefortest=GETPOST('phonefortest'); print ''; + print ''; print $langs->trans("LinkToTestClickToDial", $user->login).' : '; print ''; print ''; diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index c2c49eb4943..bbe8f0dd221 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -185,6 +185,7 @@ else print '
'."\n"; print ''."\n"; + print ''; // Skins show_skin(null, 1); diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php index aef5c0573f9..706f24d00d4 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_card.php +++ b/htdocs/compta/cashcontrol/cashcontrol_card.php @@ -318,6 +318,7 @@ if ($action=="create" || $action=="start") print load_fiche_titre($langs->trans("CashControl")." - ".$langs->trans("New"), '', 'cash-register'); print ''; + print ''; if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1') { print ''; diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php index 9c1cde791b3..d30c8d274cd 100644 --- a/htdocs/core/modules/modCollab.class.php +++ b/htdocs/core/modules/modCollab.class.php @@ -62,7 +62,7 @@ class modCollab extends DolibarrModules // Config pages //------------- - $this->config_page_url = array('collab.php'); + $this->config_page_url = array(/*'collab.php'*/); // Dependancies //------------- @@ -109,17 +109,19 @@ class modCollab extends DolibarrModules // Main menu entries $r=0; - $this->menu[$r]=array( 'fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode - 'type'=>'top', // This is a Left menu entry - 'titre'=>'Collab', - 'mainmenu'=>'collab', - 'url'=>'/collab/index.php', - 'langs'=>'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - 'position'=>100, - 'enabled'=>'$conf->collab->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules - 'target'=>'', - 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both + $this->menu[$r]=array( + 'fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode + 'type'=>'top', // This is a Left menu entry + 'titre'=>'Collab', + 'mainmenu'=>'collab', + 'url'=>'/collab/index.php', + 'langs'=>'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. + 'position'=>100, + 'enabled'=>'$conf->collab->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. + 'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules + 'target'=>'', + 'user'=>2 // 0=Menu for internal users, 1=external users, 2=both + ); $r++; } } diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index bf20d6b5c12..147d3f13570 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -69,13 +69,14 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele { // Search ficheinter $var=false; - print '
'; print ''; print ''; + print '
'; + print '
'; print ''; print ''; - print "
'.$langs->trans("Search").'
'; print $langs->trans("Intervention").':

\n"; + print "
\n"; } @@ -121,6 +122,7 @@ if ($resql) $i++; } $db->free($resql); + print '
'; print ''; print ''."\n"; $listofstatus=array(0,1,2); @@ -167,7 +169,7 @@ if ($resql) //if ($totalinprocess != $total) //print ''; print ''; - print "
'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'
'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.'
'.$langs->trans("Total").''.$total.'

"; + print "

"; } else { @@ -193,6 +195,7 @@ if (! empty($conf->ficheinter->enabled)) $resql=$db->query($sql); if ($resql) { + print '
'; print ''; print ''; print ''; @@ -211,7 +214,7 @@ if (! empty($conf->ficheinter->enabled)) $i++; } } - print "
'.$langs->trans("DraftFichinter").'

"; + print "

"; } } @@ -241,6 +244,7 @@ $sql.= $db->plimit($max, 0); $resql=$db->query($sql); if ($resql) { + print '
'; print ''; print ''; print ''; @@ -284,7 +288,7 @@ if ($resql) $i++; } } - print "
'.$langs->trans("LastModifiedInterventions", $max).'

"; + print "

"; } else dol_print_error($db); @@ -311,6 +315,7 @@ if (! empty($conf->ficheinter->enabled)) { $num = $db->num_rows($resql); + print '
'; print ''; print ''; print ''; @@ -354,7 +359,7 @@ if (! empty($conf->ficheinter->enabled)) } } - print "
'.$langs->trans("FichinterToProcess").' '.$num.'

"; + print "

"; } else dol_print_error($db); } diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php index 55bde878918..ab8e83d7877 100644 --- a/htdocs/supplier_proposal/index.php +++ b/htdocs/supplier_proposal/index.php @@ -71,12 +71,13 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele { print '
'; print ''; + print '
'; print ''; print ''; print ''; print ''; - print "
'.$langs->trans("Search").'
'; print $langs->trans("SupplierProposal").':

\n"; + print "

\n"; } @@ -121,6 +122,7 @@ if ($resql) } $db->free($resql); + print '
'; print ''; print ''."\n"; $listofstatus=array(0,1,2,3,4); @@ -153,7 +155,7 @@ if ($resql) } print ''; - print "
'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'
'.$langs->trans("Total").''.$total.'

"; + print "

"; } else { @@ -179,6 +181,7 @@ if (! empty($conf->supplier_proposal->enabled)) $resql=$db->query($sql); if ($resql) { + print '
'; print ''; print ''; print ''; @@ -206,7 +209,7 @@ if (! empty($conf->supplier_proposal->enabled)) $i++; } } - print "
'.$langs->trans("DraftRequests").'

"; + print "

"; } } @@ -235,6 +238,7 @@ $sql.= $db->plimit($max, 0); $resql=$db->query($sql); if ($resql) { + print '
'; print ''; print ''; print ''; @@ -283,7 +287,7 @@ if ($resql) $i++; } } - print "
'.$langs->trans("LastModifiedRequests", $max).'

"; + print "

"; } else dol_print_error($db); @@ -316,6 +320,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos $i = 0; if ($num > 0) { + print '
'; print ''; print ''; @@ -370,7 +375,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos { print '"; } - print "
'.$langs->trans("RequestsOpened").' '.$num.'
'.$langs->trans("Total").''.price($total)." 

"; + print "

"; } } else