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 new file mode 100644 index 000000000..851f5e27d --- /dev/null +++ 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 index c705e1f9b..107a96aac 100644 --- 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 new file mode 100644 index 000000000..eb178a126 Binary files /dev/null and b/bims/static/img/FBIS icon.png differ diff --git a/bims/templates/fbis/navigation_bar.html b/bims/templates/fbis/navigation_bar.html index 37e5b50b2..7a139025b 100644 --- a/bims/templates/fbis/navigation_bar.html +++ b/bims/templates/fbis/navigation_bar.html @@ -62,8 +62,13 @@
- + {% if custom_theme.navbar_logo %} + + {% elif custom_theme.logo %} + + {% else %} + + {% endif %}
diff --git a/bims/templates/navigation_bar.html b/bims/templates/navigation_bar.html index 00aa512e2..a719bad61 100644 --- a/bims/templates/navigation_bar.html +++ b/bims/templates/navigation_bar.html @@ -77,7 +77,9 @@
{% current_domain as domain_name %} - {% if custom_theme.logo %} + {% if custom_theme.navbar_logo %} + + {% elif custom_theme.logo %} {% 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 new file mode 100644 index 000000000..bc3f14520 --- /dev/null +++ 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 index 98a5a2ee9..863501d26 100644 --- 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,