Prepare 2.8.1

GeoNode · Apr 14, 2018 · 3796901 · 3796901
1 parent e4cacd3
commit 3796901
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/dev_config.yml b/dev_config.yml
@@ -1,6 +1,6 @@
 ---
-GEOSERVER_URL: "http://build.geonode.org/geoserver/latest/geoserver-2.13.x.war"
-DATA_DIR_URL: "http://build.geonode.org/geoserver/latest/data-2.13.x.zip"
+GEOSERVER_URL: "http://build.geonode.org/geoserver/latest/geoserver-2.12.2.war"
+DATA_DIR_URL: "http://build.geonode.org/geoserver/latest/data-2.12.2.zip"
 JETTY_RUNNER_URL: "http://repo2.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.7.v20170914/jetty-runner-9.4.7.v20170914.jar"
 WINDOWS:
   py2exe: "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -94,7 +94,7 @@ services:
       - ./scripts/docker/env/production/django.env
 
   geoserver:
-    image: geonode/geoserver:2.13.x
+    image: geonode/geoserver:2.12.x
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true
@@ -126,7 +126,7 @@ services:
       - "80:80"
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.13.x
+    image: geonode/geoserver_data:2.12.x
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:

diff --git a/geonode/client/templates/admin/themes/custom_theme_html.txt b/geonode/client/templates/admin/themes/custom_theme_html.txt
@@ -28,7 +28,6 @@
         {% if theme.contact_city %}<li style="text-align: left;">{{ theme.contact_city }}</li>{% endif %}
         {% if theme.contact_street %}<li style="text-align: left;">{{ theme.contact_street }}</li>{% endif %}
         {% if theme.contact_postal_code %}<li style="text-align: left;">{{ theme.contact_postal_code }}</li>{% endif %}
-        {% if theme.contact_city %}<li style="text-align: left;">{{ theme.contact_city }}</li>{% endif %}
         {% if theme.contact_country %}<li style="text-align: left;">{{ theme.contact_country }}</li>{% endif %}
         {% if theme.contact_delivery_point %}<li style="text-align: left;">{{ theme.contact_delivery_point }}</li>{% endif %}
         {% if theme.contact_voice %}<li style="text-align: left;">Tel: {{ theme.contact_voice }}</li>{% endif %}