Modification Alisonsaclay-mobile-v2.2-alison

4 files changed, 523 insertions, 495 deletions

diff --git a/static/saclay/css/mobile.css b/static/saclay/css/mobile.css
index ee31e25..c21f98a 100644
--- a/static/saclay/css/mobile.css
+++ b/static/saclay/css/mobile.css
@@ -1,9 +1,37 @@
-/* sample css file for mobile */
-
-.cloud, .close_img{
-    width:200px;
-}
-
-#detail_content{
-    max-height:100px;
-}
+/* sample css file for mobile */

+

+.cloud, .close_img{

+    width:200px;

+}

+

+#main-map {

+	top : 0;

+}

+

+#detail_content{

+    max-height:100px;

+}

+

+.map-footer, #footer-panel a, #action-routing, #search-form, #sidebar, #map_menu_step, #map_menu_zoomin, #map_menu_zoomout {

+	display:none;

+}

+

+#sidebar {

+	width:300px !important;

+	top:0px !important;

+}

+

+#map-shadow, #sidebar, #panel {

+	background-image:none !important;

+}

+

+.sidebar-handler {

+	width:37px;

+}

+

+#footer-panel {

+	background-color:#fff !important;

+	border-right:1px solid #000;

+	width:275px;

+	color:#fff;

+}

diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 037d5a8..ebb7403 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -1,233 +1,236 @@
-{% load i18n %}
-<div id='{{map_id}}'></div>
-<script type="text/javascript">
-   <!--
-$("#{{map_id}}").show();
-$(function(){
-   $('#cluster_list').dialog({'autoOpen':false,
-                              'resizable':false,
-                              'width':340,
-                              'dialogClass':'no-titlebar-small'});
-});
-   // -->
-</script>
-<div id="waiting">
-    <div id="waiting-content">
-        <img src='{{STATIC_URL}}chimere/img/ajax-loader.gif' alt='Ajax loader'/>
-        <p>{% trans "Loading of the map in progress" %}</p>
-    </div>
-</div>
-<div id="layer_selection">
-  <h4>{% trans "Display options" %}</h4>
-  <ul id='layer_list'>
-    <li class='head layer_map_type'>{% trans "Map type"%}</li>
-  </ul>
-</div>
-<script type="text/javascript">
-    <!--
-    //LIB iOS
-    var connectWebViewJavascriptBridge = function(callback) {
-        if (window.WebViewJavascriptBridge) {
-            callback(WebViewJavascriptBridge);
-        } else {
-        document.addEventListener('WebViewJavascriptBridgeReady', function() {
-                callback(WebViewJavascriptBridge);
-            }, false);
-        }
-    };
-    $('#sidebar-handler-hide').click(function(){
-        $('#sidebar').hide();
-        // Added for mobile - START //
-        //iOS
-        connectWebViewJavascriptBridge(
-            function(bridge) {
-                  if(!bridge){
-                        bridge.init(function(message, responseCallback) {
-                           if (responseCallback) {
-                               responseCallback("Right back atcha");
-                           }
-                           });
-                    }
-                bridge.send('sidebarHide');
-        }); 
-    });
-    $('#sidebar-handler-show').click(function(){
-        $('#sidebar').show();
-        // Added for mobile - START //
-        //iOS
-        connectWebViewJavascriptBridge(
-            function(bridge) {
-                  if(!bridge){
-                        bridge.init(function(message, responseCallback) {
-                           if (responseCallback) {
-                               responseCallback("Right back atcha");
-                           }
-                           });
-                    }
-                bridge.send('sidebarShow');
-        }); 
-        
-    });
-    //fin  lib ios
-    var routing_panel_open = function(){
-        $('#frm_categories').hide();
-        $('#search-box').hide();
-        $('#chimere_itinerary_panel').show();
-        $('#action-categories').removeClass('state-active');
-        $('#action-search').removeClass('state-active');
-        $('#action-routing').addClass('state-active');
-    };
-
-    $('#action-routing').click(routing_panel_open);
-
-    var category_panel_open = function(){
-        $('#chimere_itinerary_panel').hide();
-        $('#search-box').hide();
-        $('#frm_categories').show();
-        $('#action-routing').removeClass('state-active');
-        $('#action-search').removeClass('state-active');
-        $('#action-categories').addClass('state-active');
-    };
-
-    $('#action-categories').click(category_panel_open);
-
-    var search_panel_open = function(){
-        $('#chimere_itinerary_panel').hide();
-        $('#frm_categories').hide();
-        $('#search-box').show();
-        $('#action-routing').removeClass('state-active');
-        $('#action-categories').removeClass('state-active');
-        $('#action-search').addClass('state-active');
-    };
-
-    $('#action-search').click(search_panel_open);
-
-    {% if single_category %}
-    $(function() {$('#panel').hide()});{% endif %}
-    var chimere_init_options = {};
-    {% if MOBILE %}chimere_init_options["mobile"] = true;{% endif %}
-    {% if enable_clustering %}chimere_init_options["enable_clustering"] = true;{% endif %}
-    chimere_init_options["routing_panel_open"] = routing_panel_open;
-    chimere_init_options["category_accordion"] = false;
-    chimere_init_options["cluster_icon"] = new OpenLayers.Icon(
-                    STATIC_URL + "saclay/images/cluster_icon.png",
-                    new OpenLayers.Size(39, 46),
-                    new OpenLayers.Pixel(-(39/2), -(46/2)));
-    chimere_init_options["category_plus"] = STATIC_URL + "saclay/images/plus.png";
-    chimere_init_options["category_minus"] = STATIC_URL + "saclay/images/minus.png";
-    chimere_init_options["popupClass"] = OpenLayers.Popup.SaclayCloud;
-    chimere_init_options["popupClass"].imageSrc = "{{STATIC_URL}}/saclay/js/cloud-popup-saclay.png";
-    chimere_init_options["popupContentFull"] = true;
-    chimere_init_options["explicit_popup_hide"] = true;
-    chimere_init_options["edition_type_is_route"] = true;
-    chimere_init_options["display_feature_detail_fx"] = display_feature_detail;
-
-    chimere_init_options["default_icon"] = new OpenLayers.Icon(
-                    '{{STATIC_URL}}saclay/images/default_icon.png',
-                    new OpenLayers.Size(37, 42),
-                    new OpenLayers.Pixel(-(37/2), -42));
-    chimere_init_options["icon_start"] = new OpenLayers.Icon(
-                    '{{STATIC_URL}}saclay/images/routing_start.png',
-                    new OpenLayers.Size(37, 42),
-                    new OpenLayers.Pixel(-(37/2), -42));
-    chimere_init_options["icon_end"] = new OpenLayers.Icon(
-                    '{{STATIC_URL}}saclay/images/routing_end.png',
-                    new OpenLayers.Size(37, 42),
-                    new OpenLayers.Pixel(-(37/2), -42));
-    chimere_init_options["icon_step"] = new OpenLayers.Icon(
-                    '{{STATIC_URL}}saclay/images/routing_step.png',
-                    new OpenLayers.Size(37, 42),
-                    new OpenLayers.Pixel(-(37/2), -42));
-    var numZoomLevels = 7;
-    var maxZoomLevel = 19;
-    var resolutions;
-    var zoomOffset;
-    if (numZoomLevels && maxZoomLevel){
-        // variables set to be used in layer definition
-        var minZoomLevel = maxZoomLevel - numZoomLevels;
-        resolutions =
-                OpenLayers.Layer.Bing.prototype.serverResolutions.slice(
-                         maxZoomLevel - numZoomLevels,
-                         maxZoomLevel);
-        zoomOffset = minZoomLevel;
-    }
-
-    chimere_init_options["map_layers"] = [{{js_map_layers|safe|escape}}];
-    chimere_init_options['permalink_label'] = '{%trans "Permalink"%}';
-    chimere_init_options['permalink_element'] = document.getElementById('permalink');
-    chimere_init_options['routing'] = {{routing}};
-    {% if dynamic_categories %}chimere_init_options['dynamic_categories'] = true;{% endif %}
-    {% if default_area %}
-    chimere_init_options["default_area"] = new Array({{default_area.upper_left_corner.x}}, {{default_area.upper_left_corner.y}}, {{default_area.lower_right_corner.x}}, {{default_area.lower_right_corner.y}});
-    {% endif %}
-    {% if p_zoom %}chimere_init_options["zoom"] = {{ p_zoom }};{% endif %}
-    {% if p_lat %}chimere_init_options["lat"] = {{ p_lat }};{% endif %}
-    {% if p_lon %}chimere_init_options["lon"] = {{ p_lon }};{% endif %}
-    {% if p_routing_start_lon %}chimere_init_options["routing_start_lon"] = {{ p_routing_start_lon }};{% endif %}
-    {% if p_routing_start_lat %}chimere_init_options["routing_start_lat"] = {{ p_routing_start_lat }};{% endif %}
-    {% 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 %}
-    {% if p_routing_transport %}chimere_init_options["routing_transport"] = "{{ p_routing_transport }}";{% endif %}
-    {% if p_routing_speed %}chimere_init_options["routing_speed"] = "{{ p_routing_speed }}";{% endif %}
-    chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}},
-                                                               {{icon_offset_y}});
-    chimere_init_options['marker_hover_offset'] = new OpenLayers.Pixel(7, 20);
-    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 %}];
-    {% if area_id %}chimere_init_options['area_id'] = "{{area_id}}";{% endif %}
-    {% if p_current_feature %}
-    chimere_init_options["display_feature"] = {{ p_current_feature }};
-    {% endif %}
-    {% if restricted_extent %}{{ restricted_extent }}
-    chimere_init_options["restricted_extent"] = bounds;
-    {% endif %}
-    {% if selected_map_layer %}
-    chimere_init_options["selected_map_layer"] = {{selected_map_layer}};
-    {% endif %}
-    $("#{{map_id}}").chimere(chimere_init_options);
-    {% if zoom %}
-    $('#maps').chimere('zoom', {'area':{{zoom}} });
-    {% endif %}
-
-    $('#{{map_id}}').chimere('addJSON', "{{STATIC_URL}}saclay/json/limites.json");
-
-    // init layer selection
-    $(function() {
-        {% for layer_name, js, def in map_layers %}
-        $('#layer_list').append("<li class='layer_map{% if def %} selected{%endif%}'><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 %}
-        {% if not subcat.category %}
-        $('#layer_list').append("<li class='head layer_category'>{{subcat.name}}</li>");{% else %}
-        $('#layer_list').append("<li class='layer_subcat{% if subcat.pk in checked_categories %} selected{%endif%}'><input type='checkbox' name='layer_cat' value='category_{{subcat.pk}}' id='layer_cat_{{subcat.pk}}'{% if subcat.pk in checked_categories %} checked='checked'{% endif %}><label for='layer_cat_{{subcat.pk}}'>{{subcat.name}}</li>");{%endif%}{% endfor %}
-        $('#layer_selection h4').click(function(){
-            $('#layer_list').toggle();
-            if ($('#layer_list').is(':visible')){
-                $('#layer_selection h4').addClass('opened');
-            } else {
-                $('#layer_selection h4').removeClass('opened');
-            }
-        });
-        $('#layer_list input[name=layer_type]').change(function(){
-            $('#{{map_id}}').chimere('changeMapLayer', $(this).val());
-            $('li.layer_map').removeClass('selected');
-            $(this).parent().addClass('selected');
-        });
-        $('#layer_list input[name=layer_cat]').change(function(){
-            // the prop has to be called twice not to mess up with the triggered
-            // click
-            $('#'+$(this).val()).prop("checked", this.checked);
-            $('#'+$(this).val()).trigger('click');
-            $('#'+$(this).val()).prop("checked", this.checked);
-            if (this.checked){
-                $(this).parent().addClass('selected');
-            } else {
-                $(this).parent().removeClass('selected');
-            }
-        });
-    });
-    // -->
-</script>
-<div id='marker_hover'><div id='marker_hover_content'></div></div>
-<div id='cluster_list'></div>
+{% load i18n %}

+<div id='{{map_id}}'></div>

+<script type="text/javascript">

+   <!--

+$("#{{map_id}}").show();

+$(function(){

+   $('#cluster_list').dialog({'autoOpen':false,

+                              'resizable':false,

+                              'width':340,

+                              'dialogClass':'no-titlebar-small'});

+});

+   // -->

+</script>

+{% if not MOBILE %}

+<div id="waiting">

+    <div id="waiting-content">

+        <img src='{{STATIC_URL}}chimere/img/ajax-loader.gif' alt='Ajax loader'/>

+        <p>{% trans "Loading of the map in progress" %}</p>

+    </div>

+</div>

+<div id="layer_selection">

+  <h4>{% trans "Display options" %}</h4>

+  <ul id='layer_list'>

+    <li class='head layer_map_type'>{% trans "Map type"%}</li>

+  </ul>

+</div>

+{% endif %}

+<script type="text/javascript">

+    <!--

+    //LIB iOS

+    var connectWebViewJavascriptBridge = function(callback) {

+        if (window.WebViewJavascriptBridge) {

+            callback(WebViewJavascriptBridge);

+        } else {

+        document.addEventListener('WebViewJavascriptBridgeReady', function() {

+                callback(WebViewJavascriptBridge);

+            }, false);

+        }

+    };

+    $('#sidebar-handler-hide').click(function(){

+        $('#sidebar').hide();

+        // Added for mobile - START //

+        //iOS

+        connectWebViewJavascriptBridge(

+            function(bridge) {

+                  if(!bridge){

+                        bridge.init(function(message, responseCallback) {

+                           if (responseCallback) {

+                               responseCallback("Right back atcha");

+                           }

+                           });

+                    }

+                bridge.send('sidebarHide');

+        }); 

+    	window.JSInterface.sidebarHide();

+    });

+    $('#sidebar-handler-show').click(function(){

+        $('#sidebar').show();

+        // Added for mobile - START //

+        //iOS

+        connectWebViewJavascriptBridge(

+            function(bridge) {

+                  if(!bridge){

+                        bridge.init(function(message, responseCallback) {

+                           if (responseCallback) {

+                               responseCallback("Right back atcha");

+                           }

+                           });

+                    }

+                bridge.send('sidebarShow');

+        });

+		window.JSInterface.sidebarShow();

+    });

+    //fin  lib ios    

+    var routing_panel_open = function(){

+        $('#frm_categories').hide();

+        $('#search-box').hide();

+        $('#chimere_itinerary_panel').show();

+        $('#action-categories').removeClass('state-active');

+        $('#action-search').removeClass('state-active');

+        $('#action-routing').addClass('state-active');

+    };

+

+    $('#action-routing').click(routing_panel_open);

+

+    var category_panel_open = function(){

+        $('#chimere_itinerary_panel').hide();

+        $('#search-box').hide();

+        $('#frm_categories').show();

+        $('#action-routing').removeClass('state-active');

+        $('#action-search').removeClass('state-active');

+        $('#action-categories').addClass('state-active');

+    };

+

+    $('#action-categories').click(category_panel_open);

+

+    var search_panel_open = function(){

+        $('#chimere_itinerary_panel').hide();

+        $('#frm_categories').hide();

+        $('#search-box').show();

+        $('#action-routing').removeClass('state-active');

+        $('#action-categories').removeClass('state-active');

+        $('#action-search').addClass('state-active');

+    };

+

+    $('#action-search').click(search_panel_open);

+

+    {% if single_category %}

+    $(function() {$('#panel').hide()});{% endif %}

+    var chimere_init_options = {};

+    {% if MOBILE %}chimere_init_options["mobile"] = true;{% endif %}

+    {% if enable_clustering %}chimere_init_options["enable_clustering"] = true;{% endif %}

+    chimere_init_options["routing_panel_open"] = routing_panel_open;

+    chimere_init_options["category_accordion"] = false;

+    chimere_init_options["cluster_icon"] = new OpenLayers.Icon(

+                    STATIC_URL + "saclay/images/cluster_icon.png",

+                    new OpenLayers.Size(39, 46),

+                    new OpenLayers.Pixel(-(39/2), -(46/2)));

+    chimere_init_options["category_plus"] = STATIC_URL + "saclay/images/plus.png";

+    chimere_init_options["category_minus"] = STATIC_URL + "saclay/images/minus.png";

+    chimere_init_options["popupClass"] = OpenLayers.Popup.SaclayCloud;

+    chimere_init_options["popupClass"].imageSrc = "{{STATIC_URL}}/saclay/js/cloud-popup-saclay.png";

+    chimere_init_options["popupContentFull"] = true;

+    chimere_init_options["explicit_popup_hide"] = true;

+    chimere_init_options["edition_type_is_route"] = true;

+    chimere_init_options["display_feature_detail_fx"] = display_feature_detail;

+

+    chimere_init_options["default_icon"] = new OpenLayers.Icon(

+                    '{{STATIC_URL}}saclay/images/default_icon.png',

+                    new OpenLayers.Size(37, 42),

+                    new OpenLayers.Pixel(-(37/2), -42));

+    chimere_init_options["icon_start"] = new OpenLayers.Icon(

+                    '{{STATIC_URL}}saclay/images/routing_start.png',

+                    new OpenLayers.Size(37, 42),

+                    new OpenLayers.Pixel(-(37/2), -42));

+    chimere_init_options["icon_end"] = new OpenLayers.Icon(

+                    '{{STATIC_URL}}saclay/images/routing_end.png',

+                    new OpenLayers.Size(37, 42),

+                    new OpenLayers.Pixel(-(37/2), -42));

+    chimere_init_options["icon_step"] = new OpenLayers.Icon(

+                    '{{STATIC_URL}}saclay/images/routing_step.png',

+                    new OpenLayers.Size(37, 42),

+                    new OpenLayers.Pixel(-(37/2), -42));

+    var numZoomLevels = 7;

+    var maxZoomLevel = 19;

+    var resolutions;

+    var zoomOffset;

+    if (numZoomLevels && maxZoomLevel){

+        // variables set to be used in layer definition

+        var minZoomLevel = maxZoomLevel - numZoomLevels;

+        resolutions =

+                OpenLayers.Layer.Bing.prototype.serverResolutions.slice(

+                         maxZoomLevel - numZoomLevels,

+                         maxZoomLevel);

+        zoomOffset = minZoomLevel;

+    }

+

+    chimere_init_options["map_layers"] = [{{js_map_layers|safe|escape}}];

+    chimere_init_options['permalink_label'] = '{%trans "Permalink"%}';

+    chimere_init_options['permalink_element'] = document.getElementById('permalink');

+    chimere_init_options['routing'] = {{routing}};

+    {% if dynamic_categories %}chimere_init_options['dynamic_categories'] = true;{% endif %}

+    {% if default_area %}

+    chimere_init_options["default_area"] = new Array({{default_area.upper_left_corner.x}}, {{default_area.upper_left_corner.y}}, {{default_area.lower_right_corner.x}}, {{default_area.lower_right_corner.y}});

+    {% endif %}

+    {% if p_zoom %}chimere_init_options["zoom"] = {{ p_zoom }};{% endif %}

+    {% if p_lat %}chimere_init_options["lat"] = {{ p_lat }};{% endif %}

+    {% if p_lon %}chimere_init_options["lon"] = {{ p_lon }};{% endif %}

+    {% if p_routing_start_lon %}chimere_init_options["routing_start_lon"] = {{ p_routing_start_lon }};{% endif %}

+    {% if p_routing_start_lat %}chimere_init_options["routing_start_lat"] = {{ p_routing_start_lat }};{% endif %}

+    {% 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 %}

+    {% if p_routing_transport %}chimere_init_options["routing_transport"] = "{{ p_routing_transport }}";{% endif %}

+    {% if p_routing_speed %}chimere_init_options["routing_speed"] = "{{ p_routing_speed }}";{% endif %}

+    chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}},

