From 1e0a660d24d7049aec63fbfae7a2fed1ea8cb436 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 16 Apr 2018 19:56:53 +0200 Subject: [PATCH] More font awesome picto instead of img --- htdocs/core/boxes/modules_boxes.php | 8 ++++---- htdocs/core/class/html.form.class.php | 14 +++++++------- htdocs/core/lib/functions.lib.php | 14 +++++++++++++- htdocs/theme/eldy/style.css.php | 8 +++++--- htdocs/theme/md/style.css.php | 7 ++++--- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index 74f0ffc9d9d..61af58a4b8b 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -261,17 +261,17 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" { $sublink=''; if (! empty($head['sublink'])) $sublink.= ''; - if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="'.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"'); + if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium '.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"'); if (! empty($head['sublink'])) $sublink.= ''; $out.= ''; $out.=$sublink; // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object - $out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="boxhandle hideonsmartphone cursormove"'); - $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="boxclose cursorpointer" rel="x:y" id="imgclose'.$this->box_id.'"'); + $out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="opacitymedium boxhandle hideonsmartphone cursormove"'); + $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="opacitymedium boxclose cursorpointer" rel="x:y" id="imgclose'.$this->box_id.'"'); $label=$head['text']; //if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')'; - if (! empty($head['graph'])) $label.=' '; + if (! empty($head['graph'])) $label.=' '; $out.= ''; $out.= ''; } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 32de5f2edfd..1465b0ea570 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5908,7 +5908,7 @@ class Form -
+
    '.$lis.' @@ -6032,13 +6032,13 @@ class Form foreach($object->linkedObjects as $objecttype => $objects) { $tplpath = $element = $subelement = $objecttype; - + // to display inport button on tpl $showImportButton=false; if(!empty($compatibleImportElementsList) && in_array($element,$compatibleImportElementsList)){ $showImportButton=true; } - + if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs)) { $element = $regs[1]; @@ -6098,7 +6098,7 @@ class Form global $noMoreLinkedObjectBlockAfter; $noMoreLinkedObjectBlockAfter=1; } - + $res=@include dol_buildpath($reldir.'/'.$tplname.'.tpl.php'); if ($res) { @@ -6114,13 +6114,13 @@ class Form } print ''; - + if(!empty($compatibleImportElementsList)) { $res=@include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php'); } - - + + print '
'; return $nbofdifferenttypes; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index cf135aec844..898857f3bf4 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3089,7 +3089,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $pictowithoutext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto); //if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on'))) - if (empty($srconly) && in_array($pictowithoutext, array('bank', 'delete', 'edit', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'switch_off', 'switch_on', 'unlink', 'uparrow'))) { + if (empty($srconly) && in_array($pictowithoutext, array( + 'bank', 'close_title', 'delete', 'edit', 'filter', 'grip_title', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', + 'switch_off', 'switch_on', 'unlink', 'uparrow') + )) { $fakey = $pictowithoutext; $facolor = ''; $fasize = ''; @@ -3115,6 +3118,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $fakey = 'fa-bank'; $facolor = '#444'; } + elseif ($pictowithoutext == 'close_title') { + $fakey = 'fa-window-close'; + } elseif ($pictowithoutext == 'delete') { $fakey = 'fa-trash'; $facolor = '#444'; @@ -3123,6 +3129,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $fakey = 'fa-pencil'; $facolor = '#444'; } + elseif ($pictowithoutext == 'filter') { + $fakey = 'fa-'.$pictowithoutext; + } + elseif ($pictowithoutext == 'grip_title') { + $fakey = 'fa-arrows'; + } elseif ($pictowithoutext == 'printer') { $fakey = 'fa-print'; $fasize = '1.2em'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 8577657204c..22c5592de55 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -4841,6 +4841,9 @@ dl.dropdown { display:inline-block; padding: 0 3px 2px 0; } +.dropdown span.value { + display:none; +} .dropdown dd ul { background-color: #FFF; border: 1px solid #888; @@ -4853,13 +4856,12 @@ dl.dropdown { max-height: 264px; overflow: auto; } -.dropdown span.value { - display:none; -} .dropdown dd ul li { white-space: nowrap; font-weight: normal; padding: 2px; + /* color: rgb(); */ + color: #000; } .dropdown dd ul li input[type="checkbox"] { margin-: 3px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 514f575d356..56329f5d9a5 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -4744,6 +4744,9 @@ dl.dropdown { display:inline-block; padding: 0 3px 2px 0; } +.dropdown span.value { + display:none; +} .dropdown dd ul { background-color: #FFF; border: 1px solid #888; @@ -4756,13 +4759,11 @@ dl.dropdown { max-height: 264px; overflow: auto; } -.dropdown span.value { - display:none; -} .dropdown dd ul li { white-space: nowrap; font-weight: normal; padding: 2px; + color: #000; } .dropdown dd ul li input[type="checkbox"] { margin-right: 3px;