From 3825b89ead4514a1498ddc8f3e980b1e158806d4 Mon Sep 17 00:00:00 2001 From: jfefe Date: Sat, 18 Apr 2015 20:33:18 +0200 Subject: [PATCH] Change companies and product title picto --- htdocs/comm/list.php | 4 ++-- htdocs/comm/prospect/list.php | 2 +- htdocs/contact/card.php | 3 ++- htdocs/contact/list.php | 2 +- htdocs/core/lib/functions.lib.php | 6 +++--- htdocs/product/card.php | 3 ++- htdocs/product/index.php | 3 ++- htdocs/product/list.php | 2 +- htdocs/product/popuprop.php | 2 +- htdocs/societe/index.php | 4 ++-- htdocs/societe/soc.php | 3 ++- htdocs/theme/eldy/img/title_companies.png | Bin 0 -> 562 bytes htdocs/theme/eldy/img/title_products.png | Bin 0 -> 678 bytes 13 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 htdocs/theme/eldy/img/title_companies.png create mode 100644 htdocs/theme/eldy/img/title_products.png diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php index bc3be7b3ebe..d2f288ee1c8 100644 --- a/htdocs/comm/list.php +++ b/htdocs/comm/list.php @@ -5,7 +5,7 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2013 Florian Henry * - * This program is free software; you can redistribute it and/or modify + * This program is freei software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. @@ -157,7 +157,7 @@ if ($result) if ($search_sale > 0) $param.='&search_sale='.$search_sale; if ($search_status != '') $param.='&search_status='.$search_status; - print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies.png'); $i = 0; diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 1ab843da188..9f5a8542362 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -288,7 +288,7 @@ if ($resql) // $param and $urladd should have the same value $urladd = $param; - print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"], $param, $sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"], $param, $sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies.png'); // Print the search-by-sale and search-by-categ filters diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 5936e596fb7..e9495caaea8 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -412,7 +412,8 @@ else } $title = $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); - print_fiche_titre($title); + $linkback=''; + print_fiche_titre($title,$linkback,'title_companies.png'); // Affiche les erreurs dol_htmloutput_errors(is_numeric($error)?'':$error,$errors); diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 4413b721fc9..c69fc2266c2 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -264,7 +264,7 @@ if ($result) $num = $db->num_rows($result); $i = 0; - print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords); + print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,'title_companies.png'); print '
'; print ''; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 33c2c414e84..36487801ad0 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2780,12 +2780,12 @@ function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath * @param string $morehtml More html to show * @return void */ -function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title.png', $pictoisfullpath=0, $morehtml='') +function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='') { global $conf,$langs; - if ($picto == 'setup') $picto='title.png'; - if (($conf->browser->name == 'ie') && $picto=='title.png') $picto='title.gif'; + if ($picto == 'setup') $picto='title_setup.png'; + if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif'; if (($num > $conf->liste_limit) || ($num == -1)) { diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 239e351cedb..e7d67c5903b 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -866,7 +866,8 @@ else if ($type==1) $title=$langs->trans("NewService"); else $title=$langs->trans("NewProduct"); - print_fiche_titre($title); + $linkback=""; + print_fiche_titre($title,$linkback,'title_products.png'); dol_fiche_head(''); diff --git a/htdocs/product/index.php b/htdocs/product/index.php index b98470b272d..2d418691493 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -67,7 +67,8 @@ if ((isset($_GET["type"]) && $_GET["type"] == 1) || empty($conf->product->enable llxHeader("",$langs->trans("ProductsAndServices"),$helpurl); -print_fiche_titre($transAreaType); +$linkback=""; +print_fiche_titre($transAreaType,$linkback,'title_products.png'); print '
'; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index ededdbaff01..08d29c3e1dd 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -239,7 +239,7 @@ else $param.=($search_categ?"&search_categ=".$search_categ:""); $param.=isset($type)?"&type=".$type:""; - print_barre_liste($texte, $page, "list.php", $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords); + print_barre_liste($texte, $page, "list.php", $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,'title_products.png'); if (! empty($catid)) { diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 376647834b5..d44a74921ac 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -74,7 +74,7 @@ else if ($type == '1') llxHeader('','',$helpurl); -print_fiche_titre($title, $mesg); +print_fiche_titre($title, $mesg,'title_products.png'); $param = ''; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index d675c0d0a5b..c1e0e56316a 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -46,8 +46,8 @@ $transAreaType = $langs->trans("ThirdPartiesArea"); $helpurl='EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Terceros'; llxHeader("",$langs->trans("ThirdParties"),$helpurl); - -print_fiche_titre($transAreaType); +$linkback=''; +print_fiche_titre($transAreaType,$linkback,'title_companies.png'); //print ''; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index a2c56c014a7..5ef38e2c358 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -853,7 +853,8 @@ else $object->forme_juridique_code=GETPOST('forme_juridique_code'); /* Show create form */ - print_fiche_titre($langs->trans("NewThirdParty")); + $linkback=""; + print_fiche_titre($langs->trans("NewThirdParty"),$linkback,'title_companies.png'); if (! empty($conf->use_javascript_ajax)) { diff --git a/htdocs/theme/eldy/img/title_companies.png b/htdocs/theme/eldy/img/title_companies.png new file mode 100644 index 0000000000000000000000000000000000000000..b2539dba849a6f4a1ff231d2004df2b39607f582 GIT binary patch literal 562 zcmV-20?qx2P)kdTAqA_3pSHxTq8JbU#j_z)gM@Z`ae90M+bIV?iVac6XYFO4k2blWrA zv$KaS=*vuX^*`TKSIx9ZViN5Y6KWGH>~-pZX4U~ZHKukYb)Vy;&M`CV0v~Ej{SR~` z-8UsH8)5nnNoS3`N+1J%0s8@;1K?B1^+97f=7ilzIuB62bAClrlfrV~;RT-u=Qmbj zeb1sr@%=W4t(w_!z-P4$Vi_wpNrwetb7uBAFlVj`vE7=4*39f&($66p?_G6&iCUDfKJeSMlQLTbwmkO+g*ZLn zG$3lr#fwV*9JrEn;@L^-z<19=D#ZCK={T?}KLT&75PJ+f<-k*|%ZSyj{9a-qVG1m$ zM7^?Nu%{ zDRrDFu~CTmO2LgAMcecc%g06RTGB;H_5Rv+jy*n@Upx{p+iirP!XlT-;rl+8y4HcqDi-h<{LZsu?-u2SVMkDL& zvo|YcBulq@_V}Im9nW|x@@xgDD6SGT?bwR_kbqYAZ8bUkH9Nn#u@Dy@CT@Y z-@q^6Ctw9cY@D_Lv%w@a-9!6N4O5|<~03K+89}-pX^hj8!BKo@} zGGzm3g?<+#l}iBd3+A7Rff=v?YzvqgxRwE6GzLz9$G`*S^h!eGQ6=ya@hWgNcyAMH zMwP%y=KIW}+m0=P%Z(_IU{nU|c`@MCk;?^O#spwh66OLRcWw@VFTf|@R?v)6HU;*9 zZ)0@Bz8w#-tae-t+(7sHp+39;ZcD#+ijgiux(~pvJU<0q1f{vlkZH#No4~P@+gi2Y zOERg8NV2XryDxW!V>yET25SkKC%~qW#F_znz-Re$4R{XRiPZa*;C&4o0&fHa64*;A z-#(HbO%K2dqTW^|@;U*)2Cdlv7lUhAe}sL6fyM}BHrU9jk;8yn0M;(4pc9}qs%+kr zhEoBTB?sn8(-eUIez*nvmESiMi?KX91<=ZAxEnN+e~G%Fi&7)+o~WerN&-?0Gzpzj z^}_}X%oBj4K^TS9mo8S+HihlF_u+LCmNKv?3A;i7tp?B)0tj=!4e)UapdLV