Skip to content

Commit 03fe9e0

Browse files
author
afabiani
committed
2 parents e892e5b + 8fa3ffa commit 03fe9e0

11 files changed

Lines changed: 123 additions & 165 deletions

File tree

‎geonode_mapstore_client/templates/geonode-mapstore-client/_client_composer_js.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
{% if MAP_DEBUG %}
1212
<script id="ms2-api" src="http://localhost:8081/dist/ms2-geonode-api.js"></script>
1313
{% else %}
14-
<script id="ms2-api" src="{{ STATIC_URL }}mapstore/dist/ms2-geonode-api.js"></script>
14+
<script id="ms2-api" src="{% static 'mapstore/dist/ms2-geonode-api.js' %}"></script>
1515
{% endif %}
1616

1717
<!-- script to generate Thumbnails from MapStore -->
18-
<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/thumbnail.js"></script>
18+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/thumbnail.js' %}"></script>
1919

20-
<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
20+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>

‎geonode_mapstore_client/templates/geonode-mapstore-client/_client_viewer_js.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
{% if MAP_DEBUG %}
1212
<script id="ms2-api" src="http://localhost:8081/dist/ms2-geonode-api.js"></script>
1313
{% else %}
14-
<script id="ms2-api" src="{{ STATIC_URL }}mapstore/dist/ms2-geonode-api.js"></script>
14+
<script id="ms2-api" src="{% static 'mapstore/dist/ms2-geonode-api.js' %}"></script>
1515
{% endif %}
1616

1717
<!-- script to generate Thumbnails from MapStore -->
18-
<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/thumbnail.js"></script>
18+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/thumbnail.js' %}"></script>
1919

2020
<!-- MapStore2 specific stuff -->
21-
<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/ms2_viewer_plugins.js"></script>
21+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_viewer_plugins.js' %}"></script>

‎geonode_mapstore_client/templates/geonode-mapstore-client/_config.html‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<script>
2+
const defaultConfig = {
3+
proxy: "{{ SITEURL }}{{ PROXY_URL }}",
4+
printingEnabled: true,
5+
localConfig: {
6+
mapLayout: {left: {sm: 300, md: 500, lg: 600}, right: {md: "41%"}, bottom: {sm: 0}},
7+
geonode_url: "{{ SITEURL }}",
8+
genode_rest_api: "{{ SITEURL }}mapstore/rest/",
9+
printUrl: "{{ GEOSERVER_PUBLIC_LOCATION }}pdf/info.json",
10+
translations: '',
11+
useAuthenticationRules: true,
12+
loadAfterTheme: true,
13+
authenticationRules: [{
14+
"urlPattern": ".*geostore.*",
15+
"method": "bearer"
16+
}, {
17+
"urlPattern": ".*geoserver.*",
18+
"authkeyParamName": "access_token",
19+
"method": "authkey"
20+
}, {
21+
"urlPattern": ".*gs.*",
22+
"authkeyParamName": "access_token",
23+
"method": "authkey"
24+
}]
25+
}
26+
}
27+
</script>

‎geonode_mapstore_client/templates/geonode-mapstore-client/base_ms.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
{% if MAP_DEBUG %}
2323
<script id="ms2-api" src="http://localhost:8081/dist/ms2-geonode-api.js"></script>
2424
{% else %}
25-
<script id="ms2-api" src="{{ STATIC_URL }}mapstore/dist/ms2-geonode-api.js"></script>
25+
<script id="ms2-api" src="{% static 'mapstore/dist/ms2-geonode-api.js' %}"></script>
2626
{% endif %}
2727

2828
<!-- script to generate Thumbnails from MapStore -->
29-
<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/ms2/utils/thumbnail.js"></script>
29+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/thumbnail.js' %}"></script>
3030

3131
{% block plugins %}
3232
<!-- load plugins config-->
@@ -123,6 +123,7 @@
123123

