From 2281a835c9886af92e3517a024824b6592fc3c7b Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 5 Sep 2017 15:14:54 +0800 Subject: [PATCH] MDL-59392 calendar: Move template to parent Node --- calendar/amd/build/view_manager.min.js | Bin 1357 -> 1350 bytes calendar/amd/src/view_manager.js | 2 +- calendar/lib.php | 2 +- calendar/templates/calendar_month.mustache | 41 +++++++++++++++++++++ calendar/view.php | 1 - 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 calendar/templates/calendar_month.mustache diff --git a/calendar/amd/build/view_manager.min.js b/calendar/amd/build/view_manager.min.js index 1d8bdff35b2828261ab4397a8a575d54de3eba41..62a980bc34e9d86854ba6f374d3477d8acfbcc5a 100644 GIT binary patch delta 57 zcmX@hb&P96D3eaIW_3|&Noi4@LXuulYFfuo1a&b5ucJ; Sl9-v3nxdqWxVe$(C=&n&3m4x2 diff --git a/calendar/amd/src/view_manager.js b/calendar/amd/src/view_manager.js index f1468613d75..58f9ac788ff 100644 --- a/calendar/amd/src/view_manager.js +++ b/calendar/amd/src/view_manager.js @@ -60,7 +60,7 @@ define(['jquery', 'core/templates', 'core/notification', 'core_calendar/reposito return CalendarRepository.getCalendarMonthData(time, courseid) .then(function(context) { - return Templates.render('core_calendar/month_detailed', context); + return Templates.render(root.attr('data-template'), context); }) .then(function(html, js) { return Templates.replaceNode(root.find(SELECTORS.CALENDAR_MONTH_WRAPPER), html, js); diff --git a/calendar/lib.php b/calendar/lib.php index f574472f314..8df62f0b91d 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -3518,7 +3518,7 @@ function calendar_get_view(\calendar_information $calendar, $view) { $month = new \core_calendar\external\month_exporter($calendar, $type, $related); $data = $month->export($renderer); - $template = 'core_calendar/month_detailed'; + $template = 'core_calendar/calendar_month'; return [$data, $template]; } diff --git a/calendar/templates/calendar_month.mustache b/calendar/templates/calendar_month.mustache new file mode 100644 index 00000000000..9e5866b68be --- /dev/null +++ b/calendar/templates/calendar_month.mustache @@ -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 . +}} +{{! + @template calendar/calendar_month + + Calendar month view for blcoks. + + The purpose of this template is to render the main, detailed monthly view. + + Classes required for JS: + * none + + Data attributes required for JS: + * none + + Example context (json): + { + } +}} +
+ {{> core_calendar/month_detailed}} +
+{{#js}} +require(['jquery', 'core_calendar/calendar'], function($, Calendar) { + Calendar.init($("#calendar-month-{{uniqid}}")); +}); +{{/js}} diff --git a/calendar/view.php b/calendar/view.php index ba0bc947c6d..6447c8d906a 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -161,5 +161,4 @@ echo html_writer::end_tag('div'); list($data, $template) = calendar_get_footer_options($calendar); echo $renderer->render_from_template($template, $data); -$PAGE->requires->js_call_amd('core_calendar/calendar', 'init'); echo $OUTPUT->footer(); -- 2.43.0