MDL-77105 course_format: Add 'nofilter' class when necessary

Add the `.nofilter` class for activity icons when the icon URL's `filtericon` parameter is not set, so they get rendered as they are on the course homepage.
moodle · Mar 27, 2023 · f005111 · f005111
1 parent 1e30a80
commit f005111
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/course/format/classes/output/local/content/cm/cmname.php b/course/format/classes/output/local/content/cm/cmname.php
@@ -98,9 +98,12 @@ public function export_for_template(\renderer_base $output): array {
             return [];
         }
 
+        $iconurl = $mod->get_icon_url();
+        $iconclass = $iconurl->get_param('filtericon') ? '' : 'nofilter';
         $data = [
             'url' => $mod->url,
-            'icon' => $mod->get_icon_url(),
+            'icon' => $iconurl,
+            'iconclass' => $iconclass,
             'modname' => $mod->modname,
             'textclasses' => $displayoptions['textclasses'] ?? '',
             'purpose' => plugin_supports('mod', $mod->modname, FEATURE_MOD_PURPOSE, MOD_PURPOSE_OTHER),

diff --git a/course/format/templates/local/content/cm/cmname.mustache b/course/format/templates/local/content/cm/cmname.mustache
@@ -25,6 +25,7 @@
     {
         "url": "#",
         "icon": "../../../pix/help.svg",
+        "iconclass": "",
         "pluginname": "File",
         "textclasses": "",
         "purpose": "content",
@@ -47,7 +48,7 @@
     <div class="activity-instance d-flex flex-column">
         <div class="activitytitle media {{textclasses}} modtype_{{modname}} position-relative align-self-start">
             <div class="activityiconcontainer {{purpose}} courseicon align-self-start mr-3">
-                <img src="{{{icon}}}" class="activityicon " alt="{{{modname}}} icon">
+                <img src="{{{icon}}}" class="activityicon {{iconclass}}" alt="{{{modname}}} icon">
             </div>
             <div class="media-body align-self-center">
                 {{#pluginname}}