From 5f6ca1119a534221cf4b3d2d43c28de01edc256b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 2 Mar 2019 14:07:13 +0100 Subject: [PATCH] Replace arrow picto with fontawesome --- htdocs/core/lib/functions.lib.php | 12 +++---- ...es.php => export_excel2007new.modules.php} | 2 +- htdocs/exports/export.php | 34 +++++++++--------- htdocs/theme/eldy/img/1downarrow.png | Bin 177 -> 0 bytes htdocs/theme/eldy/img/1downarrow_selected.png | Bin 205 -> 0 bytes htdocs/theme/eldy/img/1leftarrow.png | Bin 228 -> 0 bytes htdocs/theme/eldy/img/1leftarrow_selected.png | Bin 228 -> 0 bytes htdocs/theme/eldy/img/1rightarrow.png | Bin 231 -> 0 bytes .../theme/eldy/img/1rightarrow_selected.png | Bin 231 -> 0 bytes htdocs/theme/eldy/img/1uparrow.png | Bin 179 -> 0 bytes htdocs/theme/eldy/img/1uparrow_selected.png | Bin 192 -> 0 bytes htdocs/theme/eldy/style.css.php | 3 ++ htdocs/theme/md/img/1downarrow.png | Bin 177 -> 0 bytes htdocs/theme/md/img/1downarrow_selected.png | Bin 205 -> 0 bytes htdocs/theme/md/img/1leftarrow.png | Bin 228 -> 0 bytes htdocs/theme/md/img/1leftarrow_selected.png | Bin 228 -> 0 bytes htdocs/theme/md/img/1rightarrow.png | Bin 231 -> 0 bytes htdocs/theme/md/img/1rightarrow_selected.png | Bin 231 -> 0 bytes htdocs/theme/md/img/1uparrow.png | Bin 179 -> 0 bytes htdocs/theme/md/img/1uparrow_selected.png | Bin 192 -> 0 bytes htdocs/theme/md/style.css.php | 3 ++ 21 files changed, 29 insertions(+), 25 deletions(-) rename htdocs/core/modules/export/{export_excelnew.modules.php => export_excel2007new.modules.php} (99%) delete mode 100644 htdocs/theme/eldy/img/1downarrow.png delete mode 100644 htdocs/theme/eldy/img/1downarrow_selected.png delete mode 100644 htdocs/theme/eldy/img/1leftarrow.png delete mode 100644 htdocs/theme/eldy/img/1leftarrow_selected.png delete mode 100644 htdocs/theme/eldy/img/1rightarrow.png delete mode 100644 htdocs/theme/eldy/img/1rightarrow_selected.png delete mode 100644 htdocs/theme/eldy/img/1uparrow.png delete mode 100644 htdocs/theme/eldy/img/1uparrow_selected.png delete mode 100644 htdocs/theme/md/img/1downarrow.png delete mode 100644 htdocs/theme/md/img/1downarrow_selected.png delete mode 100644 htdocs/theme/md/img/1leftarrow.png delete mode 100644 htdocs/theme/md/img/1leftarrow_selected.png delete mode 100644 htdocs/theme/md/img/1rightarrow.png delete mode 100644 htdocs/theme/md/img/1rightarrow_selected.png delete mode 100644 htdocs/theme/md/img/1uparrow.png delete mode 100644 htdocs/theme/md/img/1uparrow_selected.png diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7e150fc9a7f..37b8eaa320b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2980,7 +2980,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ //if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on'))) if (empty($srconly) && in_array($pictowithoutext, array( 'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', - 'note', 'sign-out', 'split', 'switch_off', 'switch_on', 'unlink', 'uparrow', '1downarrow', '1uparrow', + 'note', 'sign-out', 'split', 'switch_off', 'switch_on', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', 'jabber','skype','twitter','facebook','linkedin' ) )) { @@ -3053,12 +3053,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $fakey = 'fa-mail-forward'; $facolor = '#555'; } - elseif ($pictowithoutext == '1uparrow') { - $fakey = 'fa-caret-up'; - $marginleftonlyshort = 1; - } - elseif ($pictowithoutext == '1downarrow') { - $fakey = 'fa-caret-down'; + elseif (in_array($pictowithoutext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) { + $convertarray=array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right'); + $fakey = 'fa-'.$convertarray[$pictowithoutext]; + if (preg_match('/selected/', $pictowithoutext)) $facolor = '#888'; $marginleftonlyshort = 1; } elseif ($pictowithoutext == 'sign-out') { diff --git a/htdocs/core/modules/export/export_excelnew.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php similarity index 99% rename from htdocs/core/modules/export/export_excelnew.modules.php rename to htdocs/core/modules/export/export_excel2007new.modules.php index f6a54b040d3..b51aa7b00fc 100644 --- a/htdocs/core/modules/export/export_excelnew.modules.php +++ b/htdocs/core/modules/export/export_excel2007new.modules.php @@ -32,7 +32,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx; /** * Class to build export files with Excel format */ -class ExportExcelnew extends ModeleExports +class ExportExcel2007new extends ModeleExports { /** * @var int ID diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 942ec66b002..6e7bb7fbaf6 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -519,7 +519,7 @@ if ($step == 2 && $datatoexport) print '
'; print '
'; - print ''; + print '
'; // Module print ''; @@ -551,13 +551,13 @@ if ($step == 2 && $datatoexport) print ''; print ''; print ''; - print '
'.$langs->trans("Module").'
'; - print $langs->trans("SelectExportFields").' '; + print '
'; + print ''.$langs->trans("SelectExportFields").' '; if(empty($conf->global->EXPORTS_SHARE_MODELS))$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id); else $htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1); print ' '; print ''; - print '
'; + print '
'; print ''; @@ -565,10 +565,10 @@ if ($step == 2 && $datatoexport) print ''; print ''.$langs->trans("Entities").''; print ''.$langs->trans("ExportableFields").''; - print ''; - print ''.$langs->trans("All").""; + print ''; + print ''.$langs->trans("All").""; print ' / '; - print ''.$langs->trans("None").""; + print ''.$langs->trans("None").""; print ''; print ''.$langs->trans("ExportedFields").''; print ''; @@ -719,7 +719,7 @@ if ($step == 3 && $datatoexport) print '
'; print '
'; - print ''; + print '
'; // Module print ''; @@ -754,7 +754,7 @@ if ($step == 3 && $datatoexport) print '
'; // Combo list of export models - print $langs->trans("SelectFilterFields").'
'; + print ''.$langs->trans("SelectFilterFields").'

