From ad6ec9e2bb2dd4135faca26cd44a75366dd879bf Mon Sep 17 00:00:00 2001 From: Carlos Vargas Date: Tue, 24 Nov 2009 13:14:25 -0500 Subject: [PATCH] Add a link to the task when added to the agenda. #5612 --- main/calendar/agenda.inc.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php index f1a4647e98..8dc448395c 100644 --- a/main/calendar/agenda.inc.php +++ b/main/calendar/agenda.inc.php @@ -428,10 +428,17 @@ function display_monthcalendar($month, $year) if ($month == $month_start_date) { $start_time= date("H:i",strtotime($value['start_date'])); $end_time= date("H:i",strtotime($value['end_date'])); - $dayheader .= '
'.get_lang("StartTimeWindow").' '.$start_time.' - '.get_lang("EndTimeWindow").' '.$end_time.' '; - $dayheader .= '
'; - $dayheader .= $value['title']; - $dayheader .= '
'; + + if ($value['end_date']=='0000-00-00 00:00:00'){ + $dayheader .= '
'.get_lang("Work").'
'; + $dayheader .= $value['title']; + $dayheader .= '
'; + } else { + $dayheader .= '
'.get_lang("StartTimeWindow").' '.$start_time.' - '.get_lang("EndTimeWindow").' '.$end_time.' '; + $dayheader .= '
'; + $dayheader .= $value['title']; + $dayheader .= '
'; + } } //$agendaitems = get_global_agenda_items($agendaitems, $curday, $month, $year, $startdayofweek, "month_view"); //echo $agendaitems['title']; @@ -2119,12 +2126,11 @@ function display_agenda_items() echo api_ucfirst(strftime($timeNoSecFormat,strtotime($myrow["start_date"]))).""; echo "\n"; echo "\t\t"; - if ($myrow["end_date"]<>"0000-00-00 00:00:00") - { + if ($myrow["end_date"]<>"0000-00-00 00:00:00") { echo get_lang("EndTimeWindow").": "; echo api_ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["end_date"])))."   "; echo api_ucfirst(strftime($timeNoSecFormat,strtotime($myrow["end_date"]))).""; - } + } echo "\n"; // attachment list