+                                                               {{icon_offset_y}});

+    chimere_init_options['marker_hover_offset'] = new OpenLayers.Pixel(7, 20);

+    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 %}];

+    {% if area_id %}chimere_init_options['area_id'] = "{{area_id}}";{% endif %}

+    {% if p_current_feature %}

+    chimere_init_options["display_feature"] = {{ p_current_feature }};

+    {% endif %}

+    {% if restricted_extent %}{{ restricted_extent }}

+    chimere_init_options["restricted_extent"] = bounds;

+    {% endif %}

+    {% if selected_map_layer %}

+    chimere_init_options["selected_map_layer"] = {{selected_map_layer}};

+    {% endif %}

+    $("#{{map_id}}").chimere(chimere_init_options);

+    {% if zoom %}

+    $('#maps').chimere('zoom', {'area':{{zoom}} });

+    {% endif %}

+

+    $('#{{map_id}}').chimere('addJSON', "{{STATIC_URL}}saclay/json/limites.json");

+

+    // init layer selection

+    $(function() {

+        {% for layer_name, js, def in map_layers %}

+        $('#layer_list').append("<li class='layer_map{% if def %} selected{%endif%}'><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 %}

+        {% if not subcat.category %}

+        $('#layer_list').append("<li class='head layer_category'>{{subcat.name}}</li>");{% else %}

+        $('#layer_list').append("<li class='layer_subcat{% if subcat.pk in checked_categories %} selected{%endif%}'><input type='checkbox' name='layer_cat' value='category_{{subcat.pk}}' id='layer_cat_{{subcat.pk}}'{% if subcat.pk in checked_categories %} checked='checked'{% endif %}><label for='layer_cat_{{subcat.pk}}'>{{subcat.name}}</li>");{%endif%}{% endfor %}

+        $('#layer_selection h4').click(function(){

+            $('#layer_list').toggle();

+            if ($('#layer_list').is(':visible')){

+                $('#layer_selection h4').addClass('opened');

+            } else {

+                $('#layer_selection h4').removeClass('opened');

+            }

+        });

+        $('#layer_list input[name=layer_type]').change(function(){

+            $('#{{map_id}}').chimere('changeMapLayer', $(this).val());

+            $('li.layer_map').removeClass('selected');

+            $(this).parent().addClass('selected');

+        });

+        $('#layer_list input[name=layer_cat]').change(function(){

+            // the prop has to be called twice not to mess up with the triggered

+            // click

+            $('#'+$(this).val()).prop("checked", this.checked);

+            $('#'+$(this).val()).trigger('click');

+            $('#'+$(this).val()).prop("checked", this.checked);

+            if (this.checked){

+                $(this).parent().addClass('selected');

+            } else {

+                $(this).parent().removeClass('selected');

+            }

+        });

+    });

+    // -->

+</script>

+<div id='marker_hover'><div id='marker_hover_content'></div></div>

+<div id='cluster_list'></div>

diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index e1a7563..f82a5e6 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -1,114 +1,117 @@
-{% load i18n sanitize chimere_tags %}
-<a href='#' class='close_img'>{% trans "Close"%}</a>
-<h4>{{ marker.name }}</h4>
-<div id='detail_content'>
-    {% if marker.default_pictures or marker.default_pictures or marker.default_multimedia_items%}
-    <div class='small-gallery'>
-    {% for picture in marker.default_pictures %}
-        {% multimedia_render picture %}
-    {%endfor%}
-    {% for multimedia_item in marker.default_multimedia_items %}
-        {% multimedia_render multimedia_item %}
-    {%endfor%}
-    {% for item in marker.multimedia_items %}
-        {% multimedia_render item %}
-    {%endfor%}
-    </div>
-    {%endif%}
-    <div>
-        {% if dated %}
-        <p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}}
-        {% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span>
-        {% endif %}
-        {% if marker.description %}
-        <div id='description_long_{{marker.pk}}' class='description'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th img img:src"|safe}}</div>
-        {% endif %}
-        {% for property in marker.getProperties %}{% if property.value %}
-        <div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value or 'https://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th img img:src"|safe}}{% if 'http://' in property.value or 'https://' in property.value %}</a>{%endif%}</div>
-        {%endif%}{% endfor %}
-        {% if marker.origin %}
-        <div class='origin'><label>Source :</label> {{marker.origin|safe}}</div>
-        {% endif %}
-        {% if marker.multimedia_items %}
-        <a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
-        {% endif %}
-    </div>
-</div>
-<div id='detail_footer'>
-    <div id='detail-action-bar'>
-        {%if routing_enabled%}<a class='detail_from' href='#'>{% trans "From" context "routing" %}</a>
-        | <a class='detail_to' href='#'>{% trans "To" context "routing" %}</a>
-        | {% endif %}<a class='detail_zoomin' href='#'>{% trans "Zoom in" %}</a>
-        | <a class='detail_zoomout' href='#'>{% trans "Zoom out" %}</a>
-    </div>
-    <ul class='share'>
-        <li><a href="{{modif_by_email}}">{% trans "Propose a modification" %}</a></li>
-        <li class='sep'>&ndash;</li>
-    </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>
-    {% endcomment %}
-</div>
-{% if marker.multimedia_items %}
-<div id='gallery-{{marker.pk}}' class='gallery'>
-    <div class='tabs'>
-        <ul>{% for item in marker.multimedia_items %}
-            <li><a href="#tab-{{ forloop.counter }}">{{ item.name }}</a></li>{% endfor %}
-        </ul>
-        {% for multimedia_item in marker.multimedia_items %}
-        <div id="tab-{{ forloop.counter }}" class='{% ifequal multimedia_item.multimedia_type.media_type 'V' %}video{% else %}other{% endifequal %}'>
-            {% multimedia_render multimedia_item %}
-        </div>{% endfor %}
-    </div>
-</div>
-{% endif %}
-<script language='javascript' type='text/javascript'>
-<!--
-$('html').addClass('js-on');
-$(function(){
-    $("#gallery-{{marker.pk}}").dialog({title:"{{marker.name}}", autoOpen: false,
-                           height: "auto", width: "auto", dialogClass:'no-titlebar'});
-    $('div.media-player').jmeEmbedControls();
-    $('.tabs').tabs({
-        select: function(event, ui) {
-            //pause all medias
-            $('video').each(function(index){$(this).pause()});
-            $('audio').each(function(index){$(this).pause()});
-            //start current tabvideo
-            $('ui.panel video').each(function(index){
-                //prevents a Flash-Bug in IE with newest Flash-Player
-                $(this).reinitMedia({queue: true})
-                .play()
-            ;});
-            $('ui.panel audio').each(function(index){
-                //prevents a Flash-Bug in IE with newest Flash-Player
-                $(this).reinitMedia({queue: true})
-                .play()
-            ;});
-        }
-    });
-    $('.video div.media-player').bind('useractive', function(){
-        $('div.media-controls', this).stop().animate({opacity: 1});
-    }).bind('userinactive', function(){
-        $('div.media-controls', this).stop().animate({opacity: 0});
-    });
-});
-$("#gallery-{{marker.pk}}").bind( "dialogopen", function(event, ui) {
-    $("#gallery-{{marker.pk}}").dialog("option", "height", 'auto');
-    $("#gallery-{{marker.pk}}").dialog("option", "width", 'auto');
-    $("#gallery-{{marker.pk}}").dialog("option", "position", ['center', 'center']);
-});
-$("#gallery-{{marker.pk}}").bind( "dialogclose", function(event, ui) {
-    //pause all medias
-    $('video').each(function(index){$(this).pause()});
-    $('audio').each(function(index){$(this).pause()});
-});
-$('#show_gallery_link').click(function(){
-    $("#gallery-{{marker.pk}}").dialog('open');
-    return false;
-});
-// -->
-</script>
+{% load i18n sanitize chimere_tags %}

+<a href='#' class='close_img'>{% trans "Close"%}</a>

+<h4>{{ marker.name }}</h4>

+<div id='detail_content'>

+    {% if marker.default_pictures or marker.default_pictures or marker.default_multimedia_items%}

+    <div class='small-gallery'>

+    {% for picture in marker.default_pictures %}

+        {% multimedia_render picture %}

+    {%endfor%}

+    {% for multimedia_item in marker.default_multimedia_items %}

+        {% multimedia_render multimedia_item %}

+    {%endfor%}

+    {% for item in marker.multimedia_items %}

+        {% multimedia_render item %}

+    {%endfor%}

+    </div>

+    {%endif%}

+    <div>

+        {% if dated %}

+        <p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}}

