Update icons (#3535)

* Update icons * Add navigation logo to bims_theme
kartoza · Oct 19, 2023 · c70c589 · c70c589
1 parent 8af620f
commit c70c589
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 10 deletions.
diff --git a/bims/migrations/0363_alter_basemaplayer_key_alter_bimsdocument_authors_and_more.py b/bims/migrations/0363_alter_basemaplayer_key_alter_bimsdocument_authors_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.1.10 on 2023-10-19 02:46
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('bims', '0362_rename_abundance_type_link_biologicalcollectionrecord_abundance_type_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='basemaplayer',
+            name='key',
+            field=models.CharField(blank=True, default='', help_text='Key is required if the source of the map is Bing or Stamen', max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='notification',
+            name='name',
+            field=models.CharField(choices=[('SITE_VISIT_VALIDATION', 'Site visit is ready to be validated'), ('SITE_VALIDATION', 'Site is ready to be validated'), ('DOWNLOAD_REQUEST', 'Download request notification'), ('ACCOUNT_CREATED', 'Account created email notification'), ('SASS_CREATED', 'SASS created email notification'), ('NEW_TAXONOMY', 'New taxonomy email notification'), ('WETLAND_ISSUE_CREATED', 'New wetland issue email notification')], max_length=255, unique=True),
+        ),
+    ]
diff --git a/bims/static/css/bug_report_panel_style.css b/bims/static/css/bug_report_panel_style.css
@@ -85,7 +85,7 @@
     margin-bottom: 5px;
 }
 
-.bug-report-button:hover {
+.bug-report-button:hover, .wetland-mapping-button:hover {
     cursor: pointer;
     background-color: rgb(var(--secondary-accent-color));
     box-shadow: inset 0 0 0 99999px rgba(128,128,128,0.3) !important;
@@ -106,12 +106,6 @@
     margin-bottom: 20px;
 }
 
-.wetland-mapping-button {
-    cursor: pointer;
-    background-color: rgb(var(--secondary-accent-color));
-    box-shadow: inset 0 0 0 99999px rgba(128,128,128,0.3) !important;
-}
-
 .brp-small-text {
     font-size: 9pt;
     padding: 10px;

diff --git a/bims/static/img/FBIS icon.png b/bims/static/img/FBIS icon.png
diff --git a/bims/templates/fbis/navigation_bar.html b/bims/templates/fbis/navigation_bar.html
@@ -62,8 +62,13 @@
     <h5 class="my-0 mr-md-auto font-weight-normal">
         <a href="/">
         <a href="/">
-            <img id="fbis_logo_home" src="{% static "img/FBIS v2 Logo.png" %}"
-            width="230"/>
+            {% if custom_theme.navbar_logo %}
+                <img id="fbis_logo_home" src="{{ custom_theme.navbar_logo.url }}" style="max-height: 45px"/>
+            {% elif custom_theme.logo %}
+                <img id="fbis_logo_home" src="{{ custom_theme.logo.url }}" style="max-height: 45px"/>
+            {% else %}
+                <img id="fbis_logo_home" src="{% static "img/FBIS icon.png" %}" style="max-height: 45px"/>
+            {% endif %}
         </a>
         </a>
     </h5>

diff --git a/bims/templates/navigation_bar.html b/bims/templates/navigation_bar.html
@@ -77,7 +77,9 @@
     <div class="container">
         {% current_domain as domain_name %}
         <a class="navbar-brand bims-title-big" href="{{ domain_name }}/" style="padding-top: 0 !important; padding-bottom: 0 !important;">
-            {% if custom_theme.logo %}
+            {% if custom_theme.navbar_logo %}
+                <img src="{{ custom_theme.navbar_logo.url }}" height="35"/>
+            {% elif custom_theme.logo %}
                 <img src="{{ custom_theme.logo.url }}" height="35"/>
             {% else %}
                 {% if custom_theme.site_name %}{{ custom_theme.site_name }}{% else %}{{ APPLICATION_NAME }}{% endif %}

diff --git a/bims_theme/migrations/0010_customtheme_navbar_logo.py b/bims_theme/migrations/0010_customtheme_navbar_logo.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.10 on 2023-10-19 02:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bims_theme', '0009_auto_20230712_0745'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customtheme',
+            name='navbar_logo',
+            field=models.ImageField(blank=True, null=True, upload_to='navbar_site_logo'),
+        ),
+    ]
diff --git a/bims_theme/models/theme.py b/bims_theme/models/theme.py
@@ -33,6 +33,11 @@ class CustomTheme(models.Model):
         null=True,
         blank=True
     )
+    navbar_logo = models.ImageField(
+        upload_to='navbar_site_logo',
+        null=True,
+        blank=True
+    )
     landing_page_sections = models.ManyToManyField(
         'bims_theme.LandingPageSection',
         null=True,