moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'm29_MDL-49052' of https://github.com/totara/moodle

Browse source
This commit is contained in:
Dan Poltawski 2015-02-10 09:24:42 +00:00
commit 53018f5fc4
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
calendar/renderer.php
View file

@ -176,7 +176,7 @@ class core_calendar_renderer extends plugin_renderer_base {
if (empty($events)) {
// There is nothing to display today.
$output .= $this->output->heading(get_string('daywithnoevents', 'calendar'), 3);
$output .= html_writer::span(get_string('daywithnoevents', 'calendar'), 'calendar-information calendar-no-results');
} else {
$output .= html_writer::start_tag('div', array('class' => 'eventlist'));
$underway = array();
@ -194,7 +194,8 @@ class core_calendar_renderer extends plugin_renderer_base {
// Then, show a list of all events that just span this day
if (!empty($underway)) {
$output .= $this->output->heading(get_string('spanningevents', 'calendar'), 3);
$output .= html_writer::span(get_string('spanningevents', 'calendar'),
'calendar-information calendar-span-multiple-days');
foreach ($underway as $event) {
$event->time = calendar_format_event_time($event, time(), null, false, $calendar->timestamp_today());
$output .= $this->event($event);
@ -536,7 +537,7 @@ class core_calendar_renderer extends plugin_renderer_base {
}
$output .= html_writer::end_tag('div');
} else {
$output .= $this->output->heading(get_string('noupcomingevents', 'calendar'));
$output .= html_writer::span(get_string('noupcomingevents', 'calendar'), 'calendar-information calendar-no-results');
}
return $output;

3
calendar/view.php
View file

@ -124,6 +124,7 @@ $calendar->add_sidecalendar_blocks($renderer, true, $view);
echo $OUTPUT->header();
echo $renderer->start_layout();
echo html_writer::start_tag('div', array('class'=>'heightcontainer'));
echo $OUTPUT->heading(get_string('calendar', 'calendar'));
switch($view) {
case 'day':
@ -169,4 +170,4 @@ if (!empty($CFG->enablecalendarexport)) {
echo $OUTPUT->container_end();
echo html_writer::end_tag('div');
echo $renderer->complete_layout();
echo $OUTPUT->footer();
echo $OUTPUT->footer();