+        {% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span>

+        {% endif %}

+        {% if marker.description %}

+        <div id='description_long_{{marker.pk}}' class='description'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th img img:src"|safe}}</div>

+        {% endif %}

+        {% for property in marker.getProperties %}{% if property.value %}

+        <div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value or 'https://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th img img:src"|safe}}{% if 'http://' in property.value or 'https://' in property.value %}</a>{%endif%}</div>

+        {%endif%}{% endfor %}

+        {% if marker.origin %}

+        <div class='origin'><label>Source :</label> {{marker.origin|safe}}</div>

+        {% endif %}

+        {% if marker.multimedia_items %}

+        <a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>

+        {% endif %}

+    </div>

+</div>

+<div id='detail_footer'>

+    <div id='detail-action-bar'>

+        {%if routing_enabled%}<a class='detail_from' href='#'>{% trans "From" context "routing" %}</a>

+        | <a class='detail_to' href='#'>{% trans "To" context "routing" %}</a>

+        {% endif %}

+        {% if not MOBILE %}

+        |<a class='detail_zoomin' href='#'>{% trans "Zoom in" %}</a>

+        | <a class='detail_zoomout' href='#'>{% trans "Zoom out" %}</a>

+        {% endif %}

+    </div>

+    <ul class='share'>

+        <li><a href="{{modif_by_email}}">{% trans "Propose a modification" %}</a></li>

+        <li class='sep'>&ndash;</li>

+    </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>

+    {% endcomment %}

+</div>

+{% if marker.multimedia_items %}

+<div id='gallery-{{marker.pk}}' class='gallery'>

+    <div class='tabs'>

+        <ul>{% for item in marker.multimedia_items %}

+            <li><a href="#tab-{{ forloop.counter }}">{{ item.name }}</a></li>{% endfor %}

+        </ul>

+        {% for multimedia_item in marker.multimedia_items %}

+        <div id="tab-{{ forloop.counter }}" class='{% ifequal multimedia_item.multimedia_type.media_type 'V' %}video{% else %}other{% endifequal %}'>

+            {% multimedia_render multimedia_item %}

+        </div>{% endfor %}

+    </div>

+</div>

+{% endif %}

+<script language='javascript' type='text/javascript'>

+<!--

+$('html').addClass('js-on');

+$(function(){

+    $("#gallery-{{marker.pk}}").dialog({title:"{{marker.name}}", autoOpen: false,

+                           height: "auto", width: "auto", dialogClass:'no-titlebar'});

+    $('div.media-player').jmeEmbedControls();

+    $('.tabs').tabs({

+        select: function(event, ui) {

+            //pause all medias

+            $('video').each(function(index){$(this).pause()});

+            $('audio').each(function(index){$(this).pause()});

+            //start current tabvideo

+            $('ui.panel video').each(function(index){

+                //prevents a Flash-Bug in IE with newest Flash-Player

+                $(this).reinitMedia({queue: true})

+                .play()

+            ;});

+            $('ui.panel audio').each(function(index){

+                //prevents a Flash-Bug in IE with newest Flash-Player

+                $(this).reinitMedia({queue: true})

+                .play()

+            ;});

+        }

+    });

+    $('.video div.media-player').bind('useractive', function(){

+        $('div.media-controls', this).stop().animate({opacity: 1});

+    }).bind('userinactive', function(){

+        $('div.media-controls', this).stop().animate({opacity: 0});

+    });

+});

+$("#gallery-{{marker.pk}}").bind( "dialogopen", function(event, ui) {

+    $("#gallery-{{marker.pk}}").dialog("option", "height", 'auto');

+    $("#gallery-{{marker.pk}}").dialog("option", "width", 'auto');

+    $("#gallery-{{marker.pk}}").dialog("option", "position", ['center', 'center']);

+});

+$("#gallery-{{marker.pk}}").bind( "dialogclose", function(event, ui) {

+    //pause all medias

+    $('video').each(function(index){$(this).pause()});

+    $('audio').each(function(index){$(this).pause()});

+});

+$('#show_gallery_link').click(function(){

+    $("#gallery-{{marker.pk}}").dialog('open');

+    return false;

+});

+// -->

+</script>

diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 9dce672..01d9ff5 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -1,139 +1,133 @@
-{% extends "chimere/base.html" %}
-{% load i18n unlocalize_point chimere_tags %}
-{% block extra_head %}
-{% head_jquery %}
-{% head_chimere %}
-{% head_jme %}
-{% head_form %}
-<script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}saclay/js/SaclayCloud.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}saclay/js/jquery.form.js" type="text/javascript"></script>
-{% if has_search %}
-<script src="{{ STATIC_URL }}saclay/js/search.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}chimere/js/search-autocomplete.js" type="text/javascript"></script>{% endif %}
-
-<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 %}";
-    // -->
-</script>
-<script src="{{ STATIC_URL }}saclay/js/interface.js" type="text/javascript"></script>
-{{ block.super }}
-{% endblock %}
-{% block message_edit %}{% endblock %}
-{% block sidebar %}
-    <div class='sidebar-handler' id='sidebar-handler-hide'>
-    </div>
-    {% comment %}
-    <!-- SUPPRIME POUR LA VUE MOBILE 
-    <div id='action-panel'{% if has_search %} class='three'{% endif %}>
-        <ul id='map-actions' class='action'>
-            <li id='action-categories' class='state-active'>
-                <label>{% trans "Categories" %}</label>
-            </li>{% if has_search %}<li id='action-search'>
-                <label>{% trans "Search" %}</label>
-            </li>{% endif %}{% if itinerary_form %}
-            <li id='action-routing'>
-                <label>{% trans "Routing" %}</label>
-            </li>{% endif %}
-        </ul>
-        <ul id='edit-actions' class='action'>
-            <li id='action-edit-marker' class='state-active'>
-                <label>{% trans "Location" %}</label>
-            </li>
-            <li id='action-edit-route'>
-                <label>{% trans "Wander" %}</label>
-            </li>
-            <li id='action-edit-event'>
-                <label>{% trans "Event" %}</label>
-            </li>
-        </ul>
-    </div>
-    FIN SUPPRESSION POUR LA VUE -->
-    {% endcomment %}
-    <div id='panel'>
-        <div id='map-panel'>
-            <form action='.' method='post' name='frm_categories' id='frm_categories'>
-                <div id='categories'>{# dynamic content #}
-                </div>
-            </form>
-            <div id='search-box'></div>
-            {% routing %}
-        </div>
-        <div id='edit-panel'>
-            <div id='frm-edit-marker'>{# dynamic content #}
-            </div>
-            <div id='frm-edit-route'>{# dynamic content #}
-            </div>
-            <div id='frm-edit-event'>{# dynamic content #}
-            </div>
-        </div>
-    </div>
-    {% comment %}
-    <!-- SUPPRIME POUR LA VUE MOBILE 
-    <div class='footer' id='footer-panel'>
-        {% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact us" %}</a> | {% endif %}
-        <a href='{% url chimere:extra_page '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service, credits" %}</a>
-    </div>
-    FIN SUPPRESSION POUR LA VUE -->
-    {% endcomment %}
-{% endblock %}
-{% block content %}
-    <div id='category_description'>
-    </div>
-    <script type='text/javascript'>
-    $(function(){
-        $('#category_description').dialog({'autoOpen':false, width:630,
-                                           'dialogClass':'no-titlebar'});
-    });
-    </script>
-    <div class='sidebar-handler' id='sidebar-handler-show'>
-    </div>
-    <div id='detail' class='ui-widget ui-corner-all'></div>
-    {% if not itinerary_form %}<div class='map_button'>
-        <a href='#' id='button-move-map' class='toggle-button toggle-button-active' onclick='toggleDrawOff();return false;'>
-            {% trans "Move on the map" %}
-        </a>
-        <a href='#' id='button-draw-map' class='toggle-button toggle-button-inactive' onclick='toggleDrawOn();return false;'>
-            {% trans "Draw" %}
-        </a>
-    </div>{% endif %}
-    <div id='permalink'></div>
-    {% if simple %}
-        {% display_welcome 0 %}
-    {%else%}
-        {% display_welcome news_visible %}
-    {% endif %}
-    {% display_news news_visible %}
-    {{ block.super }}
-    <div id='map-shadow'></div>
-    <div id='default-message'></div>
-<script type="text/javascript">
-   <!--
-   $("#main-map").show();
-   var has_search = {% if has_search %}true{% else %}false{% endif %};
-   // array to keep trace of already displayed items
-   var search_result = new Array();
-   var search_url = "/search/";
-   $(function(){
-       if (has_search){
-           load_search_box();
-       }
-   });
-   // -->
-</script>
-    {% map_menu %}
-    {% map 'main-map' %}
-    <div id='chimere_message'></div>
-    <script type='text/javascript'>
-    $(function(){$('#chimere_message').dialog({'autoOpen':false,
-                      dialogClass:'no-titlebar-simple', position:'right bottom',
-                      resizable: false});});
-    </script>
-{% endblock %}
-{% block footer %}
-    <p class='map-footer'>{% include "chimere/blocks/footer.html" %}</p>
-{% endblock %}
+{% extends "chimere/base.html" %}

+{% load i18n unlocalize_point chimere_tags %}

+{% block extra_head %}

+{% head_jquery %}

+{% head_chimere %}

+{% head_jme %}

+{% head_form %}

+<script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script>

+<script src="{{ STATIC_URL }}saclay/js/SaclayCloud.js" type="text/javascript"></script>

+<script src="{{ STATIC_URL }}saclay/js/jquery.form.js" type="text/javascript"></script>

+{% if has_search %}

+<script src="{{ STATIC_URL }}saclay/js/search.js" type="text/javascript"></script>

+<script src="{{ STATIC_URL }}chimere/js/search-autocomplete.js" type="text/javascript"></script>{% endif %}

+

+<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 %}";

+    // -->

+</script>

+<script src="{{ STATIC_URL }}saclay/js/interface.js" type="text/javascript"></script>

+{{ block.super }}

+{% endblock %}

+{% block message_edit %}{% endblock %}

+{% block sidebar %}

+    <div class='sidebar-handler' id='sidebar-handler-hide'>

+    </div>

+    <div id='action-panel'{% if has_search %} class='three'{% endif %}>

+        <ul id='map-actions' class='action'>

+            <li id='action-categories' class='state-active'>

+                <label>{% trans "Categories" %}</label>

+            </li>{% if has_search %}<li id='action-search'>

+                <label>{% trans "Search" %}</label>

+            </li>{% endif %}{% if itinerary_form %}

+            <li id='action-routing'>

+                <label>{% trans "Routing" %}</label>

+            </li>{% endif %}

+        </ul>

+        <ul id='edit-actions' class='action'>

+            <li id='action-edit-marker' class='state-active'>

+                <label>{% trans "Location" %}</label>

+            </li>

+            <li id='action-edit-route'>

+                <label>{% trans "Wander" %}</label>

+            </li>

+            <li id='action-edit-event'>

+                <label>{% trans "Event" %}</label>

+            </li>

+        </ul>

+    </div>

+    <div id='panel'>

+        <div id='map-panel'>

+            <form action='.' method='post' name='frm_categories' id='frm_categories'>

+                <div id='categories'>{# dynamic content #}

+                </div>

+            </form>

+            <div id='search-box'></div>

+            {% routing %}

+        </div>

+        <div id='edit-panel'>

+            <div id='frm-edit-marker'>{# dynamic content #}

+            </div>

+            <div id='frm-edit-route'>{# dynamic content #}

+            </div>

+            <div id='frm-edit-event'>{# dynamic content #}

+            </div>

+        </div>

+    </div>

+    <div class='footer' id='footer-panel'>

+        {% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact us" %}</a> | {% endif %}

+        <a href='{% url chimere:extra_page '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service, credits" %}</a>

+    </div>

+{% endblock %}

+{% block content %}

+    <div id='category_description'>

+    </div>

+    <script type='text/javascript'>

+    $(function(){

+        $('#category_description').dialog({'autoOpen':false, width:630,

+                                           'dialogClass':'no-titlebar'});

+    });

+    </script>

+    <div class='sidebar-handler' id='sidebar-handler-show'>

+    </div>

+    <div id='detail' class='ui-widget ui-corner-all'></div>

+    {% if not itinerary_form %}<div class='map_button'>

+        <a href='#' id='button-move-map' class='toggle-button toggle-button-active' onclick='toggleDrawOff();return false;'>

+            {% trans "Move on the map" %}

+        </a>

+        <a href='#' id='button-draw-map' class='toggle-button toggle-button-inactive' onclick='toggleDrawOn();return false;'>

+            {% trans "Draw" %}

+        </a>

+    </div>{% endif %}

+    <div id='permalink'></div>

+    {% if not MOBILE %}

+    	{% if simple %}

+        	{% display_welcome 0 %}

+    	{%else%}

+        	{% display_welcome news_visible %}

+    	{% endif %}

+    	{% display_news news_visible %}

+	{% endif %}

+    {{ block.super }}

+    <div id='map-shadow'></div>

+    <div id='default-message'></div>

+<script type="text/javascript">

+   <!--

+   $("#main-map").show();

+   var has_search = {% if has_search %}true{% else %}false{% endif %};

+   // array to keep trace of already displayed items

+   var search_result = new Array();

+   var search_url = "/search/";

+   $(function(){

+       if (has_search){

+           load_search_box();

+       }

+   });

+   // -->

+</script>

+    {% map_menu %}

+    {% map 'main-map' %}

+    <div id='chimere_message'></div>

+    <script type='text/javascript'>

+    $(function(){$('#chimere_message').dialog({'autoOpen':false,

+                      dialogClass:'no-titlebar-simple', position:'right bottom',

+                      resizable: false});});

+    </script>

+{% endblock %}

+{% block footer %}

+    <p class='map-footer'>{% include "chimere/blocks/footer.html" %}</p>

+{% endblock %}