From d8d1fc413d78eacbf08efd4a696c487d46f1d323 Mon Sep 17 00:00:00 2001
From: Irwan Fathurrahman <meomancer@gmail.com>
Date: Thu, 21 Mar 2024 13:32:46 +0700
Subject: [PATCH] Updates (#670)

* Put banner to site preferences

* Bump version 4.4.10

* Bump gwml2 version to 4.4.10
---
 deployment/.env                                |  2 +-
 django_project/gwml2                           |  2 +-
 django_project/igrac/context_processors.py     |  9 ++++++++-
 .../migrations/0012_sitepreference_banner.py   | 18 ++++++++++++++++++
 django_project/igrac/models/site_preference.py |  4 ++++
 django_project/igrac/static/css/base-igrac.css |  2 --
 .../geonode-mapstore-client/snippets/hero.html |  2 +-
 django_project/version/version.txt             |  2 +-
 8 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 django_project/igrac/migrations/0012_sitepreference_banner.py

diff --git a/deployment/.env b/deployment/.env
index 8da5e37..178cc29 100644
--- a/deployment/.env
+++ b/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 ------
diff --git a/django_project/gwml2 b/django_project/gwml2
index b5bf72d..4898bb9 160000
--- a/django_project/gwml2
+++ b/django_project/gwml2
@@ -1 +1 @@
-Subproject commit b5bf72dd3cd23562810cafae7b51c5f3261a06fc
+Subproject commit 4898bb9a06a99ca34d075a814f3e1b15c59cda79
diff --git a/django_project/igrac/context_processors.py b/django_project/igrac/context_processors.py
index ccecbb6..1871319 100644
--- a/django_project/igrac/context_processors.py
+++ b/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
diff --git a/django_project/igrac/migrations/0012_sitepreference_banner.py b/django_project/igrac/migrations/0012_sitepreference_banner.py
new file mode 100644
index 0000000..2ca42d3
--- /dev/null
+++ b/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'),
+        ),
+    ]
diff --git a/django_project/igrac/models/site_preference.py b/django_project/igrac/models/site_preference.py
index b698889..548c2c7 100644
--- a/django_project/igrac/models/site_preference.py
+++ b/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,
+    )
diff --git a/django_project/igrac/static/css/base-igrac.css b/django_project/igrac/static/css/base-igrac.css
index 2653c8b..72b1792 100644
--- a/django_project/igrac/static/css/base-igrac.css
+++ b/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;
diff --git a/django_project/igrac/templates/geonode-mapstore-client/snippets/hero.html b/django_project/igrac/templates/geonode-mapstore-client/snippets/hero.html
index 7d22b4f..b295384 100644
--- a/django_project/igrac/templates/geonode-mapstore-client/snippets/hero.html
+++ b/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">
diff --git a/django_project/version/version.txt b/django_project/version/version.txt
index e49188c..22eed88 100644
--- a/django_project/version/version.txt
+++ b/django_project/version/version.txt
@@ -1 +1 @@
-4.4.9
\ No newline at end of file
+4.4.10
\ No newline at end of file