From 551acb05271dde226267ba5c1bed5db44523eae2 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Wed, 15 Aug 2012 18:41:43 +0200
Subject: Use JQuery UI dialog for itinerary detail

---
 chimere/static/chimere/css/styles.css          | 22 ++--------------------
 chimere/static/chimere/js/jquery.chimere.js    |  9 ++++++---
 chimere/templates/chimere/blocks/map_menu.html | 13 +++++++++++--
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index f569d8f..9621344 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -63,7 +63,7 @@ div.warning, .errorlist{
 div.warning,
 #content,
 .action li.selected,
-#panel, #map-footer, #chimere_itinerary_panel,
+#panel, #map-footer,
 #utils-div{
     border:1px solid #327e04;
 }
@@ -412,27 +412,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 ed0ca02..fcf34f5 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -501,7 +501,8 @@ See the file COPYING for details.
         // 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);
@@ -512,7 +513,8 @@ See the file COPYING for details.
         // 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);
@@ -545,7 +547,8 @@ See the file COPYING for details.
                         }
                         $('#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%}
-- 
cgit v1.2.3