Merge pull request #607 from kartoza/develop

Update version footer
kartoza · Dec 6, 2023 · d45f879 · d45f879
2 parents 68562f7 + 2543d8f
commit d45f879
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/django_project/igrac/templates/geonode-mapstore-client/snippets/footer.html b/django_project/igrac/templates/geonode-mapstore-client/snippets/footer.html
@@ -2,27 +2,37 @@
 
 <footer class="gn-footer footer-wrapper">
     {% if IGRAC_VERSION %}
-        <div class="footer-item" style="position: absolute; top: 8px; left: 7px;">{% trans "Version" %} <a href="{{ IGRAC_VERSION.url }}">{{ IGRAC_VERSION.name }}</a></div>
+        <div class="footer-item"
+             style="position: absolute; top: 8px; left: 7px;">{% trans "Version" %}
+            <a href="{{ IGRAC_VERSION.url }}">{{ IGRAC_VERSION.name }}</a>
+            <span style="font-size: 0.6rem; color: #888888"> (geonode 4.1.1)</span>
+        </div>
     {% endif %}
     <div style="margin-left: auto; margin-right: auto; display: flex">
         <div class="footer-item">{% trans "Brought to you by" %}&nbsp;</div>
-        <a class="footer-item" href="https://www.un-igrac.org/" target="_blank"><img src="/static/img/logo-small.svg" width="50" alt="logo" style="vertical-align: bottom"/></a>
-        <div class="footer-item" style="padding-left: 15px">{% trans "Web site developed by" %}&nbsp;</div>
-        <a class="footer-item" href="https://kartoza.com/" target="_blank"><img src="/static/img/kartoza-icon.png" height="23" alt="kartoza_logo"/></a>
+        <a class="footer-item" href="https://www.un-igrac.org/"
+           target="_blank"><img src="/static/img/logo-small.svg" width="50"
+                                alt="logo" style="vertical-align: bottom"/></a>
+        <div class="footer-item"
+             style="padding-left: 15px">{% trans "Web site developed by" %}&nbsp;
+        </div>
+        <a class="footer-item" href="https://kartoza.com/" target="_blank"><img
+                src="/static/img/kartoza-icon.png" height="23"
+                alt="kartoza_logo"/></a>
     </div>
     {#  form for change language #}
-{#    <form id="lang-form" class="form-inline" action="/i18n/setlang/" method="post"#}
-{#          style="width: 300px;#}
-{#            position: absolute;#}
-{#            top: 8px;#}
-{#            right: 7px;">#}
-{#        {% csrf_token %}#}
-{#        <select id="lang-select" class="col-md-6 pull-right" name="language" onchange="changeLanguage($(this).val())" style="font-size: 12px; height: 24px;">#}
-{#            {% for lang in LANGUAGES %}#}
-{#                <option value="{{ lang.0 }}" {% ifequal LANGUAGE_CODE lang.0 %} selected="selected"{% endifequal %}>#}
-{#                    {{ lang.1 }}#}
-{#                </option>#}
-{#            {% endfor %}#}
-{#        </select>#}
-{#    </form>#}
+    {#    <form id="lang-form" class="form-inline" action="/i18n/setlang/" method="post"#}
+    {#          style="width: 300px;#}
+    {#            position: absolute;#}
+    {#            top: 8px;#}
+    {#            right: 7px;">#}
+    {#        {% csrf_token %}#}
+    {#        <select id="lang-select" class="col-md-6 pull-right" name="language" onchange="changeLanguage($(this).val())" style="font-size: 12px; height: 24px;">#}
+    {#            {% for lang in LANGUAGES %}#}
+    {#                <option value="{{ lang.0 }}" {% ifequal LANGUAGE_CODE lang.0 %} selected="selected"{% endifequal %}>#}
+    {#                    {{ lang.1 }}#}
+    {#                </option>#}
+    {#            {% endfor %}#}
+    {#        </select>#}
+    {#    </form>#}
 </footer>
diff --git a/django_project/version/version.txt b/django_project/version/version.txt
@@ -1 +1 @@
-4.2.0 (Geonode 4.1.1)
+4.2.0