'; // un formulaire en plus pour recuperer les filtres @@ -905,10 +905,10 @@ if ($step == 4 && $datatoexport) print '
'; print '
'; - print '
'.$langs->trans("Module").'
'; + print '
'; // Module - print ''; + print ''; print '
'.$langs->trans("Module").'
'.$langs->trans("Module").''; //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' '; print $objexport->array_export_module[0]->getName(); @@ -962,7 +962,7 @@ if ($step == 4 && $datatoexport) // Select request if all fields are selected $sqlmaxforexport=$objexport->build_sql(0, array(), array()); - print $langs->trans("ChooseFieldsOrdersAndTitle").'
'; + print '
'.$langs->trans("ChooseFieldsOrdersAndTitle").'
'; print ''; print ''; @@ -1166,7 +1166,7 @@ if ($step == 5 && $datatoexport) print '
'; print '
'; - print '
'; + print '
'; // Module print ''; @@ -1193,7 +1193,7 @@ if ($step == 5 && $datatoexport) } print ''; - // List of filtered fiels + // List of filtered fields if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) { print ''; @@ -1222,9 +1222,9 @@ if ($step == 5 && $datatoexport) // List of available export formats $htmltabloflibs = '
'.$langs->trans("Module").''.$list.'
'.$langs->trans("FilteredFields").'
'; $htmltabloflibs.= ''; - $htmltabloflibs.= ''; + $htmltabloflibs.= ''; $htmltabloflibs.= ''; - $htmltabloflibs.= ''; + $htmltabloflibs.= ''; $htmltabloflibs.= ''."\n"; $liste=$objmodelexport->liste_modeles($db); @@ -1238,7 +1238,7 @@ if ($step == 5 && $datatoexport) } $htmltabloflibs.= ''; - $htmltabloflibs.= ''; diff --git a/htdocs/theme/eldy/img/1downarrow.png b/htdocs/theme/eldy/img/1downarrow.png deleted file mode 100644 index 1d8a1164ae05a0abad46da914151060a8f2ebbfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyDdE6IBF(rAsyDqJu~y+$&!sTc|hRx s^8f8kUoTHIacBu_Q8*;ww1R=b&P8h0yG7ZPfQB%5y85}Sb4q9e0MWZWQ2+n{ diff --git a/htdocs/theme/eldy/img/1leftarrow.png b/htdocs/theme/eldy/img/1leftarrow.png deleted file mode 100644 index 554cdc3d76c3543d9c08f56aa3dd64d06bbddbf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#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(tsQbPZ!4!4q4WNhFpgj z7+g2*;kW8=c7I>*cJ!c=?}3kpKKy7cd|j6q#=BbU%_^?qu>79)%hlU9e_&S*;cz{6 SZ}vo>84RATelF{r5}E+X17s%v diff --git a/htdocs/theme/eldy/img/1leftarrow_selected.png b/htdocs/theme/eldy/img/1leftarrow_selected.png deleted file mode 100644 index 554cdc3d76c3543d9c08f56aa3dd64d06bbddbf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#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(tsQbPZ!4!4q4WNhFpgj z7+g2*;kW8=c7I>*cJ!c=?}3kpKKy7cd|j6q#=BbU%_^?qu>79)%hlU9e_&S*;cz{6 SZ}vo>84RATelF{r5}E+X17s%v diff --git a/htdocs/theme/eldy/img/1rightarrow.png b/htdocs/theme/eldy/img/1rightarrow.png deleted file mode 100644 index 95fdc377ee90c3b9d7c8fade2197c941571f3142..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#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(tsRmPZ!4!4q4WN7kQfk zL>xBG`+bG~5yPAP$`@BK-acAaefUCo^TVo=;|5m^LZ&WUbvo%3?#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(tsRmPZ!4!4q4WN7kQfk zL>xBG`+bG~5yPAP$`@BK-acAaefUCo^TVo=;|5m^LZ&WUbvo%dE6IBF(rAsyD&&^HED`9XhN=+D Scpd{PW$<+Mb6Mw<&;$TQ$1Sx0 diff --git a/htdocs/theme/eldy/img/1uparrow_selected.png b/htdocs/theme/eldy/img/1uparrow_selected.png deleted file mode 100644 index d9d8462fe43c5b02530a4a4c219f2a514f4e8536..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyD=?LHNOA= diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index dde22ddcec6..1baf1650494 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -769,6 +769,9 @@ select.flat.selectlimit { .nomarginleft { margin-left: 0px !important; } +.marginbottomonly { + margin-bottom: 10px !important; +} .selectlimit, .selectlimit:focus { border-left: none !important; border-top: none !important; diff --git a/htdocs/theme/md/img/1downarrow.png b/htdocs/theme/md/img/1downarrow.png deleted file mode 100644 index 1d8a1164ae05a0abad46da914151060a8f2ebbfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyDdE6IBF(rAsyDqJu~y+$&!sTc|hRx s^8f8kUoTHIacBu_Q8*;ww1R=b&P8h0yG7ZPfQB%5y85}Sb4q9e0MWZWQ2+n{ diff --git a/htdocs/theme/md/img/1leftarrow.png b/htdocs/theme/md/img/1leftarrow.png deleted file mode 100644 index 554cdc3d76c3543d9c08f56aa3dd64d06bbddbf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#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(tsQbPZ!4!4q4WNhFpgj z7+g2*;kW8=c7I>*cJ!c=?}3kpKKy7cd|j6q#=BbU%_^?qu>79)%hlU9e_&S*;cz{6 SZ}vo>84RATelF{r5}E+X17s%v diff --git a/htdocs/theme/md/img/1leftarrow_selected.png b/htdocs/theme/md/img/1leftarrow_selected.png deleted file mode 100644 index 554cdc3d76c3543d9c08f56aa3dd64d06bbddbf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#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(tsQbPZ!4!4q4WNhFpgj z7+g2*;kW8=c7I>*cJ!c=?}3kpKKy7cd|j6q#=BbU%_^?qu>79)%hlU9e_&S*;cz{6 SZ}vo>84RATelF{r5}E+X17s%v diff --git a/htdocs/theme/md/img/1rightarrow.png b/htdocs/theme/md/img/1rightarrow.png deleted file mode 100644 index 95fdc377ee90c3b9d7c8fade2197c941571f3142..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#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(tsRmPZ!4!4q4WN7kQfk zL>xBG`+bG~5yPAP$`@BK-acAaefUCo^TVo=;|5m^LZ&WUbvo%3?#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(tsRmPZ!4!4q4WN7kQfk zL>xBG`+bG~5yPAP$`@BK-acAaefUCo^TVo=;|5m^LZ&WUbvo%dE6IBF(rAsyD&&^HED`9XhN=+D Scpd{PW$<+Mb6Mw<&;$TQ$1Sx0 diff --git a/htdocs/theme/md/img/1uparrow_selected.png b/htdocs/theme/md/img/1uparrow_selected.png deleted file mode 100644 index d9d8462fe43c5b02530a4a4c219f2a514f4e8536..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyD=?LHNOA= diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 8b988823046..6f22cf2746d 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -756,6 +756,9 @@ select.flat.selectlimit { .nomarginleft { margin-left: 0px !important; } +.marginbottomonly { + margin-bottom: 10px !important; +} .selectlimit, .selectlimit:focus { border-left: none !important; border-top: none !important;
'.$langs->trans("AvailableFormats").''.$langs->trans("AvailableFormats").''.$langs->trans("LibraryUsed").''.$langs->trans("LibraryVersion").''.$langs->trans("LibraryVersion").'
'.img_picto_common($key, $objmodelexport->getPictoForKey($key)).' '; + $htmltabloflibs.= ''.img_picto_common($key, $objmodelexport->getPictoForKey($key)).' '; $text=$objmodelexport->getDriverDescForKey($key); $label=$listeall[$key]; $htmltabloflibs.= $form->textwithpicto($label, $text).'