Merge branch 'MDL-77891-master' of https://github.com/snake/moodle

moodle · Sep 27, 2023 · e02ea67 · e02ea67
2 parents 3c7b5c9 + 3866803
commit e02ea67
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/calendar/templates/event_icon.mustache b/calendar/templates/event_icon.mustache
@@ -34,7 +34,17 @@
     }
 }}
 {{#modulename}}
-    {{#pix}} monologo, {{modulename}} {{/pix}}
+    {{#icon}}
+        {{#iconurl}}
+           <img alt="{{alttext}}" title="{{alttext}}" src="{{{ iconurl }}}" class="icon {{iconclass}}">
+        {{/iconurl}}
+        {{^iconurl}}
+            {{#pix}} monologo, {{modulename}} {{/pix}}
+        {{/iconurl}}
+    {{/icon}}
+    {{^icon}}
+       {{#pix}} monologo, {{modulename}} {{/pix}}
+    {{/icon}}
 {{/modulename}}
 {{^modulename}}
     {{#icon}}{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}{{/icon}}

diff --git a/calendar/templates/event_item.mustache b/calendar/templates/event_item.mustache
@@ -75,7 +75,16 @@
                     {{/isactionevent}}
                 {{/canedit}}
             </div>
-            {{#icon}}<div class="d-inline-block mt-1 align-top">{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}</div>{{/icon}}
+            {{#icon}}
+                <div class="d-inline-block mt-1 align-top">
+                    {{#iconurl}}
+                        <img alt="{{alttext}}" title="{{alttext}}" src="{{{iconurl}}}" class="icon {{iconclass}}">
+                    {{/iconurl}}
+                    {{^iconurl}}
+                        {{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}
+                    {{/iconurl}}
+                </div>
+            {{/icon}}
             <div class="d-inline-block">
                 <h3 class="name d-inline-block">{{{name}}}</h3>
             </div>