chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r20930] Fixed line to separated events FS#4232

Browse Source
skala
Arthur Portugal 17 years ago
parent 1b57bd064a
commit 82ae63eaed
2 changed files with 10 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      main/calendar/agenda.inc.php
  2. 4
      main/calendar/myagenda.inc.php

13
main/calendar/agenda.inc.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: agenda.inc.php 20920 2009-05-20 20:40:12Z aportugal $ <?php //$Id: agenda.inc.php 20930 2009-05-21 16:42:15Z aportugal $
/* For licensing terms, see /dokeos_license.txt */ /* For licensing terms, see /dokeos_license.txt */
/* /*
============================================================================== ==============================================================================
@ -419,20 +419,22 @@ function display_monthcalendar($month, $year)
$dayheader = "$curday"; $dayheader = "$curday";
if (key_exists($curday,$data)) { if (key_exists($curday,$data)) {
//$dayheader="<a href='".api_get_self()."?".api_get_cidreq()."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>"; //$dayheader="<a href='".api_get_self()."?".api_get_cidreq()."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>";
foreach ($data[$curday] as $key=>$agenda_item) foreach ($data[$curday] as $key=>$agenda_item)
{ {
//var_dump($agenda_item);
foreach ($agenda_item as $key=>$value) { foreach ($agenda_item as $key=>$value) {
$month_start_date = (int)substr($value['start_date'],5,2); $month_start_date = (int)substr($value['start_date'],5,2);
if ($month == $month_start_date) { if ($month == $month_start_date) {
$start_time= date("H:i",strtotime($value['start_date'])); $start_time= date("H:i",strtotime($value['start_date']));
$end_time= date("H:i",strtotime($value['end_date'])); $end_time= date("H:i",strtotime($value['end_date']));
$dayheader="<a href='".api_get_self()."?".api_get_cidreq()."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>"; $dayheader="<a href='".api_get_self()."?".api_get_cidreq()."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>";
$dayheader .= '<br /><i>'.$start_time.'</i>&nbsp;-&nbsp;<i>'.$end_time.'</i>'; $dayheader .= '<br />'.get_lang("StartTimeWindow").'&nbsp;<i>'.$start_time.'</i>&nbsp;-&nbsp;'.get_lang("EndTimeWindow").'&nbsp;<i>'.$end_time.'&nbsp;</i>';
$dayheader .= ' - '; $dayheader .= '<br />';
$dayheader .= $value['title']; $dayheader .= $value['title'];
$dayheader .= '<hr style="margin-top:3px;border-top:0; height:0; border-bottom:1px dotted #999999;" />';
} }
//$agendaitems = get_global_agenda_items($agendaitems, $curday, $month, $year, $startdayofweek, "month_view"); //$agendaitems = get_global_agenda_items($agendaitems, $curday, $month, $year, $startdayofweek, "month_view");
//echo $agendaitems['title']; //echo $agendaitems['title'];
@ -3352,7 +3354,6 @@ function display_weekcalendar($agendaitems, $month, $year, $weekdaynames, $month
{ {
$class = "class=\"days_today\""; $class = "class=\"days_today\"";
} }
echo "\t<td ".$class.">"; echo "\t<td ".$class.">";
echo "<span class=\"agendaitem\">".$agendaitems[date('j', $value)]."&nbsp;</span> "; echo "<span class=\"agendaitem\">".$agendaitems[date('j', $value)]."&nbsp;</span> ";
echo "</td>\n"; echo "</td>\n";

4
main/calendar/myagenda.inc.php
Unescape View File

@ -135,7 +135,9 @@ function get_myagendaitems($courses_dbs, $month, $year)
{ {
$items[$agendaday][$item['start_date']] = ''; $items[$agendaday][$item['start_date']] = '';
} }
$items[$agendaday][$item['start_date']] .= "<i>".$time."</i>&nbsp;-&nbsp;<i>".$end_time."</i>&nbsp;<a href=\"$URL\" title=\"".Security::remove_XSS($array_course_info['title'])."\">".$agenda_link."</a> ".Security::remove_XSS($item['title'])."<br />"; $items[$agendaday][$item['start_date']] .= "".get_lang('StartTimeWindow')."&nbsp;<i>".$time."</i>"."&nbsp;-&nbsp;".get_lang("EndTimeWindow")."&nbsp;<i>".$end_time."</i>&nbsp;";
$items[$agendaday][$item['start_date']] .= '<br />'."<a href=\"$URL\" title=\"".Security::remove_XSS($array_course_info['title'])."\">".$agenda_link."</a> ".Security::remove_XSS($item['title'])."<br /> ";
$items[$agendaday][$item['start_date']] .= '<hr style="margin-top:3px;border-top:0; height:0; border-bottom:1px dotted #999999;" />';
} }
} }

Write Preview
Loading…
Cancel
Save