124124
{% endautoescape %}
125125
{% endwith %}
126+
{% include './_config.html' %}
126127
{% block app_config %}{% endblock %}
127128

128129
{% block map_content %}

‎geonode_mapstore_client/templates/geonode-mapstore-client/edit_map.html‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{% extends "./base_ms.html" %}
2+
{% load static %}
23
{% block plugins %}
3-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
4-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_viewer_plugins.js"></script>
5-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
4+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
5+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_viewer_plugins.js' %}"></script>
6+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
67
{% endblock %}
78
{% block style %}
89
<style>
@@ -75,27 +76,16 @@
7576
}
7677
}
7778
},
78-
proxy: "{{ SITEURL }}proxy/?url=",
79-
printingEnabled: true,
79+
proxy: defaultConfig.proxy,
80+
printingEnabled: defaultConfig.printingEnabled,
8081
localConfig: {
81-
geonode_url: "{{ SITEURL }}",
82-
genode_rest_api: "{{ SITEURL }}mapstore/rest/",
83-
loadAfterTheme: true,
84-
printUrl: "{{ SITEURL }}gs/pdf/info.json",
85-
translations: '',
86-
useAuthenticationRules: true,
87-
authenticationRules: [{
88-
"urlPattern": ".*geostore.*",
89-
"method": "bearer"
90-
}, {
91-
"urlPattern": ".*geoserver.*",
92-
"authkeyParamName": "access_token",
93-
"method": "authkey"
94-
}, {
95-
"urlPattern": ".*gs.*",
96-
"authkeyParamName": "access_token",
97-
"method": "authkey"
98-
}]
82+
geonode_url: defaultConfig.localConfig.geonode_url,
83+
genode_rest_api: defaultConfig.localConfig.genode_rest_api,
84+
loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
85+
printUrl: defaultConfig.localConfig.printUrl,
86+
translations: defaultConfig.localConfig.translations,
87+
useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
88+
authenticationRules: defaultConfig.localConfig.authenticationRules
9989
},
10090
plugins: MS2_PLUGINS
10191
});

‎geonode_mapstore_client/templates/geonode-mapstore-client/layer_edit.html‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{% extends "./base_ms.html" %}
2+
{% load static %}
23
{% block plugins %}
3-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
4-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_viewer_plugins.js"></script>
5-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
4+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
5+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_viewer_plugins.js' %}"></script>
6+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
67
{% endblock %}
78
{% block style %}
89
<style>
@@ -64,27 +65,16 @@
6465
}
6566
}
6667
},
67-
proxy: "{{ SITEURL }}proxy/?url=",
68-
printingEnabled: true,
68+
proxy: defaultConfig.proxy,
69+
printingEnabled: defaultConfig.printingEnabled,
6970
localConfig: {
70-
geonode_url: "{{ SITEURL }}",
71-
genode_rest_api: "{{ SITEURL }}mapstore/rest/",
72-
loadAfterTheme: true,
73-
printUrl: "{{ SITEURL }}gs/pdf/info.json",
74-
translations: '',
75-
useAuthenticationRules: true,
76-
authenticationRules: [{
77-
"urlPattern": ".*geostore.*",
78-
"method": "bearer"
79-
}, {
80-
"urlPattern": ".*geoserver.*",
81-
"authkeyParamName": "access_token",
82-
"method": "authkey"
83-
}, {
84-
"urlPattern": ".*gs.*",
85-
"authkeyParamName": "access_token",
86-
"method": "authkey"
87-
}]
71+
geonode_url: defaultConfig.localConfig.geonode_url,
72+
genode_rest_api: defaultConfig.localConfig.genode_rest_api,
73+
loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
74+
printUrl: defaultConfig.localConfig.printUrl,
75+
translations: defaultConfig.localConfig.translations,
76+
useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
77+
authenticationRules: defaultConfig.localConfig.authenticationRules
8878
},
8979
plugins: MS2_PLUGINS
9080
});

