summaryrefslogtreecommitdiff
path: root/templates/chimere
diff options
context:
space:
mode:
Diffstat (limited to 'templates/chimere')
-rw-r--r--templates/chimere/base.html2
-rw-r--r--templates/chimere/blocks/actions.html4
-rw-r--r--templates/chimere/blocks/head_chimere.html29
-rw-r--r--templates/chimere/detail.html5
-rw-r--r--templates/chimere/main_map.html12
5 files changed, 40 insertions, 12 deletions
diff --git a/templates/chimere/base.html b/templates/chimere/base.html
index de5a885..8cd0d02 100644
--- a/templates/chimere/base.html
+++ b/templates/chimere/base.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
{% load chimere_tags i18n %}
{% block extra_head %}
+<script src="{{ STATIC_URL }}jquery-ui/jquery-ui.min.js?ver={{VERSION}}" type="text/javascript"></script>
<link href='https://fonts.googleapis.com/css?family=Numans' rel='stylesheet' type='text/css'/>
<link rel="stylesheet" href="{{ STATIC_URL }}font-awesome/css/font-awesome.min.css?ver=4.3.0" />
<link rel="stylesheet" href="{{ STATIC_URL }}bootstrap/bootstrap.min.css?ver=4.3.0" />
@@ -11,7 +12,6 @@
<link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/saclay.css?ver={{SACLAY_VERSION}}" />
{% for css in EXTRA_CSS %}<link rel="stylesheet" href="{{ css }}?ver={{SACLAY_VERSION}}" />{% endfor %}
<link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/print.css?ver={{SACLAY_VERSION}}" media='print'/>
-<script src="{{ STATIC_URL }}bootstrap/bootstrap.min.js?ver=3.0.0" type="text/javascript"></script>
{% if MOBILE %}
<link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/mobile.css?ver={{VERSION}}" />
<link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/mobile.css?ver={{SACLAY_VERSION}}" />
diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html
index b98ba89..61b9a4c 100644
--- a/templates/chimere/blocks/actions.html
+++ b/templates/chimere/blocks/actions.html
@@ -13,13 +13,13 @@
{% trans "News" %}
</li>
<li id='action-project' class='dyn-page'>
- <a href='{% url 'chimere:extra_page' "" "project"%}'>{% trans "The project" %}</a>
+ <a href='{% url 'chimere:extra_page' "project" %}'>{% trans "The project" %}</a>
</li>
</ul>
<ul id='action-3' class='action'>
<li class='print-page'><a href='#'>{% trans "Print"%}</a></li>
<li class='share-list'>
- {% share_bar %}
+ {% share_bar "" "" "" %}
</li>
{%comment%}<li class='help-page'><a href='#'>{% trans "Help"%}</a></li>{%endcomment%}
</ul>
diff --git a/templates/chimere/blocks/head_chimere.html b/templates/chimere/blocks/head_chimere.html
new file mode 100644
index 0000000..fb67a61
--- /dev/null
+++ b/templates/chimere/blocks/head_chimere.html
@@ -0,0 +1,29 @@
+{% if not is_edit %}
+<link rel="stylesheet" href="{{ STATIC_URL }}ol3/ol.css?ver=3.17.1" />
+<link rel="stylesheet" href="{{ STATIC_URL }}ol3-contextmenu/ol3-contextmenu.min.css?ver=2.2.4" />
+<link rel="stylesheet" href="{{ STATIC_URL }}ol3-layerswitcher/ol3-layerswitcher.css?ver=1.1.0" />
+<script src="{{ STATIC_URL }}ol3/ol.js?ver=3.17.1" type="text/javascript"></script>
+{% endif %}
+<script src="{{ STATIC_URL }}ol3-contextmenu/ol3-contextmenu.min.js?ver=2.2.4" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}ol3-layerswitcher/ol3-layerswitcher.js?ver=1.1.0" type="text/javascript"></script>
+<script type="text/javascript">
+ /* Global variables */
+ var STATIC_URL = static_url = "{{ STATIC_URL }}";
+ var MEDIA_URL = media_path = "{{ MEDIA_URL }}";
+ var extra_url = "{{ EXTRA_URL }}";
+ var DEFAULT_ZOOM = {{ DEFAULT_ZOOM }};
+ var EPSG_DISPLAY_PROJECTION = 'EPSG:{{ EPSG_DISPLAY_PROJECTION }}';
+ var EPSG_PROJECTION = epsg_projection = 'EPSG:{{ EPSG_PROJECTION }}';
+ var CENTER_LONLAT = centerLonLat = ol.proj.transform(
+ [{{DEFAULT_CENTER.0|safe}}, {{DEFAULT_CENTER.1|safe}}],
+ EPSG_DISPLAY_PROJECTION, EPSG_PROJECTION);
+ var restricted_extent;
+ {% if area_name %}var area_name = '{{ area_name }}';{% endif %}
+ var get_share_url = '{% url 'chimere:get-share-url' %}';
+ var language = "{{LANGUAGE}}";
+</script>
+{% if routing %}<script src="{{ STATIC_URL }}chimere/js/routing-widget.js?ver={{VERSION}}" type="text/javascript"></script>{% endif %}
+<script src="{{ STATIC_URL }}bootstrap/bootstrap.min.js?ver=3.0.0" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js?ver={{VERSION}}" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}chimere/js/utils.js?ver={{VERSION}}" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}chimere/js/base.js?ver={{VERSION}}" type="text/javascript"></script>
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index a564922..4ba50ea 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -32,6 +32,8 @@
</div>
</div>
<div id='detail_footer'>
+ {% comment %}
+
<div id='detail-action-bar'>
{%if routing_enabled%}<a class='detail_from' href='#'>{% trans "From" context "routing" %}</a>
| <a class='detail_step' href='#'>{% trans "Add step" context "routing" %}</a>
@@ -39,13 +41,10 @@
{% endif %}
</div>
<ul class='share'>
- {% comment %}
<li><a href="{{modif_by_email}}">{% trans "Propose a modification" %}</a></li>
<li class='sep'>&ndash;</li>
- {% endcomment %}
</ul>
{% share_bar marker.name '' '' %}
- {% comment %}
<a href='{% if marker.route %}{% url "chimere:editroute-item" area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url 'chimere:edit-item' area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'>
{% trans "Submit a modification" %}
</a>
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 702aa13..c494f1a 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -14,9 +14,9 @@
<script type='text/javascript' language='javascript'>
<!--
var default_error_message = "{% trans "Error while loading the page... Refresh the page. If the problem persist contact the webmaster." %}";
- var edit_url = "{% url 'edit' %}";
- var edit_event_url = "{% url 'edit-event' %}";
- var edit_route_url = "{% url 'edit-route' %}";
+ var edit_url = "{% url 'editmarker' %}";
+ {# var edit_event_url = "{% url 'edit-event' %}"; #}
+ var edit_route_url = "{% url 'editroute' %}";
// -->
</script>
<script src="{{ STATIC_URL }}saclay/js/interface.js?ver={{SACLAY_VERSION}}" type="text/javascript"></script>
@@ -90,9 +90,9 @@
<span id='action-project' class='dyn-page'>
<a href='/dyn/project/'>le projet</a>
</span> |
- <a href="{% url 'chimere:extra_page' '' 'contact' %}" id='page-contact'
+ <a href="{% url 'chimere:extra_page' 'contact' %}" id='page-contact'
class='dyn-page'>contact</a> |
- <a href="{% url 'chimere:extra_page' '' 'legal' %}" id='page-legal'
+ <a href="{% url 'chimere:extra_page' 'legal' %}" id='page-legal'
class='dyn-page'>{% trans "terms of service & credits" %}</a>
</div>
</div>
@@ -133,7 +133,7 @@
<i class="fa fa-map-signs" aria-hidden="true"></i></div>{% endif %}
{% endcomment %}
<div id='default-message'></div>
- <a href="{% url 'chimere:extra_page' '' 'feedback' %}" id='page-feedback' class='dyn-page'>Suggestions</a>
+ <a href="{% url 'chimere:extra_page' 'feedback' %}" id='page-feedback' class='dyn-page'>Suggestions</a>
<script type="text/javascript">
<!--
$("#main-map").show();
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-22 17:55:53 +0000