diff options
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 20 | ||||
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 9 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/map_menu.html | 13 |
3 files changed, 18 insertions, 24 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 58a7944..5fd9cd7 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -417,27 +417,9 @@ ul#share li{ padding-top:0; } -#chimere_itinerary_panel{ - position:absolute; - z-index:5; - top:50px; - left:50px; - width:300px; - padding:0.5em; - padding-top:0; - display:none; -} - -#chimere_itinerary{ - height:250px; - overflow:auto; - padding:0.2em 1em; - font-size:0.9em; -} - #chimere_itinerary td.l{ padding:5px; - width:55px; + width:60px; } #chimere_itinerary span.j{ diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 3ffb1f9..4639a09 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -516,7 +516,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { // set the start point for routing routingFrom: function(){ $('#chimere_map_menu').hide(); - $('#chimere_itinerary_panel').hide(); + //$('#chimere_itinerary_panel').hide(); + $('#chimere_itinerary_panel').dialog('close'); settings.routing_start = new OpenLayers.Marker( settings.current_position.clone(), settings.icon_start); @@ -527,7 +528,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { // set the finish point for routing routingTo: function(){ $('#chimere_map_menu').hide(); - $('#chimere_itinerary_panel').hide(); + //$('#chimere_itinerary_panel').hide(); + $('#chimere_itinerary_panel').dialog('close'); settings.routing_end = new OpenLayers.Marker( settings.current_position.clone(), settings.icon_end); @@ -560,7 +562,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { } $('#chimere_itinerary').html( data.properties.description); - $('#chimere_itinerary_panel').show(); + //$('#chimere_itinerary_panel').show(); + $('#chimere_itinerary_panel').dialog('open'); }, error: function (data) { settings.layerRoute.removeAllFeatures(); diff --git a/chimere/templates/chimere/blocks/map_menu.html b/chimere/templates/chimere/blocks/map_menu.html index 4c78a5b..52a4107 100644 --- a/chimere/templates/chimere/blocks/map_menu.html +++ b/chimere/templates/chimere/blocks/map_menu.html @@ -12,9 +12,18 @@ </div> {% if routing %} -<div id='chimere_itinerary_panel' class='draggable ui-widget ui-corner-all'> - <h2 class='ui-widget ui-state-default ui-corner-all ui-widget-header'>{% trans "Itinerary" %}</h2> +<div id='chimere_itinerary_panel'> <div id='chimere_itinerary'> </div> </div> +<script language='javascript' type='text/javascript'> +$(document).ready(function() { + $('#chimere_itinerary_panel').dialog({ + autoOpen: false, + position: [50, 50], + title: "{% trans "Itinerary" %}", + height: 300 + }); +}); +</script> {% endif%} |