From 43f09dfccf433af495b6480c934e14391604c520 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 2 Oct 2015 16:11:25 +0200 Subject: [PATCH] Work on theme --- htdocs/core/lib/functions.lib.php | 5 +++-- htdocs/product/list.php | 12 ++++++------ htdocs/theme/eldy/img/1downarrow.png | Bin 225 -> 177 bytes htdocs/theme/eldy/img/1downarrow_selected.png | Bin 341 -> 205 bytes htdocs/theme/eldy/img/1uparrow.png | Bin 232 -> 179 bytes htdocs/theme/eldy/img/1uparrow_selected.png | Bin 355 -> 192 bytes htdocs/theme/eldy/img/filter.png | Bin 206 -> 237 bytes htdocs/theme/eldy/style.css.php | 3 +++ htdocs/theme/md/img/1downarrow.png | Bin 225 -> 177 bytes htdocs/theme/md/img/1downarrow_selected.png | Bin 341 -> 205 bytes htdocs/theme/md/img/1uparrow.png | Bin 232 -> 179 bytes htdocs/theme/md/img/1uparrow_selected.png | Bin 355 -> 192 bytes 12 files changed, 12 insertions(+), 8 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f07ff99c72a..81f14683383 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2810,9 +2810,10 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois * @param string $picto Icon to use before title (should be a 32x32 transparent png file) * @param int $pictoisfullpath 1=Icon name is a full absolute url of image * @param string $morehtml More html to show + * @param string $morecss More css to the table * @return void */ -function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.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='', $morecss='') { global $conf,$langs; @@ -2830,7 +2831,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so print "\n"; print "\n"; - print ''; + print '
'; // Left if ($picto && $titre) print ''; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 77e8373d2a7..de5abca1de4 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -315,13 +315,13 @@ else $titlefield=$langs->trans("SellingPrice"); if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { - $titlefields=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer")); + $titlefield=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer")); } - print_liste_field_titre($titlefields, $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($titlefield, $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder); } - if ($user->rights->fournisseur->lire) print ''; - if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print ''; - if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print ''; + if ($user->rights->fournisseur->lire) print_liste_field_titre($langs->trans("BuyingPriceMinShort"), '', '', '', '', 'align="right"'); + if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("DesiredStock"), '', '', '', '', 'align="right"'); + if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("PhysicalStock"), '', '', '', '', 'align="right"'); print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Buy"), $_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch '); @@ -553,7 +553,7 @@ else $param.=($fourn_id?"&fourn_id=".$fourn_id:""); $param.=($search_categ?"&search_categ=".$search_categ:""); $param.=isset($type)?"&type=".$type:""; - print_barre_liste('', $page, "list.php", $param, $sortfield, $sortorder,'',$num,$nbtotalofrecords); + print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', '', '', 'paginationatbottom'); $db->free($resql); diff --git a/htdocs/theme/eldy/img/1downarrow.png b/htdocs/theme/eldy/img/1downarrow.png index 1d134ab3e4e52167abaa33369164ffb8fd3bf060..1d8a1164ae05a0abad46da914151060a8f2ebbfc 100644 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyD3?#4ne^UZdQ2{<7uK)l4FP}KOX6~x=y0+-7 zg6f$|x;G!Jm@*%T5=*KYmu;H5?=+CCowEX{0H|`pj$`esw^vVH02Ha8w;Cu|JYi;R zPSJ)7x6j>wcI@uc9hdL*?>Ye#oWGCj9ncoWk|4ie28U-i(tsROPZ!4!j_Bl+21Yj) z@1~FT!pe`u<=osF@8|Rg95}$bY~Me|RmrRy_cfO?T>ablD)mo)5*I^qHHTgA{^DOi P0~kDA{an^LB{Ts5Q-5JO diff --git a/htdocs/theme/eldy/img/1downarrow_selected.png b/htdocs/theme/eldy/img/1downarrow_selected.png index 5caf8ead52d3673720fa0f03631ef47ea04bf86e..17934d7c62e030bdb4c83c7807176aed5fbfa378 100644 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyDqJu~y+$&!sTc|hRx s^8f8kUoTHIacBu_Q8*;ww1R=b&P8h0yG7ZPfQB%5y85}Sb4q9e0MWZWQ2+n{ literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZddL^zACC){ui6xo&c?uz!xv31r ziMe_TMy3i`rI~pOMg|6^3Pwg&rsh^gh6>sSh6V=qS3gt$b+VUu`ns}T=jP^@XT2KK z%MCKQz$3Dlfr0A-2s1jZF_{4rWJ!1Qb!1@J*w6hZkrl{~4e$wZ{r~@e`NY{Zb62I; zwMAzYRL@+}z4>6pl=(oESW?xvY}3?zr-5YcoE1O?K$R1A9BW^_y?W{bph*3^)j+}G z2{U7JiZ)!heeV9VV|SnKxO}gF*9oBDvuDrJG~WsXEn+MQ@(X5gcy=QV$T9JBaSY+O zo}6%iNkv6<$&yr-loUyp9Zww`eC9MZavyn;&UkY3rjvyQPE(8wHymdKI;Vst04aZdD*ylh diff --git a/htdocs/theme/eldy/img/1uparrow.png b/htdocs/theme/eldy/img/1uparrow.png index 70ea061dc5e90f4901b94529ef13ffbbc21e640b..331731b750c619c3069b9de40a56637e9d241419 100644 GIT binary patch delta 164 zcmaFCxS4T+cs&~j3j+f~z|Z5pK#D2J+ueoXe|!I#{XiaPfk$L90|U1(2s1Lwnj--e zWH0gbb!ETL#l*)hRlZ}|aiEZ7iEBiObAE1aYF-J0b5UwyNotBhd1gt5g1e`0KzJjc zI8c$ir;B3<$Mxid1Kd&)QUmdK II;Vst05#Vwt^fc4 delta 217 zcmdnY_=0hQcs(ZvGXn#IO@*%_kV*^i332`Z|Nn#?#~PPys-C%|X6~x;iL;9*%*<`> zPOobNGJt5qh1=bm54Nw~UOja|?VJ_$^Hu|;Vsnbl-G4T9-)W#mpde5Ls4+UL0H}D; z@yiuc<^xe;N!78tPy2VB*m3z@QuwCpKpTS?OM?7@862M7NCWZ=JY5_^IIbtBG%&lF zEPGTd5j^kX^J0$RE>{7{ElmLGW$<+M Kb6Mw<&;$V7H)R0; diff --git a/htdocs/theme/eldy/img/1uparrow_selected.png b/htdocs/theme/eldy/img/1uparrow_selected.png index 36d25a408c544e5edc09ee7abaeca830896bb2fc..d9d8462fe43c5b02530a4a4c219f2a514f4e8536 100644 GIT binary patch delta 177 zcmaFNbbxV!cs&~j3j+f~z|Z5pK#D2J+ueoXe|!I#{XiaPfk$L90|U1(2s1Lwnj--e zWH0gbb!ETL#l*+T7TCXn3n(O6;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq z4pgM$>Eal|aXmTV0DIcG`Ihp|Fa85TpjL~b6Gx&OTieXfSA_+*^7K6Xk7U^~L?(;7 Uty|;v0H~3{)78&qol`;+02LxN&Hw-a delta 341 zcmX@W_?T&ecs(ZvGXn#IO@*%_kkTu0jVN(0N=+=u%+FH@$;?e=bRltAs0gae!+4|OV8JvF?&qCCU+&IpMG1_e!G=q&!M(a11efSFlY*qB>e+L~Qme3B(Y Yu@}=l%^LrcKob}|UHx3vIVCg!0B-()1ONa4 diff --git a/htdocs/theme/eldy/img/filter.png b/htdocs/theme/eldy/img/filter.png index 917715107bde9b14abbe77024e805b1a03d40153..ee34a22c78e0cd31d74739b7cb8a1bda9aa6e608 100644 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^_!2%@pE-d!}QcOwS?k)`f+xyS#2l6-zJR*x3 z7`TN&n2}-D90{Nxdx@v7EBk#eCSE;pf6mhzopr0Ca^+T>t<8 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CH!VDx|PJVD7NNEN5gt!7}Mn*;v5fO25aambe zAQu7}8X6WXSaA68;iE^79y@mI&Ye5$jrD9mIrfquzhJN$Udfh)Hdld6A5Ry@5RU7m zM-2rV3vq+CoUK~H7~vtEB6V#~9mon#S3j3^P6 tbody > tr:nth-child(even) td { diff --git a/htdocs/theme/md/img/1downarrow.png b/htdocs/theme/md/img/1downarrow.png index 1d134ab3e4e52167abaa33369164ffb8fd3bf060..1d8a1164ae05a0abad46da914151060a8f2ebbfc 100644 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyD3?#4ne^UZdQ2{<7uK)l4FP}KOX6~x=y0+-7 zg6f$|x;G!Jm@*%T5=*KYmu;H5?=+CCowEX{0H|`pj$`esw^vVH02Ha8w;Cu|JYi;R zPSJ)7x6j>wcI@uc9hdL*?>Ye#oWGCj9ncoWk|4ie28U-i(tsROPZ!4!j_Bl+21Yj) z@1~FT!pe`u<=osF@8|Rg95}$bY~Me|RmrRy_cfO?T>ablD)mo)5*I^qHHTgA{^DOi P0~kDA{an^LB{Ts5Q-5JO diff --git a/htdocs/theme/md/img/1downarrow_selected.png b/htdocs/theme/md/img/1downarrow_selected.png index 5caf8ead52d3673720fa0f03631ef47ea04bf86e..17934d7c62e030bdb4c83c7807176aed5fbfa378 100644 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyDqJu~y+$&!sTc|hRx s^8f8kUoTHIacBu_Q8*;ww1R=b&P8h0yG7ZPfQB%5y85}Sb4q9e0MWZWQ2+n{ literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZddL^zACC){ui6xo&c?uz!xv31r ziMe_TMy3i`rI~pOMg|6^3Pwg&rsh^gh6>sSh6V=qS3gt$b+VUu`ns}T=jP^@XT2KK z%MCKQz$3Dlfr0A-2s1jZF_{4rWJ!1Qb!1@J*w6hZkrl{~4e$wZ{r~@e`NY{Zb62I; zwMAzYRL@+}z4>6pl=(oESW?xvY}3?zr-5YcoE1O?K$R1A9BW^_y?W{bph*3^)j+}G z2{U7JiZ)!heeV9VV|SnKxO}gF*9oBDvuDrJG~WsXEn+MQ@(X5gcy=QV$T9JBaSY+O zo}6%iNkv6<$&yr-loUyp9Zww`eC9MZavyn;&UkY3rjvyQPE(8wHymdKI;Vst04aZdD*ylh diff --git a/htdocs/theme/md/img/1uparrow.png b/htdocs/theme/md/img/1uparrow.png index 70ea061dc5e90f4901b94529ef13ffbbc21e640b..331731b750c619c3069b9de40a56637e9d241419 100644 GIT binary patch delta 164 zcmaFCxS4T+cs&~j3j+f~z|Z5pK#D2J+ueoXe|!I#{XiaPfk$L90|U1(2s1Lwnj--e zWH0gbb!ETL#l*)hRlZ}|aiEZ7iEBiObAE1aYF-J0b5UwyNotBhd1gt5g1e`0KzJjc zI8c$ir;B3<$Mxid1Kd&)QUmdK II;Vst05#Vwt^fc4 delta 217 zcmdnY_=0hQcs(ZvGXn#IO@*%_kV*^i332`Z|Nn#?#~PPys-C%|X6~x;iL;9*%*<`> zPOobNGJt5qh1=bm54Nw~UOja|?VJ_$^Hu|;Vsnbl-G4T9-)W#mpde5Ls4+UL0H}D; z@yiuc<^xe;N!78tPy2VB*m3z@QuwCpKpTS?OM?7@862M7NCWZ=JY5_^IIbtBG%&lF zEPGTd5j^kX^J0$RE>{7{ElmLGW$<+M Kb6Mw<&;$V7H)R0; diff --git a/htdocs/theme/md/img/1uparrow_selected.png b/htdocs/theme/md/img/1uparrow_selected.png index 36d25a408c544e5edc09ee7abaeca830896bb2fc..d9d8462fe43c5b02530a4a4c219f2a514f4e8536 100644 GIT binary patch delta 177 zcmaFNbbxV!cs&~j3j+f~z|Z5pK#D2J+ueoXe|!I#{XiaPfk$L90|U1(2s1Lwnj--e zWH0gbb!ETL#l*+T7TCXn3n(O6;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq z4pgM$>Eal|aXmTV0DIcG`Ihp|Fa85TpjL~b6Gx&OTieXfSA_+*^7K6Xk7U^~L?(;7 Uty|;v0H~3{)78&qol`;+02LxN&Hw-a delta 341 zcmX@W_?T&ecs(ZvGXn#IO@*%_kkTu0jVN(0N=+=u%+FH@$;?e=bRltAs0gae!+4|OV8JvF?&qCCU+&IpMG1_e!G=q&!M(a11efSFlY*qB>e+L~Qme3B(Y Yu@}=l%^LrcKob}|UHx3vIVCg!0B-()1ONa4
'.img_picto('', $picto, '', $pictoisfullpath).''.$langs->trans("BuyingPriceMinShort").''.$langs->trans("DesiredStock").''.$langs->trans("PhysicalStock").'