Merge pull request #373 from kartoza/develop

Bump to version 1.1.2

.github/workflows/build-push-images-latest.yaml

@@ -9,6 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx

.github/workflows/build-push-images-pr.yaml

@@ -5,10 +5,12 @@ on:
       - develop
 jobs:
   docker-builder:
-    if: github.event.pull_request.head.repo.fork == 'false'
+    if: github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx

.github/workflows/build-push-images-release.yaml

@@ -19,6 +19,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.inputs.tags }}
+          submodules: 'true'
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -46,6 +47,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1

.github/workflows/build-push-images-stable.yaml

@@ -10,6 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx

deployment/docker/Dockerfile

@@ -4,12 +4,15 @@ MAINTAINER Anita Hapsari<anita@kartoza.com>
 
 RUN mkdir -p /usr/share/man/man1
 RUN apt-get update -y && apt-get -y --allow-downgrades --allow-remove-essential --allow-unauthenticated install yui-compressor rpl mdbtools git
+RUN echo "Activate memcached" && \
+    apt-get update && apt-get install -y memcached && \
+    pip install pylibmc  && pip install sherlock
 
 WORKDIR /spcgeonode
 
-# TODO: based
-#   https://github.com/GeoNode/geonode/tree/d888a6c6b7cfe386e1153d8f3bbee3b5b974d19b
-RUN git pull https://github.com/kartoza/geonode.git upstream-fix
+# TODO: base repo : https://github.com/GeoNode/geonode/commit/4f780ebf2744ada788e4b21782d4e6c53bd60e0f
+# This is geonode : 3.2 stable version
+RUN git pull https://github.com/kartoza/geonode.git geonode.3.2-fix
 RUN pip install -r requirements.txt
 
 RUN pip uninstall -y django-geonode-mapstore-client

deployment/docker/REQUIREMENTS.txt

@@ -18,4 +18,4 @@ openpyxl==3.0.5
 pyexcel-xls
 pyexcel-xlsx
 
-git+https://github.com/kartoza/geonode-mapstore-client.git@2.0.10
+git+https://github.com/kartoza/geonode-mapstore-client.git@2.0.10.3

deployment/docker/entrypoint.sh

@@ -8,6 +8,8 @@ echo "-----------------------------------------------------"
 echo "STARTING DJANGO ENTRYPOINT $(date)"
 echo "-----------------------------------------------------"
 
+service memcached restart
+
 # Setting dynamic env vars (some of this could probably be put in docker-compose once
 # https://github.com/docker/compose/pull/5268 is merged, or even better hardcoded if
 # geonode supported relative site urls)

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

@@ -229,6 +229,7 @@ body.igrac-home {
     box-shadow: 0 0 28px -5px rgba(0, 0, 0, 0.24);
     transition: all 0.2s;
     background: #fff;
+    cursor: pointer;
 }
 
 .viewer-thumb {

django_project/igrac/templates/base/_resourcebase_info_panel.html

@@ -28,8 +28,7 @@
 
     {% if resource.abstract %}
     <dt>{% trans "Abstract" %}</dt>
-{#    <dd itemprop="description">{{ resource.abstract|safe|escape|linebreaks|safe|remove_nofollow_url|safe }}</dd>#}
-    <dd itemprop="description">{{ resource.abstract|urlize_that_is_link|safe|escape|linebreaks|safe }}</dd>
+    <dd itemprop="description">{{ resource.abstract|urlize_that_is_link|safe|escape }}</dd>
     {% endif %}
 
     {% if resource.date %}

django_project/igrac/templates/landing_page.html

@@ -65,7 +65,8 @@
                 <div class="col-md-7">
                     <div class="banner-text">
                         <h2>{% trans "The Global Groundwater Information System (GGIS)" %}</h2>
-                        <p>{% trans "The GGIS is an interactive portal for sharing data and information on groundwater resources around the world. It gives access to map layers, documents, and well and monitoring data. It also contains several thematic map viewers." %}</p></div>
+                        <p>{% trans "The GGIS is an interactive portal for sharing data and information on groundwater resources around the world. It gives access to map layers, documents, and well and monitoring data. It also contains several thematic map viewers." %}</p>
+                    </div>
                 </div>
             </div>
             <div class="cta">
@@ -98,15 +99,15 @@ <h1>{% trans "Explore the viewers" %}</h1>
             <div class="row">
                 {% for map in ordered_maps %}
                     <div class="col-lg-4 map-item">
-                        <a class="map-item-wrappper" href="{% url 'map_view_slug' slug=map.slug %}" data-toggle="tooltip" data-placement="top" title="{{ map.map.title }}">
+                        <div class="map-item-wrappper" onclick="window.location='{% url 'map_view_slug' slug=map.slug %}'" data-toggle="tooltip" data-placement="top" title="{{ map.map.title }}">
                             <div class="viewer-thumb">
                                 <img src="{{ map.map.thumbnail_url }}"/>
                             </div>
                             <div class="viewer-desc">
                                 <div class="viewer-title"><strong>{{ map.map.title }}</strong></div>
                                 <div class="map-abstract">{{ map.map.abstract|safe|escape|linebreaks|safe }}</div>
                             </div>
-                        </a>
+                        </div>
                     </div>
                 {% endfor %}
             </div>

django_project/igrac/templates/maps/metadata_detail_article.html

@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load custom_geonode_utils %}
 <div class="page-header">
     {% if resource.class_name == "Document" %}
         <a href="{% url 'document_detail' docid=resource.id %}" class="btn btn-primary pull-right">{% trans "Return to Document" %}</a>
@@ -25,7 +26,7 @@ <h2 class="page-title">{{ resource.title }}</h2>
 
         {% if resource.abstract %}
             <dt>{% trans "Abstract" %}</dt>
-            <dd>{{ resource.abstract|safe|escape|urlize|linebreaks|safe }}</dd>
+            <dd>{{ resource.abstract|urlize_that_is_link|safe|escape }}</dd>
         {% endif %}
 
     </dl>

django_project/igrac/templates/metadata_detail.html

@@ -1,5 +1,6 @@
 {% extends "geonode_base.html" %}
 {% load i18n %}
+{% load custom_geonode_utils %}
 {% load bootstrap_tags %}
 
 {% block title %}{{ resource.title }} — {{ block.super }}{% endblock %}
@@ -48,7 +49,7 @@ <h2 class="page-title">{% trans "Metadata" %} : {{ resource.title }}</h2>
 
         {% if resource.abstract %}
         <dt>{% trans "Abstract" %}</dt>
-        <dd>{{ resource.abstract|safe|escape|urlize|linebreaks|safe }}</dd>
+        <dd>{{ resource.abstract|urlize_that_is_link|safe|escape }}</dd>
         {% endif %}
 
     </dl>

django_project/version/version.txt

@@ -1 +1 @@
-1.1.1
+1.1.2