MDL-65671 calendar: remove course selector label from exporters

moodle · Jun 12, 2019 · 859bc93 · 859bc93
1 parent 4cc9d7c
commit 859bc93
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 23 deletions.
diff --git a/calendar/amd/build/view_manager.min.js b/calendar/amd/build/view_manager.min.js
diff --git a/calendar/amd/src/view_manager.js b/calendar/amd/src/view_manager.js
@@ -134,7 +134,7 @@ define([
                                 return window.history.pushState({}, '', '?view=day');
                             }).fail(Notification.exception);
                     } else if (view == 'upcoming') {
-                        reloadCurrentUpcoming(root, courseId, categoryId, 'core_calendar/calendar_upcoming')
+                        reloadCurrentUpcoming(root, courseId, categoryId, root, 'core_calendar/calendar_upcoming')
                             .then(function() {
                                 return window.history.pushState({}, '', '?view=upcoming');
                             }).fail(Notification.exception);
@@ -353,13 +353,15 @@ define([
          * @param {Number} courseId The course id.
          * @param {Number} categoryId The id of the category whose events are shown
          * @param {String} template The template to be rendered.
+         * @param {object} target The element being replaced. If not specified, the calendarwrapper is used.
          * @return {promise}
          */
-        var reloadCurrentUpcoming = function(root, courseId, categoryId, template) {
+        var reloadCurrentUpcoming = function(root, courseId, categoryId, target, template) {
             startLoading(root);
 
-            var target = root.find(CalendarSelectors.wrapper);
+            target = target || root.find(CalendarSelectors.wrapper);
             template = template || root.attr('data-template');
+
             if (typeof courseId === 'undefined') {
                 courseId = root.find(CalendarSelectors.wrapper).data('courseid');
             }

diff --git a/calendar/classes/external/calendar_day_exporter.php b/calendar/classes/external/calendar_day_exporter.php
@@ -240,8 +240,7 @@ protected function get_default_add_context() {
      * @return string The html code for the course filter selector.
      */
     protected function get_course_filter_selector(renderer_base $output) {
-        $langstr = get_string('dayviewfor', 'calendar');
-        return $output->course_filter_selector($this->url, $langstr, $this->calendar->course->id);
+        return $output->course_filter_selector($this->url, '', $this->calendar->course->id);
     }
 
     /**

diff --git a/calendar/classes/external/calendar_upcoming_exporter.php b/calendar/classes/external/calendar_upcoming_exporter.php
@@ -170,8 +170,7 @@ protected function get_default_add_context() {
      * @return string The html code for the course filter selector.
      */
     protected function get_course_filter_selector(renderer_base $output) {
-        $langstr = get_string('upcomingeventsfor', 'calendar');
-        return $output->course_filter_selector($this->url, $langstr, $this->calendar->course->id);
+        return $output->course_filter_selector($this->url, '', $this->calendar->course->id);
     }
 
     /**

diff --git a/calendar/classes/external/month_exporter.php b/calendar/classes/external/month_exporter.php
@@ -252,8 +252,7 @@ protected function get_other_values(renderer_base $output) {
      */
     protected function get_course_filter_selector(renderer_base $output) {
         $content = '';
-        $content .= $output->course_filter_selector($this->url, get_string('detailedmonthviewfor', 'calendar'),
-            $this->calendar->course->id);
+        $content .= $output->course_filter_selector($this->url, '', $this->calendar->course->id);
 
         return $content;
     }

diff --git a/calendar/templates/calendar_day.mustache b/calendar/templates/calendar_day.mustache
@@ -32,9 +32,7 @@
     }
 }}
 <div id="calendar-day-{{uniqid}}" data-template="core_calendar/day_detailed">
-    <div class="mb-5">
-        {{> core_calendar/view_selector}}
-    </div>
+    {{> core_calendar/header}}
     {{> core_calendar/day_detailed}}
 </div>
 {{#js}}

diff --git a/calendar/templates/calendar_month.mustache b/calendar/templates/calendar_month.mustache
@@ -32,10 +32,7 @@
     }
 }}
 <div id="calendar-month-{{uniqid}}" data-template="core_calendar/month_detailed">
-    <div class="mb-5">
-        {{> core_calendar/view_selector}}
-    </div>
-
+    {{> core_calendar/header}}
     {{> core_calendar/month_detailed}}
 </div>
 {{#js}}

diff --git a/calendar/templates/calendar_upcoming.mustache b/calendar/templates/calendar_upcoming.mustache
@@ -32,7 +32,7 @@
     }
 }}
 <div id="calendar-upcoming-{{uniqid}}" data-template="core_calendar/upcoming_detailed">
-
+    {{> core_calendar/header}}
     {{> core_calendar/upcoming_detailed}}
 </div>
 {{#js}}

diff --git a/calendar/templates/day_detailed.mustache b/calendar/templates/day_detailed.mustache
@@ -43,7 +43,6 @@
     }} data-region="day"{{!
     }} data-new-event-timestamp="{{neweventtimestamp}}"{{!
 }}>
-    {{> core_calendar/header}}
     {{> core_calendar/day_navigation }}
     {{> core/overlay_loading}}
     {{> core_calendar/event_list }}

diff --git a/calendar/templates/header.mustache b/calendar/templates/header.mustache
@@ -31,9 +31,10 @@
     {
     }
 }}
-<div class="header">
+<div class="header d-flex flex-wrap mb-5">
+    {{> core_calendar/view_selector}}
     {{#filter_selector}}
         {{{filter_selector}}}
     {{/filter_selector}}
     {{> core_calendar/add_event_button}}
-</div>
+</div>
diff --git a/calendar/templates/month_detailed.mustache b/calendar/templates/month_detailed.mustache
@@ -40,7 +40,6 @@
     }} data-year="{{date.year}}"{{!
     }} data-view="month"{{!
     }}>
-    {{> core_calendar/header }}
     {{> core_calendar/month_navigation }}
     {{> core/overlay_loading}}
     <table id="month-detailed-{{uniqid}}" class="calendarmonth calendartable mb-0">

diff --git a/calendar/templates/upcoming_detailed.mustache b/calendar/templates/upcoming_detailed.mustache
@@ -32,7 +32,6 @@
     }
 }}
 <div class="calendarwrapper" data-view="upcoming" data-context-id="{{defaulteventcontext}}" data-courseid="{{courseid}}">
-    {{> core_calendar/header}}
     {{> core/overlay_loading}}
         <h2 class="current">{{#str}}upcomingevents, core_calendar{{/str}}</h2>
     {{> core_calendar/event_list }}