From 42c59cc62260c457c32dd3d55f452963ef0b7859 Mon Sep 17 00:00:00 2001
From: Jake Dallimore <jake@moodle.com>
Date: Tue, 25 Jul 2023 16:51:03 +0800
Subject: [PATCH] MDL-77891 core_calendar: support display of mod iconurl

This affects:
- event_item.mustache (day view)
- event_icon.mustache (used by month_mini and month_mini and
month_detailed templates)
---
 calendar/templates/event_icon.mustache | 12 +++++++++++-
 calendar/templates/event_item.mustache | 11 ++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/calendar/templates/event_icon.mustache b/calendar/templates/event_icon.mustache
index c43b7c4ecbf36..69a9ff1aa7d2a 100644
--- 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
index 2ac7c811f4e0f..abb2054e36c5d 100644
--- 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>