Merge pull request #671 from kartoza/develop

Updates (#670)

deployment/.env

@@ -248,7 +248,7 @@ PYTHONPATH=/home/web/django_project:/geonode
 USE_DEFAULT_GEOSERVER_STYLE=False
 INITIAL_FIXTURES=True
 
-VERSION=4.4.9
+VERSION=4.4.10
 ISTSOS_VERSION=2.4.1-2
 
 # ------ GEOSERVER ------

django_project/igrac/context_processors.py

@@ -1,13 +1,20 @@
 from django.conf import settings
+
+from igrac.models.site_preference import SitePreference
 from .utilities import get_default_filter_by_group
 
 
 def extra_context(request):
     """Global values to pass to templates"""
+    banner_url = None
+    pref = SitePreference.objects.first()
+    if pref and pref.banner:
+        banner_url = pref.banner.url
 
     defaults = dict(
         DEFAULT_GROUP_FILTER=get_default_filter_by_group(request.user),
-        GOOGLE_ANALYTIC_KEY=settings.GOOGLE_ANALYTIC_KEY
+        GOOGLE_ANALYTIC_KEY=settings.GOOGLE_ANALYTIC_KEY,
+        BANNER_URL=banner_url
     )
 
     return defaults

django_project/igrac/migrations/0012_sitepreference_banner.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.20 on 2024-03-21 03:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('igrac', '0011_registrationpage'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sitepreference',
+            name='banner',
+            field=models.ImageField(blank=True, null=True, upload_to='images'),
+        ),
+    ]

django_project/igrac/models/site_preference.py

@@ -24,3 +24,7 @@ class SitePreference(Preferences):
         related_name='preference_ggmn_layer',
         on_delete=models.SET_NULL
     )
+    banner = models.ImageField(
+        upload_to='images',
+        null=True, blank=True,
+    )

django_project/igrac/static/css/base-igrac.css

@@ -113,8 +113,6 @@ body.igrac-home {
 
 .banner {
     position: relative;
-    /* Hide banner image due to copyright issue */
-    /* background-image: url(img/coverfoto.jpg); */
     background-repeat: no-repeat;
     background-size: cover;
     background-position: top center;

django_project/igrac/templates/geonode-mapstore-client/snippets/hero.html

@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="banner">
+<div class="banner" {% if BANNER_URL %}style="background-image: url({{ BANNER_URL }})"{% endif %}>
         <div class="container">
             <div class="row">
                 <div class="col-md-7">

django_project/version/version.txt

@@ -1 +1 @@
-4.4.9
+4.4.10