OL3 adaptations

5 files changed, 11 insertions, 8 deletions

diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 5c85ddb..57cfe95 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -57,8 +57,9 @@ $(function(){
     {% if p_routing_end_lon %}chimere_init_options["routing_end_lon"] = {{ p_routing_end_lon }};{% endif %}
     {% if p_routing_end_lat %}chimere_init_options["routing_end_lat"] = {{ p_routing_end_lat }};{% endif %}
     {% if p_routing_steps %}chimere_init_options["routing_steps_lonlat"] = [{{ p_routing_steps }}];{% endif %}
-    chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}},
-                                                            {{icon_offset_y}});
+    //chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}},
+    //                                                        {{icon_offset_y}});
+    chimere_init_options["icon_offset"] = ({{icon_offset_x}}, {{icon_offset_y}});
     chimere_init_options["dynamic_categories"] = {{ dynamic_categories }};
     {% if p_display_submited %}chimere_init_options["display_submited"] = {{ p_display_submited }};{% endif %}
     chimere_init_options["checked_categories"] = [{% for cc in checked_categories %}{% if forloop.counter0 > 0 %}, {% endif %}{{cc}}{% endfor %}];
@@ -82,11 +83,11 @@ $(function(){
     }
     $("#main-map").chimere(chimere_init_options);
     {% if zoom %}
-    $('#maps').chimere('zoom', {'area':{{zoom}} });
+    //$('#maps').chimere('zoom', {'area':{{zoom}} });
     {% endif %}
 
     // init layer selection
-    $(function() {
+    /* $(function() {
         {% for layer_name, js, def in map_layers %}
         $('#layer_list').append("<li><input type='radio' value='{{forloop.counter0}}' name='layer_type' id='layer_{{forloop.counter}}'{% if def %} checked='checked'{% endif %}><label for='layer_{{forloop.counter}}'>{{layer_name}}</li>");{% endfor %}
         {% for subcat in subcat_layer %}
@@ -108,6 +109,7 @@ $(function(){
         });
         highlight_selected_categories();
     });
+    */
 </script>
 <div id='marker_hover'><div id='marker_hover_content'></div></div>
 <div id='cluster_list'></div>
diff --git a/templates/chimere/blocks/news.html b/templates/chimere/blocks/news.html
index b622ef0..3f4d9ae 100644
--- a/templates/chimere/blocks/news.html
+++ b/templates/chimere/blocks/news.html
@@ -2,7 +2,7 @@
 {% if news_lst %}
 <script type='text/javascript'>
 $(function(){
-    $('#news div.media-player').jmeEmbedControls();
+    // $('#news div.media-player').jmeEmbedControls();
     $('#news video').each(function(index){$(this).pause()});
     $('#news audio').each(function(index){$(this).pause()});
     {% if display %}$('#news').modal('show');{%endif%}
diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html
index 95d6402..a1dfb56 100644
--- a/templates/chimere/blocks/welcome.html
+++ b/templates/chimere/blocks/welcome.html
@@ -2,7 +2,7 @@
 {% if news_lst or welcome_message %}
 <script type='text/javascript'>
 $(function(){
-    $('#welcome div.media-player').jmeEmbedControls();
+    //$('#welcome div.media-player').jmeEmbedControls();
     $('#welcome video').each(function(index){$(this).pause()});
     $('#welcome audio').each(function(index){$(this).pause()});
     {% if display %}$('#welcome').modal('show');{%endif%}
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index 247a53e..91505a1 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -106,7 +106,7 @@ function manage_tab_opening (event, ui) {
 }
 
 function manage_gallery_opening (event) {
-    $('div.media-player').jmeEmbedControls();
+    // $('div.media-player').jmeEmbedControls();
     $('.video div.media-player').bind('useractive', function(){
         $('div.media-controls', this).stop().animate({opacity: 1});
     }).bind('userinactive', function(){
@@ -139,7 +139,7 @@ $(document).ready(function(){
         manage_tab_opening(e);
     })
 
-    $('div.media-player').jmeEmbedControls();
+    // $('div.media-player').jmeEmbedControls();
     $("a[rel^='prettyPhoto']").prettyPhoto({
         show_title: false,
         social_tools: ''
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 90b9587..00de374 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -29,6 +29,7 @@
 {% block search_box %} {% endblock %}
 {% block content %}
     {{block.super}}
+    <div id='popup'></div>
     <div id='main-map'></div>
 <script type="text/javascript">
    $("#main-map").show();