‎geonode_mapstore_client/templates/geonode-mapstore-client/layer_map.html‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% extends "./base_ms.html" %}
2+
{% load static %}
23
{% block plugins %}
3-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
4+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
45
{% endblock %}
56
{% block style %}
67
<style>
@@ -53,27 +54,16 @@
5354
}
5455
}
5556
},
56-
proxy: "{{ SITEURL }}proxy/?url=",
57-
printingEnabled: true,
57+
proxy: defaultConfig.proxy,
58+
printingEnabled: defaultConfig.printingEnabled,
5859
localConfig: {
59-
mapLayout: {left: {sm: 300, md: 500, lg: 600}, right: {md: "41%"}, bottom: {sm: 0}},
60-
geonode_url: "{{ SITEURL }}",
61-
translations: '',
62-
loadAfterTheme: true,
63-
printUrl: "{{ SITEURL }}gs/pdf/info.json",
64-
useAuthenticationRules: true,
65-
authenticationRules: [{
66-
"urlPattern": ".*geostore.*",
67-
"method": "bearer"
68-
}, {
69-
"urlPattern": ".*geoserver.*",
70-
"authkeyParamName": "access_token",
71-
"method": "authkey"
72-
}, {
73-
"urlPattern": ".*gs.*",
74-
"authkeyParamName": "access_token",
75-
"method": "authkey"
76-
}]
60+
mapLayout: defaultConfig.localConfig.mapLayout,
61+
geonode_url: defaultConfig.localConfig.geonode_url,
62+
translations: defaultConfig.localConfig.translations,
63+
loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
64+
printUrl: defaultConfig.localConfig.printUrl,
65+
useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
66+
authenticationRules: defaultConfig.localConfig.authenticationRules
7767
},
7868
plugins: MS2_PLUGINS
7969
});

‎geonode_mapstore_client/templates/geonode-mapstore-client/layer_style_edit.html‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{% extends "./base_ms.html" %}
2+
{% load static %}
23
{% block plugins %}
3-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
4-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_viewer_plugins.js"></script>
5-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
4+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
5+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_viewer_plugins.js' %}"></script>
6+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
67
{% endblock %}
78
{% block style %}
89
<style>
@@ -77,27 +78,16 @@
7778
}
7879
}
7980
},
80-
proxy: "{{ SITEURL }}proxy/?url=",
81-
printingEnabled: true,
81+
proxy: defaultConfig.proxy,
82+
printingEnabled: defaultConfig.printingEnabled,
8283
localConfig: {
83-
geonode_url: "{{ SITEURL }}",
84-
genode_rest_api: "{{ SITEURL }}mapstore/rest/",
85-
loadAfterTheme: true,
86-
printUrl: "{{ SITEURL }}gs/pdf/info.json",
87-
translations: '',
88-
useAuthenticationRules: true,
89-
authenticationRules: [{
90-
"urlPattern": ".*geostore.*",
91-
"method": "bearer"
92-
}, {
93-
"urlPattern": ".*geoserver.*",
94-
"authkeyParamName": "access_token",
95-
"method": "authkey"
96-
}, {
97-
"urlPattern": ".*gs.*",
98-
"authkeyParamName": "access_token",
99-
"method": "authkey"
100-
}]
84+
geonode_url: defaultConfig.localConfig.geonode_url,
85+
genode_rest_api: defaultConfig.localConfig.genode_rest_api,
86+
loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
87+
printUrl: defaultConfig.localConfig.printUrl,
88+
translations: defaultConfig.localConfig.translations,
89+
useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
90+
authenticationRules: defaultConfig.localConfig.authenticationRules
10191
},
10292
plugins: MS2_PLUGINS
10393
});

