';
- print '';
+ print '';
+ print '';
if ($event->type_code == 'BIRTHDAY') // It's a birthday
{
print $event->getNomUrl(1,$maxnbofchar,'cal_event','birthday','contact');
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 18aab7bdc1a..494a5339f96 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -210,7 +210,7 @@ if ($resql)
$head = calendars_prepare_head('');
dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
- print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,-1);
+ print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,-1,'',0);
dol_fiche_end();
// Add link to show birthdays
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 7df4543b12d..8eddf330c0f 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -41,9 +41,10 @@
* @param int $socid Third party id
* @param array $showextcals Array with list of external calendars (used to show links to select calendar), or -1 to show no legend
* @param string $actioncode Preselected value of actioncode for filter on type
+ * @param int $showbirthday Show check to toggle birthday events
* @return void
*/
-function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $showextcals=array(), $actioncode='')
+function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $showextcals=array(), $actioncode='', $showbirthday=0)
{
global $conf, $user, $langs, $db;
@@ -56,9 +57,13 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '';
print '';
print '';
- print '';
- print '';
+ print '';
+
+ print ' ';
+
+ //print ' ';
+ //print '';
print '';
@@ -66,12 +71,15 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
{
print '';
print '| ';
- print $langs->trans("ActionsAskedBy");
- print ' | ';
- print $form->select_dolusers($filtera, 'userasked', 1, '', ! $canedit);
- print ' '.$langs->trans("or") . ' ' . $langs->trans("ActionsToDoBy");
- print ' ';
+ //print $langs->trans("ActionsAskedBy");
+ //print ' | ';
+ //print $form->select_dolusers($filtera, 'userasked', 1, '', ! $canedit);
+ //print ' '.$langs->trans("or") . ' ';
+ print $langs->trans("ActionsForUser").' ';
+ print ' | ';
+ //print ' ';
print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit);
+ print ajax_combobox('usertodo');
print ' | ';
/*print '';
@@ -113,7 +121,10 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
}
print ' ';
- print ' | ';
+
+ //print '';
+ print '';
+
// Buttons
/*print '';
@@ -126,10 +137,22 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print img_picto($langs->trans("ViewList"), 'object_list', 'class="hideonsmartphone"') . ' ';
print ' | ';*/
+ //print '';
+ print '';
+
+ print ' ';
+
+ print ' ';
+
+ print '';
+ print '';
+
print '';
}
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 687e3cae146..f399a81d91d 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -25,6 +25,7 @@ ListOfEvents= List of Dolibarr events
ActionsAskedBy=Events reported by
ActionsToDoBy=Events assigned to
ActionsDoneBy=Events done by
+ActionsAskedBy=Events for user
AllMyActions= All my events/tasks
AllActions= All events/tasks
ViewList=List view
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 84c449f8e90..b5324b65a0b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2265,7 +2265,7 @@ li.cal_event { border: none; list-style-type: none; }
.cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
.cal_event a:active { color: #111111; font-size: 11px; font-weight: normal !important; }
.cal_event a:hover { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); }
-
+.cal_event_busy { }
/* ============================================================================== */
/* Ajax - Liste deroulante de l'autocompletion */
| | |
|