Merge branch 'MDL-66354-master' of http://github.com/dravek/moodle

gjb2048 · Sep 25, 2019 · ba62391 · ba62391
2 parents 84e66f0 + 21ad953
commit ba62391
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/calendar/amd/build/calendar_filter.min.js b/calendar/amd/build/calendar_filter.min.js
diff --git a/calendar/amd/build/calendar_filter.min.js.map b/calendar/amd/build/calendar_filter.min.js.map
diff --git a/calendar/amd/src/calendar_filter.js b/calendar/amd/src/calendar_filter.js
@@ -67,6 +67,9 @@ function(
         return Str.get_string('eventtype' + data.eventtype, 'calendar')
         .then(function(nameStr) {
             data.name = nameStr;
+            data.icon = true;
+            data.key = 'i/' + data.eventtype + 'event';
+            data.component = 'core';
 
             return data;
         })

diff --git a/calendar/lib.php b/calendar/lib.php
@@ -3672,6 +3672,9 @@ function calendar_get_filter_types() {
         return [
             'eventtype' => $type,
             'name' => get_string("eventtype{$type}", "calendar"),
+            'icon' => true,
+            'key' => 'i/' . $type . 'event',
+            'component' => 'core'
         ];
     }, $types);
 }

diff --git a/calendar/templates/event_icon.mustache b/calendar/templates/event_icon.mustache
@@ -37,5 +37,5 @@
     {{#pix}} icon, {{modulename}} {{/pix}}
 {{/modulename}}
 {{^modulename}}
-    {{#pix}} i/{{eventtype}}event, core {{/pix}}
+    {{#icon}}{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}{{/icon}}
 {{/modulename}}
diff --git a/calendar/templates/month_mini.mustache b/calendar/templates/month_mini.mustache
@@ -136,12 +136,7 @@
                                 {{$content}}
                                     {{#events}}
                                         <div data-popover-eventtype-{{normalisedeventtype}}="1">
-                                            {{#modulename}}
-                                                {{#pix}} icon, {{modulename}} {{/pix}}
-                                            {{/modulename}}
-                                            {{^modulename}}
-                                                {{#pix}} i/{{eventtype}}event, core {{/pix}}
-                                            {{/modulename}}
+                                            {{> core_calendar/event_icon}}
                                             {{{popupname}}}
                                         </div>
                                     {{/events}}