diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index 0bede00d86d..0d20ae9027d 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -50,7 +50,7 @@ $hookmanager->initHooks(array('accountancyindex')); llxHeader('', $langs->trans("AccountancyArea")); -print load_fiche_titre($langs->trans("AccountancyArea"), '', 'title_accountancy'); +print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy'); //dol_fiche_head(); $step = 0; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 3e26ae1ce3a..2fd2cf22940 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -52,7 +52,7 @@ $staticmember=new Adherent($db); $statictype=new AdherentType($db); $subscriptionstatic=new Subscription($db); -print load_fiche_titre($langs->trans("MembersArea")); +print load_fiche_titre($langs->trans("MembersArea"), '', 'members'); $Adherents=array(); $AdherentsAValider=array(); diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index e85b5143257..90ce0ba932d 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -419,7 +419,7 @@ print ''; print ''; print ''; -print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit); +print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); $topicmail="Information"; $modelmail="member"; @@ -956,7 +956,7 @@ print "\n"; print ""; print ''; -if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit, 1); +if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, '', '', $limit, 1); // End of page llxFooter(); diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index 48d1ffde363..268ebbce58c 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -262,7 +262,7 @@ print ''; print ''; print ''; -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); $topicmail="Information"; $modelmail="subscription"; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 352a4dc6130..fd8e6e46643 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -248,7 +248,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') print ''; print ''; - print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); $moreforfilter = ''; diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index a6336d11d8e..c7d5e5b8912 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -45,7 +45,6 @@ llxHeader('', $langs->trans("Setup"), $wikihelp); print load_fiche_titre($langs->trans("SetupArea"), '', 'tools'); - if (! empty($conf->global->MAIN_MOTD_SETUPPAGE)) { $conf->global->MAIN_MOTD_SETUPPAGE=preg_replace('//i', '
', $conf->global->MAIN_MOTD_SETUPPAGE); diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php index 1357d397709..1c27e8909a7 100644 --- a/htdocs/asset/type.php +++ b/htdocs/asset/type.php @@ -237,7 +237,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') print ''; print ''; - print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); $moreforfilter = ''; diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 844443244cd..cc79a08f0cd 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -85,7 +85,7 @@ $newcardbutton=''; $newcardbutton.= dolGetButtonTitle($langs->trans('NewBookmark'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/bookmarks/card.php?action=create', '', !empty($user->rights->bookmark->creer)); -print_barre_liste($langs->trans("ListOfBookmarks"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', -1, '', 'title_generic.png', 0, $newcardbutton); +print_barre_liste($langs->trans("ListOfBookmarks"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', -1, '', 'generic', 0, $newcardbutton); $sql = "SELECT b.rowid, b.dateb, b.fk_user, b.url, b.target, b.title, b.favicon, b.position,"; $sql.= " u.login, u.lastname, u.firstname"; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 15e4e226587..ef9091a9638 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -79,7 +79,7 @@ if (! empty($conf->fournisseur->enabled)) $supplierorderstatic=new CommandeFourn llxHeader("", $langs->trans("CommercialArea")); -print load_fiche_titre($langs->trans("CommercialArea"), '', 'title_commercial.png'); +print load_fiche_titre($langs->trans("CommercialArea"), '', 'commercial'); print '
'; diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index e8d1d8c7599..fb19de42d5b 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -742,7 +742,7 @@ if ($action == 'create') // Print mail form - print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'title_generic'); + print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'generic'); dol_fiche_head(); @@ -1117,7 +1117,7 @@ else $htmltext.=''; // Print mail content - print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto(''.$langs->trans("AvailableVariables").'', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic'); + print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto(''.$langs->trans("AvailableVariables").'', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'generic'); dol_fiche_head('', '', '', -1); @@ -1262,7 +1262,7 @@ else $htmltext.=''; // Print mail content - print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic'); + print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'generic'); dol_fiche_head(null, '', '', -1); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index fb3ce1ece70..cb1ff16f74f 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -250,7 +250,7 @@ if ($object->fetch($id) >= 0) // Show email selectors if ($allowaddtarget && $user->rights->mailing->creer) { - print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1):''), 'title_generic'); + print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1):''), 'generic'); //print ''; print '
'; @@ -453,7 +453,7 @@ if ($object->fetch($id) >= 0) if ($allowaddtarget) { $cleartext=$langs->trans("ToClearAllRecipientsClickHere").' '.'id.'" class="button reposition">'.$langs->trans("TargetsReset").''; } - print_barre_liste($langs->trans("MailSelectedRecipients"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $cleartext, $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit); + print_barre_liste($langs->trans("MailSelectedRecipients"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $cleartext, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit); print ''; diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index 0986050a146..7db503b4675 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -173,7 +173,7 @@ if ($result) print ''; print ''; - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, '', 'title_generic.png', 0, $newcardbutton); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, '', 'generic', 0, $newcardbutton); $moreforfilter = ''; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 609cfc49d43..52b745f089b 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -462,7 +462,7 @@ if ($resql) print ''; print ''; - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, $newcardbutton, '', $limit); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit); $topicmail="SendPropalRef"; $modelmail="proposal_send"; diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 13b7b5fa2d2..eb397f1fce3 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -80,7 +80,7 @@ if ($mode == 'supplier') llxHeader('', $title); -print load_fiche_titre($title, '', 'title_commercial.png'); +print load_fiche_titre($title, '', 'commercial'); dol_mkdir($dir); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index c7db3c560af..f65bb0118a7 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1485,7 +1485,7 @@ if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } // Mode creation if ($action == 'create' && $usercancreate) { - print load_fiche_titre($langs->trans('CreateOrder'), '', 'title_commercial.png'); + print load_fiche_titre($langs->trans('CreateOrder'), '', 'commercial'); $soc = new Societe($db); if ($socid > 0) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 59922a02c01..723053eebaa 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -464,7 +464,7 @@ if ($resql) print ''; - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, $newcardbutton, '', $limit); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit); $topicmail="SendOrderRef"; $modelmail="order_send"; diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 1d2936263b8..00bdd3d7f4f 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -79,7 +79,7 @@ if ($mode == 'supplier') llxHeader('', $title); -print load_fiche_titre($title, '', 'title_commercial.png'); +print load_fiche_titre($title, '', 'commercial'); dol_mkdir($dir); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e2c0180dc3b..48c6d8664b1 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -87,7 +87,7 @@ $thirdpartystatic = new Societe($db); llxHeader("", $langs->trans("AccountancyTreasuryArea")); -print load_fiche_titre($langs->trans("AccountancyTreasuryArea"), '', 'title_accountancy.png'); +print load_fiche_titre($langs->trans("AccountancyTreasuryArea"), '', 'invoicing'); print '
'; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 2b67b73c95b..31df49ddaf3 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -122,7 +122,7 @@ if ($result) print ''; print ''; - print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); $moreforfilter=''; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 6c1ea278430..e338a2a6bd7 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -140,7 +140,7 @@ else $newcardbutton = ''.$langs->trans("Back").''; -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic', 0, $newcardbutton, '', $limit); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); print '
'; if ($optioncss != '') print ''; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index dd53988d2ec..d7fb75462a1 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -131,7 +131,7 @@ if ($result) print"\n\n"; print ''; - print_barre_liste($langs->trans("WithdrawalsLines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit); + print_barre_liste($langs->trans("WithdrawalsLines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, '', '', $limit); $moreforfilter=''; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 629fe589e56..a0286e5a0e2 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1112,7 +1112,7 @@ if ($result > 0) // Create if ($action == 'create') { - print load_fiche_titre($langs->trans('AddContract'), '', 'title_commercial.png'); + print load_fiche_titre($langs->trans('AddContract'), '', 'commercial'); $soc = new Societe($db); if ($socid>0) $soc->fetch($socid); diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 85538fe9ea8..d5b817d05c3 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -70,7 +70,7 @@ $now = dol_now(); llxHeader(); -print load_fiche_titre($langs->trans("ContractsArea"), '', 'title_commercial.png'); +print load_fiche_titre($langs->trans("ContractsArea"), '', 'commercial'); //print '
'; diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 5fea2cee66f..cb09745b24f 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -380,7 +380,7 @@ print ''; print ''; print ''; -print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, $newcardbutton, '', $limit); +print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'commercial', 0, $newcardbutton, '', $limit); $topicmail="SendContractRef"; $modelmail="contract"; diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php index 9371a9ea835..f26b11c6b08 100644 --- a/htdocs/contrat/services_list.php +++ b/htdocs/contrat/services_list.php @@ -336,7 +336,7 @@ if ($mode == "0") $title=$langs->trans("ListOfInactiveServices"); // Must use == if ($mode == "4" && $filter != "expired") $title=$langs->trans("ListOfRunningServices"); if ($mode == "4" && $filter == "expired") $title=$langs->trans("ListOfExpiredServices"); if ($mode == "5") $title=$langs->trans("ListOfClosedServices"); -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, '', '', $limit); if ($sall) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a807fc14684..7aca989a0e8 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3017,7 +3017,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected', 'jabber','skype','twitter','facebook','linkedin', - 'chevron-left','chevron-right','chevron-down','chevron-top' + 'chevron-left','chevron-right','chevron-down','chevron-top', + 'home', 'companies', 'products', 'commercial', 'invoicing', 'accountancy', 'project', 'hrm', 'members', 'ticket', 'generic' ) )) { $fa='fa'; @@ -3027,7 +3028,36 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ if ($pictowithoutext == 'setup') { $fakey = 'fa-cog'; - $fasize = '1.4em'; + } + elseif ($pictowithoutext == 'companies') { + $fakey = 'fa-building'; + } + elseif ($pictowithoutext == 'products') { + $fakey = 'fa-box-open'; + } + elseif ($pictowithoutext == 'commercial') { + $fakey = 'fa-user-tie'; + } + elseif ($pictowithoutext == 'invoicing') { + $fakey = 'fa-file-invoice'; + } + elseif ($pictowithoutext == 'accountancy') { + $fakey = 'fa-coins'; + } + elseif ($pictowithoutext == 'project') { + $fakey = 'fa-project-diagram'; + } + elseif ($pictowithoutext == 'hrm') { + $fakey = 'fa-umbrella-beach'; + } + elseif ($pictowithoutext == 'members') { + $fakey = 'fa-user-friends'; + } + elseif ($pictowithoutext == 'ticket') { + $fakey = 'fa-sticky-note'; + } + elseif ($pictowithoutext == 'generic') { + $fakey = 'fa-folder-open'; } elseif ($pictowithoutext == 'switch_off') { $fakey = 'fa-toggle-off'; @@ -4073,7 +4103,7 @@ function print_titre($title) * @return void * @deprecated Use print load_fiche_titre instead */ -function print_fiche_titre($title, $mesg = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $id = '') +function print_fiche_titre($title, $mesg = '', $picto = 'generic', $pictoisfullpath = 0, $id = '') { print load_fiche_titre($title, $mesg, $picto, $pictoisfullpath, $id); } @@ -4091,13 +4121,13 @@ function print_fiche_titre($title, $mesg = '', $picto = 'title_generic.png', $pi * @return string * @see print_barre_liste() */ -function load_fiche_titre($titre, $morehtmlright = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $id = '', $morecssontable = '', $morehtmlcenter = '') +function load_fiche_titre($titre, $morehtmlright = '', $picto = 'generic', $pictoisfullpath = 0, $id = '', $morecssontable = '', $morehtmlcenter = '') { global $conf; $return=''; - if ($picto == 'setup') $picto='title_generic.png'; + if ($picto == 'setup') $picto='generic'; $return.= "\n"; $return.= '
'; // maring bottom must be same than into print_barre_list @@ -4139,7 +4169,7 @@ function load_fiche_titre($titre, $morehtmlright = '', $picto = 'title_generic.p * @param int $hidenavigation Force to hide all navigation tools * @return void */ -function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0) +function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'generic', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0) { global $conf,$langs; @@ -4148,7 +4178,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $totalnboflines=abs($totalnboflines); if ($picto == 'setup') $picto='title_setup.png'; - if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif'; + if (($conf->browser->name == 'ie') && $picto=='generic') $picto='title.gif'; if ($limit < 0) $limit = $conf->liste_limit; if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) { diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php index cd65ace73bf..49b17c20520 100644 --- a/htdocs/core/tools.php +++ b/htdocs/core/tools.php @@ -43,7 +43,7 @@ llxHeader("", $langs->trans("Tools"), ""); $text=$langs->trans("Tools"); -print load_fiche_titre($text); +print load_fiche_titre($text, '', 'generic'); // Show description of content print '
'.$langs->trans("ToolsDesc").'


'; diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 1af11afca24..2bd6b676016 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -154,7 +154,7 @@ if ($resql) print ''; print ''; - print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton); + print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton); if ($search_all) { diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index fd53e8af1d1..e70e8d34d78 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -473,7 +473,7 @@ if ($resql) $newcardbutton.= dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expensereport/card.php?action=create'); } - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); } $topicmail="SendExpenseReport"; diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 63183c73d1d..59d02502dad 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -248,7 +248,7 @@ $today = dol_mktime( * Create mode */ if ($action == 'create') { - print load_fiche_titre($langs->trans("CreateRepeatableIntervention"), '', 'title_commercial.png'); + print load_fiche_titre($langs->trans("CreateRepeatableIntervention"), '', 'commercial'); $object = new Fichinter($db); // Source invoice //$object = new Managementfichinter($db); // Source invoice @@ -439,7 +439,7 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( else dol_print_error('', "Error, no invoice ".$object->id); } elseif ($action == 'selsocforcreatefrommodel') { - print load_fiche_titre($langs->trans("CreateRepeatableIntervention"), '', 'title_commercial.png'); + print load_fiche_titre($langs->trans("CreateRepeatableIntervention"), '', 'commercial'); dol_fiche_head(''); print ''; @@ -810,7 +810,7 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( '', $num, '', - 'title_commercial.png' + 'commercial' ); print $langs->trans("ToCreateAPredefinedInterventional").'

'; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index e54aa7940d3..da249d1f0cd 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -327,7 +327,7 @@ if ($resql) print ''; print ''; - print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, $newcardbutton, '', $limit); + print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit); $topicmail="Information"; $modelmail="intervention"; diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php index 096584d8936..ecde4ba5c72 100644 --- a/htdocs/fichinter/stats/index.php +++ b/htdocs/fichinter/stats/index.php @@ -65,7 +65,7 @@ $dir=$conf->ficheinter->dir_temp; llxHeader('', $title); -print load_fiche_titre($title, '', 'title_commercial.png'); +print load_fiche_titre($title, '', 'commercial'); dol_mkdir($dir); diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 7af71f7a344..2583873185d 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -649,7 +649,7 @@ if ($resql) print ''; print ''; print ''; - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, $newcardbutton, '', $limit); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit); $topicmail="SendOrderRef"; $modelmail="order_supplier_send"; diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index ece34cf12b5..a6ef15c6908 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -77,7 +77,7 @@ $childids[]=$user->id; llxHeader('', $langs->trans('HRMArea')); -print load_fiche_titre($langs->trans("HRMArea"), '', 'title_hrm.png'); +print load_fiche_titre($langs->trans("HRMArea"), '', 'hrm'); if (! empty($setupcompanynotcomplete)) diff --git a/htdocs/index.php b/htdocs/index.php index 70acfc62bab..a375c005676 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -80,7 +80,7 @@ llxHeader('', $title); $resultboxes=FormOther::getBoxesArea($user, "0"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb) -print load_fiche_titre($langs->trans("HomeArea"), $resultboxes['selectboxlist'], 'title_home'); +print load_fiche_titre($langs->trans("HomeArea"), $resultboxes['selectboxlist'], 'home'); if (! empty($conf->global->MAIN_MOTD)) { diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 025f7099577..8685b6982c3 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -245,7 +245,7 @@ print ''; $newcardbutton=''; $newcardbutton.= dolGetButtonTitle($langs->trans('NewSurvey'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/opensurvey/wizard/index.php', '', $user->rights->opensurvey->write); -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); // Add code for pre mass action (confirmation or email presend form) $topicmail="SendOpenSurveyRef"; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 5b74ef07f80..157f613ef03 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -77,7 +77,7 @@ if ((isset($_GET["type"]) && $_GET["type"] == 1) || empty($conf->product->enable llxHeader("", $langs->trans("ProductsAndServices"), $helpurl); $linkback=""; -print load_fiche_titre($transAreaType, $linkback, 'title_products.png'); +print load_fiche_titre($transAreaType, $linkback, 'products'); print '
'; diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 9426d2041b0..633dc48d36c 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -184,7 +184,7 @@ if ($result) print ''; print ''; - print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_generic.png', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'generic', 0, $newcardbutton, '', $limit); if ($sall) { diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php index 291dcc6e456..36d28392dad 100644 --- a/htdocs/product/stock/movement_card.php +++ b/htdocs/product/stock/movement_card.php @@ -728,7 +728,7 @@ if ($resql) if ($id > 0) print ''; if ($id > 0) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit); - else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit); + else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit); if ($sall) { diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 71e4d95f6c7..17b63ed8989 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -706,7 +706,7 @@ if ($resql) if ($id > 0) print ''; if ($id > 0) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit); - else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit); + else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit); if ($sall) { diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index b9799865e20..92d82ea0d72 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -438,7 +438,7 @@ $head[1][1] = $langs->trans("ReplenishmentOrders"); $head[1][2] = 'replenishorders'; -print load_fiche_titre($langs->trans('Replenishment'), '', 'title_generic.png'); +print load_fiche_titre($langs->trans('Replenishment'), '', 'generic'); dol_fiche_head($head, 'replenish', '', -1, ''); diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index 59f436cb487..f38b1b6bd8e 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -93,7 +93,7 @@ $texte = $langs->trans('ReplenishmentOrders'); llxHeader('', $texte, $helpurl, ''); -print load_fiche_titre($langs->trans('Replenishment'), '', 'title_generic.png'); +print load_fiche_titre($langs->trans('Replenishment'), '', 'generic'); $head = array(); $head[0][0] = DOL_URL_ROOT.'/product/stock/replenish.php'; diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php index f5989fb46c1..ae9c49c6e95 100644 --- a/htdocs/product/stock/tpl/stockcorrection.tpl.php +++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php @@ -53,7 +53,7 @@ if (empty($conf) || ! is_object($conf)) { '; - print load_fiche_titre($langs->trans("StockCorrection"), '', 'title_generic.png'); + print load_fiche_titre($langs->trans("StockCorrection"), '', 'generic'); print ''."\n"; diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php index 787083f0940..4ed59d88002 100644 --- a/htdocs/product/stock/tpl/stocktransfer.tpl.php +++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php @@ -53,7 +53,7 @@ if (empty($conf) || ! is_object($conf)) { } } - print load_fiche_titre($langs->trans("StockTransfer"), '', 'title_generic.png'); + print load_fiche_titre($langs->trans("StockTransfer"), '', 'generic'); print ''."\n"; diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 87920f2a977..4e788a2b991 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -236,8 +236,8 @@ $linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus- $linktolist = dolGetButtonTitle($langs->trans('GoToListOfTasks'), '', 'fa fa-tasks paddingleft', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id); -//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1); -print load_fiche_titre($title, $linktolist.'   '.$linktocreatetask, 'title_generic.png'); +//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1); +print load_fiche_titre($title, $linktolist.'   '.$linktocreatetask, 'generic'); // Get list of tasks in tasksarray and taskarrayfiltered diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 6b9247530fd..ba15aef57cf 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -88,7 +88,7 @@ $morehtml.=''; $morehtml.=''; $morehtml.=''; -print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'title_project.png', 0, $morehtml); +print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'project', 0, $morehtml); // Show description of content print '
'; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index dd29a401bf7..bfc775ff94f 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -671,8 +671,8 @@ elseif ($id > 0 || ! empty($ref)) $title=$langs->trans("ListOfTasks"); $linktotasks = dolGetButtonTitle($langs->trans('GoToGanttView'), '', 'fa fa-calendar-minus-o paddingleft', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1'); - //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1); - print load_fiche_titre($title, $linktotasks.'   '.$linktocreatetask, 'title_generic.png'); + //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1); + print load_fiche_titre($title, $linktotasks.'   '.$linktocreatetask, 'generic'); // Get list of tasks in tasksarray and taskarrayfiltered // We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him). diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index d4c4a6d8473..9e8e71f5b32 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -941,7 +941,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) $title=$langs->trans("ListTaskTimeUserProject"); - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic', 0, $linktocreatetime, '', $limit); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit); } else { @@ -949,7 +949,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) $title=$langs->trans("ListTaskTimeForTask"); - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic', 0, $linktocreatetime, '', $limit); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit); } $i = 0; diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index 4ec52539188..02f9fbc1073 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -226,7 +226,7 @@ if ($action == 'create' || $object->fetch($id) > 0) { if ($action == 'create') { - print load_fiche_titre($title, '', 'title_generic'); + print load_fiche_titre($title, '', 'generic'); dol_fiche_head(''); } else diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index d9547ad441b..8151cebf05f 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -199,7 +199,7 @@ if($ret == -1) { $newcardbutton.= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create'); } - print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret+1, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit); + print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret+1, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); } $moreforfilter = ''; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 2010edeb217..acfd42a064d 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -55,7 +55,7 @@ $helpurl='EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Terceros'; llxHeader("", $langs->trans("ThirdParties"), $helpurl); $linkback=''; -print load_fiche_titre($transAreaType, $linkback, 'title_companies.png'); +print load_fiche_titre($transAreaType, $linkback, 'companies'); //print '
'; diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 0c65ae5150f..dd678b51605 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -403,7 +403,7 @@ if ($resql) print ''; print ''; - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, $newcardbutton, '', $limit); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit); $topicmail="SendSupplierProposalRef"; $modelmail="supplier_proposal_send"; diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php index 9517346f3fc..16a13953077 100644 --- a/htdocs/ticket/index.php +++ b/htdocs/ticket/index.php @@ -77,7 +77,7 @@ $tickesupstatic = new Ticket($db); llxHeader('', $langs->trans('TicketsIndex'), ''); $linkback=''; -print load_fiche_titre($langs->trans('TicketsIndex'), $linkback, 'title_ticket.png'); +print load_fiche_titre($langs->trans('TicketsIndex'), $linkback, 'ticket'); $dir = ''; diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index 630ea3c6b14..680380013b5 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -156,7 +156,7 @@ if ($resql) print ''; print ''; - print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_generic', 0, $newcardbutton, '', $limit); + print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); if ($sall) { diff --git a/htdocs/user/list.php b/htdocs/user/list.php index 9002b1eba82..b58a7c8cc39 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -315,7 +315,7 @@ print ''; $morehtmlright.= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-sitemap paddingleft', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ?'?search_statut='.$search_statut:'')); -print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_generic', 0, $morehtmlright.' '.$newcardbutton, '', $limit); +print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'generic', 0, $morehtmlright.' '.$newcardbutton, '', $limit); if (! empty($catid)) {