diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 2d371f80be5..6a909eddd32 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1393,6 +1393,8 @@ class ActionComm extends CommonObject
$tooltip .= '
'.$langs->trans('Type').': '.$labeltype;
if (!empty($this->location))
$tooltip .= '
'.$langs->trans('Location').': '.$this->location;
+ if (isset($this->transparency))
+ $tooltip .= '
'.$langs->trans('Busy').': '.yn($this->transparency);
if (!empty($this->note_private))
$tooltip .= '
'.$langs->trans('Note').': '.(dol_textishtml($this->note_private) ? str_replace(array("\r", "\n"), "", $this->note_private) : str_replace(array("\r", "\n"), '
', $this->note_private));
$linkclose = '';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index ce453609e38..dd29d84cbc3 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1213,7 +1213,7 @@ if (empty($action) || $action == 'show_month') // View by month
$i = 0;
while ($i < 7)
{
- print '
';
+ print ' | ';
$numdayinweek = (($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7);
if (!empty($conf->dol_optimize_smallscreen))
{
@@ -1293,7 +1293,7 @@ if (empty($action) || $action == 'show_month') // View by month
print ' | ';
$i = 0;
while ($i < 7) {
- echo ' | '.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7))." | \n";
+ echo ' '.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7))." | \n";
$i++;
}
echo "
\n";
@@ -1353,7 +1353,7 @@ if (empty($action) || $action == 'show_month') // View by month
echo ' ';
echo ' | ';
- echo ' '.$langs->trans("Day".$arraytimestamp['wday'])." | \n";
+ echo ' '.$langs->trans("Day".$arraytimestamp['wday'])." | \n";
echo " \n";
/*
@@ -1457,7 +1457,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
if ($nonew <= 0)
{
print '';
- print '
';
@@ -1624,10 +1624,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
// If colortouse is similar than background, we force to change it.
if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY))
{
- print 'border: 2px solid #'.$colortouse.';';
+ print 'background: #f0f0f0;';
+ print 'border-left: 5px solid #'.$colortouse.';';
} else {
- print 'background: #'.$colortouse.';';
- print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($colortouse, -3).'), to(#'.dol_color_minus($colortouse, -1).'));';
+ print 'background: #f0f0f0;';
+ print 'border-left: 5px solid #'.dol_color_minus($colortouse, -3).';';
+ //print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($colortouse, -3).'), to(#'.dol_color_minus($colortouse, -1).'));';
}
//print 'background: #'.$colortouse.';';
//print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';
@@ -1706,7 +1708,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
$event->label = $titletoshow;
$event->libelle = $titletoshow;
// Note: List of users are inside $event->userassigned. Link may be clickable depending on permissions of user.
- $titletoshow = $event->getNomUrl(0, $maxnbofchar, 'cal_event', '', 0, 0);
+ $titletoshow = $event->getNomUrl(0, $maxnbofchar, 'cal_event cal_event_title', '', 0, 0);
$event->label = $savlabel;
$event->libelle = $savlabel;
}
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index df285ba920a..020223bdea0 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -698,7 +698,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
continue;
}
echo '';
- echo ''.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7)).'';
+ echo ''.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7)).'';
print " ";
if ($i) print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day');
else print dol_print_date($currentdaytoshow, 'day');
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 943bcd48eb6..8fa72fdacd9 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -637,6 +637,9 @@ textarea.centpercent {
.nobold {
font-weight: normal !important;
}
+.uppercase {
+ text-transform: uppercase;
+}
.nounderline {
text-decoration: none;
}
@@ -1427,7 +1430,8 @@ td.showDragHandle {
.side-nav {
- display: table-cell;
+ display: block;
+ float: left;
border-: 1px solid #E0E0E0;
box-shadow: 3px 0 6px -2px #eee;
background: var(--colorbackvmenu1);
@@ -4482,6 +4486,7 @@ table.cal_month td { padding-left: 1px !important; padding-right: 1px !important
.cal_today_peruser_impair { background: #F8F8F0; }
.peruser_busy { }
.peruser_notbusy { opacity: 0.5; }
+div.event { margin: 8px; border-radius: 4px; box-shadow: 2px 2px 5px rgba(100, 100, 100, 0.2); }
table.cal_event { border: none; border-collapse: collapse; margin-bottom: 1px; min-height: 20px; filter: saturate(0.8); border-radius: 3px; }
table.cal_event td { border: none; padding-: 2px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; }
table.cal_event td.cal_event { padding: 4px 4px !important; }
@@ -4490,10 +4495,13 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
.cal_event a:link { color: #111111; font-weight: normal !important; }
.cal_event a:visited { color: #111111; font-weight: normal !important; }
.cal_event a:active { color: #111111; font-weight: normal !important; }
-.cal_event_busy a:hover { color: #111111; font-weight: normal !important; color:rgba(255,255,255,.75); }
+.cal_event_notbusy a.cal_event_title:hover { color: #111111; font-weight: normal !important; color:rgba(255,255,255,.75); }
.cal_event_busy { }
.cal_peruserviewname { max-width: 140px; height: 22px; }
table.cal_month tr td table.nobordernopadding tr td { padding: 0 2px 0 2px; }
+a.dayevent-aday {
+ padding-left: 8px;
+}
.calendarviewcontainertr { height: 100px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 48f0c70375e..9b119eb0a35 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4341,6 +4341,7 @@ table.cal_month td:last-child { border-right: 0px; }
.cal_today_peruser_impair { background: #F8F8F0; }
.peruser_busy { background: #CC8888; }
.peruser_notbusy { background: #EEDDDD; opacity: 0.5; }
+div.event { margin: 8px; border-radius: 4px; box-shadow: 2px 2px 5px rgba(100, 100, 100, 0.2); }
table.cal_event { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 3px; border-radius: 3px; min-height: 20px; }
table.cal_event td { border: none; padding-: 2px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; }
table.cal_event td.cal_event { padding: 4px 4px !important; }
|