This commit is contained in:
Laurent Destailleur 2020-06-20 00:00:17 +02:00
parent 1ce3991d81
commit 2de3eb8ac0
3 changed files with 10 additions and 8 deletions

View File

@ -6091,7 +6091,7 @@ abstract class CommonObject
{ {
$morecss = 'minwidth100imp'; $morecss = 'minwidth100imp';
} }
elseif ($type == 'datetime' || $type == 'link') elseif ($type == 'datetime' || $type == 'link') // link means an foreign key to another primary id
{ {
$morecss = 'minwidth200imp'; $morecss = 'minwidth200imp';
} }
@ -6563,11 +6563,13 @@ abstract class CommonObject
$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]' $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
$param_list_array = explode(':', $param_list[0]); $param_list_array = explode(':', $param_list[0]);
$showempty = (($required && $default != '') ? 0 : 1); $showempty = (($required && $default != '') ? 0 : 1);
if (!empty($param_list_array[2])) { // If the entry into $fields is set to add a create button
$morecss .= ' widthcentpercentminusx';
}
$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, empty($val['disabled']) ? 0 : 1); $out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, empty($val['disabled']) ? 0 : 1);
if (!empty($param_list_array[2])) // If we set to add a create button if (!empty($param_list_array[2])) { // If the entry into $fields is set to add a create button
{
if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton)) // To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled". if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton)) // To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
{ {
list($class, $classfile) = explode(':', $param_list[0]); list($class, $classfile) = explode(':', $param_list[0]);

View File

@ -5933,7 +5933,7 @@ class Form
} }
elseif ($typehour == 'text' || $typehour == 'textselect') elseif ($typehour == 'text' || $typehour == 'textselect')
{ {
$retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">'; $retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';
} }
else return 'BadValueForParameterTypeHour'; else return 'BadValueForParameterTypeHour';
@ -5957,7 +5957,7 @@ class Form
} }
elseif ($typehour == 'text') elseif ($typehour == 'text')
{ {
$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">'; $retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';
} }
if ($typehour != 'text') $retstring .= ' '.$langs->trans('MinuteShort'); if ($typehour != 'text') $retstring .= ' '.$langs->trans('MinuteShort');

View File

@ -148,9 +148,9 @@ table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.
.liste_titre input[name=search_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when], .liste_titre input[name=search_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when],
.liste_titre input[name=search_dtstartday], .liste_titre input[name=search_dtendday], .liste_titre input[name=search_dtstartmonth], .liste_titre input[name=search_dtendmonth], .liste_titre input[name=search_dtstartday], .liste_titre input[name=search_dtendday], .liste_titre input[name=search_dtstartmonth], .liste_titre input[name=search_dtendmonth],
select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth, select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth,
input[name=duration_value] input[name=duration_value], input[name=durationhour]
{ {
margin-right: 4px; margin-right: 4px !important;
} }
input[type=submit], input[type=submit]:hover { input[type=submit], input[type=submit]:hover {
margin-left: 5px; margin-left: 5px;
@ -1159,7 +1159,7 @@ table[summary="list_of_modules"] .fa-cog {
} }
select.minwidth100imp, select.minwidth100, select.minwidth200, .widthcentpercentminusx { select.minwidth100imp, select.minwidth100, select.minwidth200, .widthcentpercentminusx {
width: calc(100% - 30px) !important; width: calc(100% - 50px) !important;
display: inline-block; display: inline-block;
} }