Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

It's easier to select fields to show on list

Browse Source
This commit is contained in:
Laurent Destailleur
2018-09-19 16:41:33 +02:00
parent ee788b543e
commit 12b449fe49
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.form.class.php
View File

@@ -6099,7 +6099,7 @@ class Form
}
if ($val['label'])
{
$lis.='<li><input type="checkbox" value="'.$key.'"'.(empty($val['checked'])?'':' checked="checked"').'/>'.dol_escape_htmltag($langs->trans($val['label'])).'</li>';
$lis.='<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked'])?'':' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
$listcheckedstring.=(empty($val['checked'])?'':$key.',');
}
}

2
htdocs/core/class/html.formfile.class.php
View File

@@ -915,7 +915,7 @@ class FormFile
if (! empty($file_list))
{
$out='<dl class="dropdown inline-block">
<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignbottom').'</a></dt>
<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignmiddle').'</a></dt>
<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields" style="display: none;">';
$tmpout='';

2
htdocs/core/lib/functions.lib.php
View File

@@ -3152,7 +3152,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', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
'switch_off', 'switch_on', 'unlink', 'uparrow', '1downarrow', '1uparrow')
)) {
$fakey = $pictowithoutext;

7
htdocs/theme/eldy/style.css.php
View File

@@ -5032,7 +5032,7 @@ dl.dropdown {
box-shadow: 1px 1px 10px #aaa;
display:none;
<?php echo $right; ?>:0px; /* pop is align on right */
padding: 2px 15px 2px 5px;
padding: 0 0 0 0;
position:absolute;
top:2px;
list-style:none;
@@ -5042,10 +5042,13 @@ dl.dropdown {
.dropdown dd ul li {
white-space: nowrap;
font-weight: normal;
padding: 4px;
padding: 4px 8px 4px 8px;
/* color: rgb(<?php print $colortext; ?>); */
color: #000;
}
.dropdown dd ul li:hover {
background: #eee;
}
.dropdown dd ul li input[type="checkbox"] {
margin-<?php echo $right; ?>: 3px;
}