This commit is contained in:
Laurent Destailleur 2018-03-01 16:48:12 +01:00
parent 0f237e4d5c
commit 132ee2c788
4 changed files with 13 additions and 4 deletions

View File

@ -487,13 +487,13 @@ if ($resql)
if (! empty($arrayfields['c.date_contrat']['checked'])) if (! empty($arrayfields['c.date_contrat']['checked']))
{ {
// Date contract // Date contract
print '<td class="liste_titre center">'; print '<td class="liste_titre center nowraponall">';
//print $langs->trans('Month').': '; //print $langs->trans('Month').': ';
if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">'; if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">'; print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
//print '&nbsp;'.$langs->trans('Year').': '; //print '&nbsp;'.$langs->trans('Year').': ';
$syear = $year; $syear = $year;
$formother->select_year($syear,'year',1, 20, 5); print $formother->selectyear($syear,'year',1, 20, 5, 0, 0, '', 'widthauto');
print '</td>'; print '</td>';
} }
// Extra fields // Extra fields

View File

@ -881,9 +881,10 @@ class FormOther
* @param int $offset Offset * @param int $offset Offset
* @param int $invert Invert * @param int $invert Invert
* @param string $option Option * @param string $option Option
* @param string $morecss More css
* @return string * @return string
*/ */
function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='') function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='')
{ {
$out=''; $out='';
@ -892,7 +893,7 @@ class FormOther
$min_year = $currentyear-$min_year; $min_year = $currentyear-$min_year;
if(empty($selected) && empty($useempty)) $selected = $currentyear; if(empty($selected) && empty($useempty)) $selected = $currentyear;
$out.= '<select class="flat" placeholder="aa" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >'; $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
if($useempty) if($useempty)
{ {
$selected_html=''; $selected_html='';

View File

@ -864,7 +864,9 @@ select.selectarrowonleft option {
/* rule for not too small screen only */ /* rule for not too small screen only */
@media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px) @media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
{ {
.width25 { width: 25px; }
.width50 { width: 50px; } .width50 { width: 50px; }
.width75 { width: 75px; }
.width100 { width: 100px; } .width100 { width: 100px; }
.width200 { width: 200px; } .width200 { width: 200px; }
.minwidth100 { min-width: 100px; } .minwidth100 { min-width: 100px; }
@ -880,8 +882,10 @@ select.selectarrowonleft option {
.minwidth400imp { min-width: 400px !important; } .minwidth400imp { min-width: 400px !important; }
.minwidth500imp { min-width: 500px !important; } .minwidth500imp { min-width: 500px !important; }
} }
.widthauto { width: auto; }
.width25 { width: 25px; } .width25 { width: 25px; }
.width50 { width: 50px; } .width50 { width: 50px; }
.width75 { width: 75px; }
.width100 { width: 100px; } .width100 { width: 100px; }
.width200 { width: 200px; } .width200 { width: 200px; }
.maxwidth25 { max-width: 25px; } .maxwidth25 { max-width: 25px; }

View File

@ -864,7 +864,9 @@ select.selectarrowonleft option {
/* rule for not too small screen only */ /* rule for not too small screen only */
@media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px) @media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
{ {
.width25 { width: 25px; }
.width50 { width: 50px; } .width50 { width: 50px; }
.width75 { width: 75px; }
.width100 { width: 100px; } .width100 { width: 100px; }
.width200 { width: 200px; } .width200 { width: 200px; }
.minwidth100 { min-width: 100px; } .minwidth100 { min-width: 100px; }
@ -880,8 +882,10 @@ select.selectarrowonleft option {
.minwidth400imp { min-width: 400px !important; } .minwidth400imp { min-width: 400px !important; }
.minwidth500imp { min-width: 500px !important; } .minwidth500imp { min-width: 500px !important; }
} }
.widthauto { width: auto; }
.width25 { width: 25px; } .width25 { width: 25px; }
.width50 { width: 50px; } .width50 { width: 50px; }
.width75 { width: 75px; }
.width100 { width: 100px; } .width100 { width: 100px; }
.width200 { width: 200px; } .width200 { width: 200px; }
.maxwidth25 { max-width: 25px; } .maxwidth25 { max-width: 25px; }