Merge pull request #669 from kartoza/develop

Add igrac version to css
kartoza · Mar 14, 2024 · a3a988c · a3a988c
2 parents de02f79 + 37e54ac
commit a3a988c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git 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.8
+VERSION=4.4.9
 ISTSOS_VERSION=2.4.1-2
 
 # ------ GEOSERVER ------

diff --git a/django_project/igrac/templates/base.html b/django_project/igrac/templates/base.html
@@ -34,9 +34,9 @@
           rel="stylesheet"/>
     <link href="{% static 'lib/css/bootstrap-select.css' %}?{% client_version %}"
           rel="stylesheet"/>
-    <link href="{% static 'css/default.css' %}?{% client_version %}"
+    <link href="{% static 'css/default.css' %}?{{ IGRAC_VERSION.name }}"
           rel="stylesheet"/>
-    <link href="{% static 'css/base-igrac.css' %}?{% client_version %}"
+    <link href="{% static 'css/base-igrac.css' %}?{{ IGRAC_VERSION.name }}"
           rel="stylesheet"/>
     <link rel="shortcut icon" href="{% static "img/favicon.ico" %}"/>
     {% include './geonode-mapstore-client/snippets/custom_theme.html' %}

diff --git a/django_project/igrac/templates/geonode-mapstore-client/catalogue.html b/django_project/igrac/templates/geonode-mapstore-client/catalogue.html
@@ -10,8 +10,8 @@
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap" rel="stylesheet">
         <link href="{% static 'mapstore/dist/themes/geonode.css' %}?{% client_version %}" rel="stylesheet" />
-        <link href="{% static 'css/default.css' %}?{% client_version %}" rel="stylesheet" />
-        <link href="{% static 'css/base-igrac.css' %}?{% client_version %}" rel="stylesheet" />
+        <link href="{% static 'css/default.css' %}?{{ IGRAC_VERSION.name }}" rel="stylesheet" />
+        <link href="{% static 'css/base-igrac.css' %}?{{ IGRAC_VERSION.name }}" rel="stylesheet" />
         <title>{{ SITE_NAME }}</title>
         <link rel="shortcut icon" href="{% static "img/favicon.ico" %}"/>
         {% include './snippets/loader_style.html' %}

diff --git a/django_project/igrac/templates/igrac/blog_index_page.html b/django_project/igrac/templates/igrac/blog_index_page.html
@@ -7,7 +7,7 @@
 {% block body_class %}igrac-wagtail{% endblock %}
 
 {% block extra_head %}
-    <link href="{% static "css/base-igrac.css" %}" rel="stylesheet" />
+    <link href="{% static "css/base-igrac.css" %}?{{ IGRAC_VERSION.name }}" rel="stylesheet" />
 {% endblock %}
 
 {% block body %}

diff --git a/django_project/igrac/templates/igrac/blog_page.html b/django_project/igrac/templates/igrac/blog_page.html
@@ -7,7 +7,7 @@
 {% block body_class %}igrac-wagtail{% endblock %}
 
 {% block extra_head %}
-    <link href="{% static "css/base-igrac.css" %}" rel="stylesheet" />
+    <link href="{% static "css/base-igrac.css" %}?{{ IGRAC_VERSION.name }}" rel="stylesheet" />
 {% endblock %}
 
 {% block body %}

diff --git a/django_project/igrac/templates/igrac/disclaimer_license_page.html b/django_project/igrac/templates/igrac/disclaimer_license_page.html
@@ -5,7 +5,7 @@
 {#{% block body_class %}{% trans "igrac-home" %}{% endblock %}#}
 
 {% block extra_head %}
-    <link href="{% static "css/base-igrac.css" %}" rel="stylesheet" />
+    <link href="{% static "css/base-igrac.css" %}?{{ IGRAC_VERSION.name }}" rel="stylesheet" />
 {% endblock %}
 
 {% load wagtailcore_tags %}

diff --git a/django_project/igrac/templates/index.html b/django_project/igrac/templates/index.html
@@ -9,8 +9,8 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap" rel="stylesheet">
         <link href="{% static 'mapstore/dist/themes/geonode.css' %}?{% client_version %}" rel="stylesheet" />
-        <link href="{% static 'css/default.css' %}?{% client_version %}" rel="stylesheet" />
-        <link href="{% static 'css/base-igrac.css' %}?{% client_version %}" rel="stylesheet" />
+        <link href="{% static 'css/default.css' %}?{{ IGRAC_VERSION.name }}" rel="stylesheet" />
+        <link href="{% static 'css/base-igrac.css' %}?{{ IGRAC_VERSION.name }}" rel="stylesheet" />
 
         <title>{{ SITE_NAME }}</title>
         <link rel="shortcut icon" href="{% static "img/favicon.ico" %}"/>

diff --git a/django_project/version/version.txt b/django_project/version/version.txt
@@ -1 +1 @@
-4.4.8
+4.4.9