‎geonode_mapstore_client/templates/geonode-mapstore-client/layer_view.html‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{% extends "./base_ms.html" %}
2+
{% load static %}
23
{% block plugins %}
3-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
4-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_viewer_plugins.js"></script>
5-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_composer_plugins.js"></script>
4+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
5+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_viewer_plugins.js' %}"></script>
6+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_composer_plugins.js' %}"></script>
67
{% endblock %}
78
{% block style %}
89
<style>
@@ -77,27 +78,16 @@
7778
}
7879
}
7980
},
80-
proxy: "{{ SITEURL }}proxy/?url=",
81-
printingEnabled: true,
81+
proxy: defaultConfig.proxy,
82+
printingEnabled: defaultConfig.printingEnabled,
8283
localConfig: {
83-
geonode_url: "{{ SITEURL }}",
84-
genode_rest_api: "{{ SITEURL }}mapstore/rest/",
85-
loadAfterTheme: true,
86-
printUrl: "{{ SITEURL }}gs/pdf/info.json",
87-
translations: '',
88-
useAuthenticationRules: true,
89-
authenticationRules: [{
90-
"urlPattern": ".*geostore.*",
91-
"method": "bearer"
92-
}, {
93-
"urlPattern": ".*geoserver.*",
94-
"authkeyParamName": "access_token",
95-
"method": "authkey"
96-
}, {
97-
"urlPattern": ".*gs.*",
98-
"authkeyParamName": "access_token",
99-
"method": "authkey"
100-
}]
84+
geonode_url: defaultConfig.localConfig.geonode_url,
85+
genode_rest_api: defaultConfig.localConfig.genode_rest_api,
86+
loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
87+
printUrl: defaultConfig.localConfig.printUrl,
88+
translations: defaultConfig.localConfig.translations,
89+
useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
90+
authenticationRules: defaultConfig.localConfig.authenticationRules
10191
},
10292
plugins: MS2_PLUGINS
10393
});

‎geonode_mapstore_client/templates/geonode-mapstore-client/map_embed.html‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{% extends "./base_ms.html" %}
2+
{% load static %}
23
{% block plugins %}
3-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_base_plugins.js"></script>
4-
<script type="text/javascript" src="{{ STATIC_URL }}geonode/js/ms2/utils/ms2_map_embed_plugins.js"></script>
4+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_base_plugins.js' %}"></script>
5+
<script type="text/javascript" src="{% static 'geonode/js/ms2/utils/ms2_map_embed_plugins.js' %}"></script>
56
{% endblock %}
67
{% block style %}
78
<style>
@@ -53,27 +54,16 @@
5354
}
5455
}
5556
},
56-
proxy: "{{ SITEURL }}proxy/?url=",
57-
printingEnabled: true,
57+
proxy: defaultConfig.proxy,
58+
printingEnabled: defaultConfig.printingEnabled,
5859
localConfig: {
59-
geonode_url: "{{ SITEURL }}",
60-
genode_rest_api: "{{ SITEURL }}mapstore/rest/",
61-
loadAfterTheme: true,
62-
printUrl: "{{ SITEURL }}gs/pdf/info.json",
63-
translations: '',
64-
useAuthenticationRules: true,
65-
authenticationRules: [{
66-
"urlPattern": ".*geostore.*",
67-
"method": "bearer"
68-
}, {
69-
"urlPattern": ".*geoserver.*",
70-
"authkeyParamName": "access_token",
71-
"method": "authkey"
72-
}, {
73-
"urlPattern": ".*gs.*",
74-
"authkeyParamName": "access_token",
75-
"method": "authkey"
76-
}]
60+
geonode_url: defaultConfig.localConfig.geonode_url,
61+
genode_rest_api: defaultConfig.localConfig.genode_rest_api,
62+
loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
63+
printUrl: defaultConfig.localConfig.printUrl,
64+
translations: defaultConfig.localConfig.translations,
65+
useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
66+
authenticationRules: defaultConfig.localConfig.authenticationRules
7767
},
7868
plugins: MS2_PLUGINS
7969
});

0 commit comments

Comments
 (0)