Merge branch 'v2.9'

Conflicts:
	chimere/static/chimere/js/jquery.chimere.js
	chimere/templates/chimere/blocks/head_chimere.html

2 files changed, 12 insertions, 12 deletions

diff --git a/chimere/templates/chimere/blocks/head_chimere.html b/chimere/templates/chimere/blocks/head_chimere.html
index 6e42c4c..2621d54 100644
--- a/chimere/templates/chimere/blocks/head_chimere.html
+++ b/chimere/templates/chimere/blocks/head_chimere.html
@@ -1,22 +1,16 @@
-{% if not is_edit %}{% for css_url in MAP_CSS_URLS %}
-<link rel="stylesheet" href="{{ css_url }}" />{% endfor %}
-{% for js_url in MAP_JS_URLS %}
-<script src="{{ js_url }}" type="text/javascript"></script>{% endfor %}
+{% if not is_edit %}
+<link rel="stylesheet" href="{{ STATIC_URL }}ol3/ol.css" />
+<link rel="stylesheet" href="{{ STATIC_URL }}ol3-contextmenu/ol3-contextmenu.min.css" />
+<script src="{{ STATIC_URL }}ol3/ol.js" type="text/javascript"></script>
 {% endif %}
-{% if routing %}<script src="{{ STATIC_URL }}chimere/js/routing-widget.js" type="text/javascript"></script>{% endif %}
-<script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}ol3-contextmenu/ol3-contextmenu.min.js" 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 }}";
-</script>
-<script src="{{ STATIC_URL }}chimere/js/utils.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}chimere/js/base.js" type="text/javascript"></script>
-<script type="text/javascript">
     var DEFAULT_ZOOM = {{ DEFAULT_ZOOM }};
     var EPSG_DISPLAY_PROJECTION = 'EPSG:{{ EPSG_DISPLAY_PROJECTION }}';
-    //OL3-deprecated: OpenLayers.ImgPath = '{{ STATIC_URL }}chimere/img/';
     var EPSG_PROJECTION = epsg_projection = 'EPSG:{{ EPSG_PROJECTION }}';
     var CENTER_LONLAT = centerLonLat = ol.proj.transform(
         [{{DEFAULT_CENTER.0|safe}}, {{DEFAULT_CENTER.1|safe}}],
@@ -24,4 +18,9 @@
     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" type="text/javascript"></script>{% endif %}
+<script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}chimere/js/utils.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}chimere/js/base.js" type="text/javascript"></script>
diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html
index 91826d1..54c9a99 100644
--- a/chimere/templates/chimere/detail.html
+++ b/chimere/templates/chimere/detail.html
@@ -141,12 +141,13 @@ $(document).ready(function(){
     $('a[data-toggle="pill"]').on('shown.bs.tab', function (e) {
         manage_tab_opening(e);
     })
-
+{% comment %}
     // $('div.media-player').jmeEmbedControls();
     $("a[rel^='prettyPhoto']").prettyPhoto({
         show_title: false,
         social_tools: ''
     });
+{% endcomment %}
 
 });
 </script>