diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 2e5799f970c..0de84d581f1 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -733,8 +733,9 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
print '';
$cssonholiday='';
- if (! $isavailable[$preselectedday]['morning']) $cssonholiday.='onholidaymorning ';
- if (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+ if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayallday ';
+ elseif (! $isavailable[$preselectedday]['morning']) $cssonholiday.='onholidaymorning ';
+ elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
// Duration
print '
';
@@ -970,8 +971,9 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
$cssonholiday='';
- if (! $isavailable[$tmpday]['morning']) $cssonholiday.='onholidaymorning ';
- if (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+ if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayallday ';
+ elseif (! $isavailable[$tmpday]['morning']) $cssonholiday.='onholidaymorning ';
+ elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
$tmparray=dol_getdate($tmpday);
$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index ad1815c5efc..c9c577742e6 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -85,7 +85,7 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
$usertoprocess=$user;
$search_usertoprocessid=$usertoprocess->id;
}
-elseif (search_usertoprocessid > 0)
+elseif ($search_usertoprocessid > 0)
{
$usertoprocess=new User($db);
$usertoprocess->fetch($search_usertoprocessid);
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index caf2a3e4e84..b808017123d 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -98,7 +98,7 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
$usertoprocess=$user;
$search_usertoprocessid=$usertoprocess->id;
}
-elseif (search_usertoprocessid > 0)
+elseif ($search_usertoprocessid > 0)
{
$usertoprocess=new User($db);
$usertoprocess->fetch($search_usertoprocessid);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3d58211fbde..a83d2ed9dd8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -387,12 +387,18 @@ input.buttonpaymentstripe {
background-repeat: no-repeat;
background-position: 8px 7px;
}
+/* Used by timesheets */
span.timesheetalreadyrecorded input {
border: none;
border-bottom: solid 1px rgba(0,0,0,0.4);
margin-right: 1px !important;
}
-
+td.onholidaymorning, td.onholidayafternoon {
+ background-color: #fdf6f2;
+}
+td.onholidayallday {
+ background-color: #f4eede;
+}
select.flat, form.flat select {
font-weight: normal;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 36fbd2bdd20..0f3711bf45b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -384,11 +384,18 @@ input.buttonpaymentstripe {
background-repeat: no-repeat;
background-position: 8px 7px;
}
+/* Used for timesheets */
span.timesheetalreadyrecorded input {
border: none;
border-bottom: solid 1px rgba(0,0,0,0.1);
margin-right: 1px !important;
}
+td.onholidaymorning, td.onholidayafternoon {
+ background-color: #fdf6f2;
+}
+td.onholidayallday {
+ background-color: #f4eede;
+}
select.flat, form.flat select {
font-weight: normal;
|