mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 08:22:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-60558 calendar: Upcoming block should use the right template

Browse Source
This commit is contained in:
Andrew Nicols 2017-10-26 10:13:57 +08:00
parent a0a78199b8
commit e3491a093a
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blocks/calendar_upcoming/block_calendar_upcoming.php
View File

@ -78,5 +78,3 @@ class block_calendar_upcoming extends block_base {
return $this->content;
}
}

2
calendar/lib.php
View File

@ -3220,7 +3220,7 @@ function calendar_get_view(\calendar_information $calendar, $view, $includenavig
if ($view == "upcoming") {
$template = 'core_calendar/calendar_upcoming';
} else if ($view == "upcoming_mini") {
$template = 'core_calendar/upcoming_mini';
$template = 'core_calendar/calendar_upcoming_mini';
}
}

41
calendar/templates/calendar_upcoming_mini.mustache Normal file
View File

@ -0,0 +1,41 @@
{{!
This file is part of Moodle - http://moodle.org/
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
@template core_calendar/calendar_upcoming_block
Calendar upcoming view.
The purpose of this template is to render the calendar upcoming view.
Classes required for JS:
* none
Data attributes required for JS:
* none
Example context (json):
{
}
}}
<div id="calendar-upcoming-block-{{uniqid}}" data-template="core_calendar/upcoming_mini">
{{> core_calendar/upcoming_mini}}
</div>
{{#js}}
require(['jquery', 'core_calendar/calendar_view'], function($, CalendarView) {
CalendarView.init($("#calendar-upcoming-block-{{uniqid}}"), 'upcoming');
});
{{/js}}