Skip to content

Commit

Permalink
Use {% static %} tag to generate static URLs
Browse files Browse the repository at this point in the history
  • Loading branch information
srto committed Jun 7, 2019
1 parent 3fe8eb0 commit c84d95a
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 25 deletions.
6 changes: 3 additions & 3 deletions geonode_mapstore_client/templates/geonode-mapstore-client/_client_composer_js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
6 changes: 3 additions & 3 deletions geonode_mapstore_client/templates/geonode-mapstore-client/_client_viewer_js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions geonode_mapstore_client/templates/geonode-mapstore-client/base_ms.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-->
Expand Down
7 changes: 4 additions & 3 deletions geonode_mapstore_client/templates/geonode-mapstore-client/edit_map.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
7 changes: 4 additions & 3 deletions geonode_mapstore_client/templates/geonode-mapstore-client/layer_edit.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
3 changes: 2 additions & 1 deletion geonode_mapstore_client/templates/geonode-mapstore-client/layer_map.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
7 changes: 4 additions & 3 deletions geonode_mapstore_client/templates/geonode-mapstore-client/layer_style_edit.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
7 changes: 4 additions & 3 deletions geonode_mapstore_client/templates/geonode-mapstore-client/layer_view.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
5 changes: 3 additions & 2 deletions geonode_mapstore_client/templates/geonode-mapstore-client/map_embed.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
5 changes: 3 additions & 2 deletions geonode_mapstore_client/templates/geonode-mapstore-client/map_view.html
View file
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down

0 comments on commit c84d95a

Please sign in to comment.