Make it possible to set logo in wagtail admin.

opentech/public/utils/migrations/0003_add_site_logo_setting.py

+# Generated by Django 2.1.11 on 2019-10-03 12:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('images', '0003_customimage_drupal_id'),
+        ('utils', '0002_add_footer_content_setting'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='systemmessagessettings',
+            name='site_logo_default',
+            field=models.ForeignKey(blank=True, help_text='Default site logo', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+        migrations.AddField(
+            model_name='systemmessagessettings',
+            name='site_logo_mobile',
+            field=models.ForeignKey(blank=True, help_text='Mobil site logo (if not set default will be used)', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+    ]

opentech/public/utils/models.py

@@ -228,6 +228,24 @@ class SystemMessagesSettings(BaseSetting):
     class Meta:
         verbose_name = 'system settings'
 
+    site_logo_default = models.ForeignKey(
+        'images.CustomImage',
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name='+',
+        help_text='Default site logo',
+    )
+
+    site_logo_mobile = models.ForeignKey(
+        'images.CustomImage',
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name='+',
+        help_text='Mobil site logo (if not set default will be used)',
+    )
+
     footer_content = models.TextField(
         "Footer content",
         default='<p>Configure this text in Wagtail admin -> Settings -> System settings.</p>',
@@ -245,6 +263,10 @@ class SystemMessagesSettings(BaseSetting):
     )
 
     panels = [
+        MultiFieldPanel([
+            FieldPanel('site_logo_default'),
+            FieldPanel('site_logo_mobile'),
+        ], 'Site logo'),
         FieldPanel('footer_content'),
         MultiFieldPanel([
             FieldPanel('title_404'),

opentech/templates/base.html

@@ -83,9 +83,20 @@
 
                 <div class="header__inner wrapper wrapper--large">
                     <a href="{% slugurl 'home' %}" aria-label="Home link">
+                    {% if settings.utils.SystemMessagesSettings.site_logo_default %}
+                        {% image settings.utils.SystemMessagesSettings.site_logo_default width-215 as logo_default %}
+                        <img class="header__logo header__logo--desktop" src="{{ logo_default.url }}">
+                        {% if settings.utils.SystemMessagesSettings.site_logo_mobile %}
+                            {% image settings.utils.SystemMessagesSettings.site_logo_mobile width-60 as logo_mobile %}
+                            <img class="header__logo header__logo--mobile" src="{{ logo_mobile.url }}">
+                        {% else %}
+                            <img class="header__logo header__logo--mobile" src="{{ logo_default.url }}">
+                        {% endif %}
+                    {% else %}
                         <svg class="header__logo header__logo--desktop header__logo--desktop-light"><use xlink:href="#logo-desktop"></use></svg>
                         <svg class="header__logo header__logo--desktop header__logo--desktop-dark"><use xlink:href="#logo-desktop--dark"></use></svg>
                         <svg class="header__logo header__logo--mobile"><use xlink:href="#logo-mobile"></use></svg>
+                    {% endif %}
                     </a>
 
                     <div class="header__inner header__inner--mobile-buttons">
@@ -112,7 +123,12 @@
                     <section class="header__menus header__menus--mobile">
                         <div class="header__inner header__inner--menu-open">
                             <a href="{% slugurl 'home' %}" aria-label="Home link">
+                            {% if settings.utils.SystemMessagesSettings.site_logo_mobile %}
+                                {% image settings.utils.SystemMessagesSettings.site_logo_mobile width-60 as logo_mobile %}
+                                <img class="header__logo header__logo--mobile" src="{{ logo_mobile.url }}">
+                            {% else %}
                                 <svg class="header__logo header__logo--mobile"><use xlink:href="#logo-mobile"></use></svg>
+                            {% endif %}
                             </a>
                             <div class="header__inner header__inner--mobile-buttons">
                                 <button class="button js-mobile-search-toggle" aria-haspopup="true" aria-label="Toggle mobile search">