This commit is contained in:
Laurent Destailleur 2022-08-15 09:10:42 +02:00
parent b8e720c8d9
commit 183b205c32
2 changed files with 11 additions and 1 deletions

View File

@ -446,7 +446,7 @@ $nav = '<a class="inline-block valignmiddle" href="?year='.$prev_year."&month=".
$nav .= ' <span id="month_name">'.dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." </span>\n"; $nav .= ' <span id="month_name">'.dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." </span>\n";
$nav .= '<a class="inline-block valignmiddle" href="?year='.$next_year."&month=".$next_month."&day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n"; $nav .= '<a class="inline-block valignmiddle" href="?year='.$next_year."&month=".$next_month."&day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
$nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; $nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
$nav .= ' <button type="submit" name="submitdateselect" value="x" class="bordertransp"><span class="fa fa-search"></span></button>'; $nav .= ' <button type="submit" name="submitdateselect" value="x" class="nobordertransp button_search_x"><span class="fa fa-search"></span></button>';
$picto = 'clock'; $picto = 'clock';

View File

@ -613,6 +613,9 @@ td.onholidaymorning, td.onholidayafternoon {
td.onholidayallday { td.onholidayallday {
background-color: #f4eede; background-color: #f4eede;
} }
td.onholidayallday:not(.weekend) input {
background-color: #f8f7f0;
}
td.leftborder, td.hide0 { td.leftborder, td.hide0 {
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
} }
@ -622,6 +625,13 @@ td.leftborder, td.hide6 {
td.rightborder { td.rightborder {
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
} }
td.weekend { /* must be after td.onholidayallday */
background-color: #eee;
}
td.weekend input {
background-color: #f8f8f8;
}
td.amount, span.amount, div.amount, b.amount { td.amount, span.amount, div.amount, b.amount {
color: #006666; color: #006666;