Merge branch '252-update-django-favicon-plus' into 'master'

Favicon improvements

Closes #252

See merge request AlekSIS!251

aleksis/core/apps.py

@@ -2,6 +2,7 @@ from typing import Any, List, Optional, Tuple
 
 import django.apps
 from django.http import HttpRequest
+from django.core.files.uploadedfile import TemporaryUploadedFile
 
 from dynamic_preferences.registries import preference_models
 
@@ -59,10 +60,15 @@ class CoreConfig(AppConfig):
             elif name in ("favicon", "pwa_icon"):
                 from favicon.models import Favicon  # noqa
 
-                Favicon.on_site.update_or_create(
-                    title=name,
-                    defaults={"isFavicon": name == "favicon", "faviconImage": new_value,},
-                )
+                is_favicon = name == "favicon"
+
+                if new_value:
+                    Favicon.on_site.update_or_create(
+                        title=name,
+                        defaults={"isFavicon": name == "favicon", "faviconImage": new_value, },
+                    )
+                else:
+                    Favicon.on_site.filter(title=name, isFavicon=is_favicon).delete()
 
     def post_migrate(
         self,

aleksis/core/templates/core/base.html

@@ -63,8 +63,9 @@
   <!-- Main nav (sidenav) -->
   <ul id="slide-out" class="sidenav sidenav-fixed">
     <li class="logo">
+      {% static "img/aleksis-banner.svg" as aleksis_banner %}
       <a id="logo-container" href="/" class="brand-logo">
-        <img src="{{ request.site.preferences.theme__logo.url }}"
+        <img src="{% firstof request.site.preferences.theme__logo.url aleksis_banner %}"
              alt="{{ request.site.preferences.general__title }} – Logo">
       </a>
     </li>