';
- print '| ';
+ print ' | ';
+ print '';
$daterange = '';
if ($event->type_code == 'BIRTHDAY') {
// It's birthday calendar
- $picb = '';
+ $picb = '';
//$pice = '';
//$typea = ($objp->typea == 'birth') ? $picb : $pice;
//var_dump($event);
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index f2d20b84ee6..e0ffc594557 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -402,9 +402,9 @@ $paramnoactionodate = $param;
// List of mass actions available
$arrayofmassactions = array(
- 'set_all_events_to_todo' => $langs->trans("SetAllEventsToTodo"),
- 'set_all_events_to_in_progress' => $langs->trans("SetAllEventsToInProgress"),
- 'set_all_events_to_finished' => $langs->trans("SetAllEventsToFinished"),
+ 'set_all_events_to_todo' => img_picto('', 'circle', 'class="pictofixedwidth font-status1"').$langs->trans("SetAllEventsToTodo"),
+ 'set_all_events_to_in_progress' => img_picto('', 'stop-circle', 'class="pictofixedwidth font-status2"').$langs->trans("SetAllEventsToInProgress"),
+ 'set_all_events_to_finished' => img_picto('', 'stop-circle', 'class="pictofixedwidth badge-status5"').$langs->trans("SetAllEventsToFinished"),
);
if ($user->hasRight('agenda', 'allactions', 'delete')) {
$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 3daeca53c6e..8aff9c066ae 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -510,6 +510,9 @@ print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param,
$link = '';
//print load_fiche_titre('', $link.' '.$nav.' '.$newcardbutton, '');
+
+$s .= "\n".''."\n";
+
// Local calendar
$newtitle = ' ';
$newtitle .= ' '.$langs->trans("LocalAgenda").' ';
@@ -518,6 +521,17 @@ $newtitle .= ' ';
$s = $newtitle;
+// Calendars from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
+if (empty($reshook)) {
+ $s .= $hookmanager->resPrint;
+} elseif ($reshook > 1) {
+ $s = $hookmanager->resPrint;
+}
+
+$s .= "\n".''."\n";
+
print $s;
print '';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 6bf38b3375b..5810cbd3d2c 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -103,7 +103,7 @@ function print_actions_filter(
// Assigned to user
print ' ';
print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="pictofixedwidth inline-block"');
- print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'minwidth150 maxwidth250 widthcentpercentminusx');
+ print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'minwidth100 maxwidth250 widthcentpercentminusx');
print ' ';
// Assigned to user group
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 73d280c56ad..fb1fb168f81 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4866,7 +4866,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'birthday-cake', 'bom', 'bookcal', 'bookmark', 'briefcase-medical', 'bug', 'building',
'card', 'calendarlist', 'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
'cash-register', 'category', 'chart', 'check', 'clock', 'clone', 'close_title', 'code', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cross', 'cubes',
- 'check-circle', 'check-square', 'currency', 'multicurrency',
+ 'check-circle', 'check-square', 'circle', 'stop-circle', 'currency', 'multicurrency',
'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
'chevron-double-left', 'chevron-double-right', 'chevron-double-down', 'chevron-double-top',
'commercial', 'companies',
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index b8138bacd63..2d5783d3ecf 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -221,10 +221,10 @@ _createStatusBadgeCss('4b', '', "STATUS4b");
/**
* Create status badge
*
- * @param string $statusName name of status
- * @param string $statusVarNamePrefix a prefix for var ${$statusVarNamePrefix.'badgeStatus'.$statusName}
- * @param string $commentLabel a comment label
- * @param string $cssPrefix a css prefix
+ * @param string $statusName name of status
+ * @param string $statusVarNamePrefix a prefix for var ${$statusVarNamePrefix.'badgeStatus'.$statusName}
+ * @param string $commentLabel a comment label
+ * @param string $cssPrefix a css prefix
* @return void
*/
function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentLabel = '', $cssPrefix = '')
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 82d2852ea23..fa2695e4ced 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5682,7 +5682,7 @@ table.cal_month td { padding-left: 1px !important; padding-right: 1px !important
.cal_other_month_peruserleft { border-top: 0; border-left: solid 2px #6C7C7B !important; border-right: 0; }
.cal_current_month_right { border-right: solid 1px #E0E0E0; }
.cal_other_month_right { border-right: solid 1px #C0C0C0; }
-.cal_other_month { /* opacity: 0.6; */ background: #EAEAEA; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_other_month { /* opacity: 0.6; */ background: #FAFAFA; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past_month { /* opacity: 0.6; */ background: #EEEEEE; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px !important; }
.cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
@@ -5716,13 +5716,16 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
table.cal_month tr td table.nobordernopadding tr td { padding: 0 2px 0 2px; }
table.cal_month tr.liste_titre td.tdfordaytitle { min-width: 120px; }
a.dayevent-aday {
- padding-left: 8px;
+ margin-left: 8px;
+}
+td.small.cal_event {
+ font-size: 0.9em;
}
.calendarviewcontainertr { height: 100px; }
td.cal_other_month {
- opacity: 0.8;
+ opacity: 0.7;
}
td.event-past span {
@@ -5870,9 +5873,37 @@ td.event-past span {
/* CSS for color picker */
/* ============================================================================== */
+div.jPicker table.jPicker {
+ padding-bottom: 20px;
+ padding-right: 20px;
+ padding-left: 20px;
+}
+.jPicker .Move {
+ background: unset !important;
+ border: unset !important;
+}
+.jPicker .Preview div span {
+ border: unset !important;
+ width: unset !important;
+ height: 50% !important;
+}
table.jPicker {
border-radius: 5px;
border: 1px solid #bbb !important;
+ background-color: #f4f4f4 !important;
+ box-shadow: 0px 0px 10px #ccc;
+}
+.jPicker .Grid {
+ background-image: unset !important;
+}
+.jPicker .Grid span.QuickColor {
+ border: unset !important;
+}
+.jPicker td.Radio {
+ min-width: 34px;
+}
+.jPicker td.Text {
+ white-space: nowrap;
}
A.color, A.color:active, A.color:visited {
position : relative;
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 2b5a3ab6677..135ebeac4c6 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -60,8 +60,8 @@ $colorbacklineimpair1 = '255,255,255'; // line impair
$colorbacklineimpair2 = '255,255,255'; // line impair
$colorbacklinepair1 = '252,252,252'; // line pair
$colorbacklinepair2 = '252,252,252'; // line pair
-$colorbacklinepairhover = '230,237,244'; // line hover
-$colorbacklinepairchecked = '230,237,244'; // line checked
+$colorbacklinepairhover = '240,242,249'; // line hover
+$colorbacklinepairchecked = '240,242,249'; // line checked
$colorbacklinebreak = '248,247,244'; // line break
$colortexttitlenotab = '35,135,140'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
$colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d7e143cdee1..8cdc08d72eb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -5697,7 +5697,7 @@ table.cal_month td:last-child { border-right: 0px; }
.cal_other_month_peruserleft { border-top: 0; border-left: solid 2px #6C7C7B !important; border-right: 0; }
.cal_current_month_right { border-right: solid 1px #E0E0E0; }
.cal_other_month_right { border-right: solid 1px #C0C0C0; }
-.cal_other_month { /* opacity: 0.6; */ background: #EAEAEA; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_other_month { /* opacity: 0.6; */ background: #FAFAFA; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past_month { /* opacity: 0.6; */ background: #EEEEEE; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
@@ -5710,7 +5710,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); }
+div.event { margin-top: 4px; margin-bottom: 4px; margin-left: 2px; margin-right: 2px; 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; padding-bottom: 2px !important; padding-top: 2px !important; }
@@ -5722,6 +5722,12 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
.cal_event_busy a:hover { color: #111111; font-weight: normal !important; color:rgba(255,255,255,.75); }
.cal_event_busy { }
.cal_peruserviewname { max-width: 140px; height: 22px; }
+a.dayevent-aday {
+ margin-left: 8px;
+}
+td.small.cal_event {
+ font-size: 0.9em;
+}
.calendarviewcontainertr { height: 100px; }
@@ -5730,7 +5736,7 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
}
td.cal_other_month {
- opacity: 0.8;
+ opacity: 0.7;
}
.cal_available { background: #0060d450; }
@@ -5877,10 +5883,39 @@ td.gtaskname {
/* CSS for color picker */
/* ============================================================================== */
+div.jPicker table.jPicker {
+ padding-bottom: 20px;
+ padding-right: 20px;
+ padding-left: 20px;
+}
+.jPicker .Move {
+ background: unset !important;
+ border: unset !important;
+}
+.jPicker .Preview div span {
+ border: unset !important;
+ width: unset !important;
+ height: 50% !important;
+}
table.jPicker {
border-radius: 5px;
border: 1px solid #bbb !important;
+ background-color: #f4f4f4 !important;
+ box-shadow: 0px 0px 10px #ccc;
}
+.jPicker .Grid {
+ background-image: unset !important;
+}
+.jPicker .Grid span.QuickColor {
+ border: unset !important;
+}
+.jPicker td.Radio {
+ min-width: 34px;
+}
+.jPicker td.Text {
+ white-space: nowrap;
+}
+
A.color, A.color:active, A.color:visited {
position : relative;
display : block;
|