From c84d95a442c8b853a9f84c67175aec6a19dc0453 Mon Sep 17 00:00:00 2001
From: srto <git@srto.nz>
Date: Sat, 8 Jun 2019 10:54:06 +1200
Subject: [PATCH] Use {% static %} tag to generate static URLs

---
 .../geonode-mapstore-client/_client_composer_js.html       | 6 +++---
 .../geonode-mapstore-client/_client_viewer_js.html         | 6 +++---
 .../templates/geonode-mapstore-client/base_ms.html         | 4 ++--
 .../templates/geonode-mapstore-client/edit_map.html        | 7 ++++---
 .../templates/geonode-mapstore-client/layer_edit.html      | 7 ++++---
 .../templates/geonode-mapstore-client/layer_map.html       | 3 ++-
 .../geonode-mapstore-client/layer_style_edit.html          | 7 ++++---
 .../templates/geonode-mapstore-client/layer_view.html      | 7 ++++---
 .../templates/geonode-mapstore-client/map_embed.html       | 5 +++--
 .../templates/geonode-mapstore-client/map_view.html        | 5 +++--
 10 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/_client_composer_js.html b/geonode_mapstore_client/templates/geonode-mapstore-client/_client_composer_js.html
index 01f14c85b0..97c63766fa 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/_client_composer_js.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/_client_composer_js.html
@@ -11,10 +11,10 @@
 {%  if MAP_DEBUG %}
 <script id="ms2-api" src="http://localhost:8081/dist/ms2-geonode-api.js"></script>
 {% else %}
-<script id="ms2-api" src="{{ STATIC_URL }}mapstore/dist/ms2-geonode-api.js"></script>
+<script id="ms2-api" src="{% static 'mapstore/dist/ms2-geonode-api.js' %}"></script>
 {% endif %}
 
 <!-- script to generate Thumbnails from MapStore -->
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/thumbnail.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/thumbnail.js' %}"></script>
 
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
\ No newline at end of file
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/_client_viewer_js.html b/geonode_mapstore_client/templates/geonode-mapstore-client/_client_viewer_js.html
index 61870cef07..15f71c2e7f 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/_client_viewer_js.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/_client_viewer_js.html
@@ -11,11 +11,11 @@
 {%  if MAP_DEBUG %}
 <script id="ms2-api" src="http://localhost:8081/dist/ms2-geonode-api.js"></script>
 {% else %}
-<script id="ms2-api" src="{{ STATIC_URL }}mapstore/dist/ms2-geonode-api.js"></script>
+<script id="ms2-api" src="{% static 'mapstore/dist/ms2-geonode-api.js' %}"></script>
 {% endif %}
 
 <!-- script to generate Thumbnails from MapStore -->
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/thumbnail.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/thumbnail.js' %}"></script>
 
 <!-- MapStore2 specific stuff -->
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/ms2_viewer_plugins.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_viewer_plugins.js' %}"></script>
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/base_ms.html b/geonode_mapstore_client/templates/geonode-mapstore-client/base_ms.html
index 990fce616d..ccfcdd490c 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/base_ms.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/base_ms.html
@@ -22,11 +22,11 @@
 {%  if MAP_DEBUG %}
 <script id="ms2-api" src="http://localhost:8081/dist/ms2-geonode-api.js"></script>
 {% else %}
-<script id="ms2-api" src="{{ STATIC_URL }}mapstore/dist/ms2-geonode-api.js"></script>
+<script id="ms2-api" src="{% static 'mapstore/dist/ms2-geonode-api.js' %}"></script>
 {% endif %}
 
 <!-- script to generate Thumbnails from MapStore -->
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/thumbnail.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/thumbnail.js' %}"></script>
 
 {% block plugins %}
 <!-- load plugins config-->
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/edit_map.html b/geonode_mapstore_client/templates/geonode-mapstore-client/edit_map.html
index 379af2bdfe..ab4d9dd849 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/edit_map.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/edit_map.html
@@ -1,8 +1,9 @@
 {% extends "./base_ms.html" %}
+{% load static %}
 {% block plugins %}
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_viewer_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_viewer_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
 {% endblock %}
 {% block style %}
 <style>
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_edit.html b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_edit.html
index 1d8cfaea06..c0ebf80d5d 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_edit.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_edit.html
@@ -1,8 +1,9 @@
 {% extends "./base_ms.html" %}
+{% load static %}
 {% block plugins %}
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_viewer_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_viewer_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
 {% endblock %}
 {% block style %}
 <style>
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_map.html b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_map.html
index 5b66bb4f34..456bc3bebc 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_map.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_map.html
@@ -1,6 +1,7 @@
 {% extends "./base_ms.html" %}
+{% load static %}
 {% block plugins %}
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
 {% endblock %}
 {% block style %}
 <style>
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_style_edit.html b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_style_edit.html
index fb67cedaec..d3bf4968d0 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_style_edit.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_style_edit.html
@@ -1,8 +1,9 @@
 {% extends "./base_ms.html" %}
+{% load static %}
 {% block plugins %}
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_viewer_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_viewer_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
 {% endblock %}
 {% block style %}
 <style>
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_view.html b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_view.html
index 1d9807b43f..a9f4328c78 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_view.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_view.html
@@ -1,8 +1,9 @@
 {% extends "./base_ms.html" %}
+{% load static %}
 {% block plugins %}
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_viewer_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_viewer_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
 {% endblock %}
 {% block style %}
 <style>
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/map_embed.html b/geonode_mapstore_client/templates/geonode-mapstore-client/map_embed.html
index 7bfa77b402..866b56abfd 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/map_embed.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/map_embed.html
@@ -1,7 +1,8 @@
 {% extends "./base_ms.html" %}
+{% load static %}
 {% block plugins %}
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_embed_plugins.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_embed_plugins.js' %}"></script>
 {% endblock %}
 {% block style %}
 <style>
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/map_view.html b/geonode_mapstore_client/templates/geonode-mapstore-client/map_view.html
index 84e74fdfde..e6a5b299b8 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/map_view.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/map_view.html
@@ -1,7 +1,8 @@
 {% extends "./base_ms.html" %}
+{% load static %}
 {% block plugins %}
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_viewer_plugins.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
+<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_viewer_plugins.js' %}"></script>
 {% endblock %}
 
 {% block style %}