Merge pull request #12760 from marcellamaki/favicon-fix

Update favicon to be available when the default theme is disabled
learningequality · Oct 28, 2024 · 9ed7697 · 9ed7697
2 parents ecbd748 + 46a8a6d
commit 9ed7697
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...heme/static/assets/default_theme/logo.ico → kolibri/core/static/assets/favicons/logo.ico b/...heme/static/assets/default_theme/logo.ico → kolibri/core/static/assets/favicons/logo.ico
diff --git a/kolibri/core/templatetags/core_tags.py b/kolibri/core/templatetags/core_tags.py
@@ -65,7 +65,9 @@ def theme_favicon():
 
     # Choose the first available .ico file. It's unlikely there's more than
     # one specified in the theme.
-    favicon_url = favicon_urls[0] if favicon_urls else static("assets/logo.ico")
+    favicon_url = (
+        favicon_urls[0] if favicon_urls else static("assets/favicons/logo.ico")
+    )
 
     return format_html('<link rel="shortcut icon" href="{}">', favicon_url)
 

diff --git a/kolibri/plugins/default_theme/kolibri_plugin.py b/kolibri/plugins/default_theme/kolibri_plugin.py
@@ -23,7 +23,7 @@ def theme(self):
             },
             "logos": [
                 {
-                    "src": static("assets/default_theme/logo.ico"),
+                    "src": static("assets/favicons/logo.ico"),
                     "content_type": "image/vnd.microsoft.icon",
                     "size": "32x32",
                 },