Commit f18fb611 authored by Damyon Wiese's avatar Damyon Wiese
Browse files

Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle

parents 7b030921 43caf021
......@@ -65,11 +65,7 @@ class block_calendar_upcoming extends block_base {
list($data, $template) = calendar_get_view($calendar, 'upcoming_mini');
if (empty($data->events)) {
$this->content->text = '<div class="post">'. get_string('noupcomingevents', 'calendar').'</div>';
} else {
$this->content->text .= $renderer->render_from_template($template, $data);
}
$this->content->text .= $renderer->render_from_template($template, $data);
$this->content->footer = '<div class="gotocal">
<a href="'.$CFG->wwwroot.'/calendar/view.php?view=upcoming&amp;course='.$courseid.'">'.
......
......@@ -55,6 +55,9 @@
<hr>
</div>
{{/events}}
{{^events}}
{{#str}}noupcomingevents, calendar{{/str}}
{{/events}}
</div>
{{#js}}
require([
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment