From ae87b507d36b87fcfd16248f996eedc934441ff9 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Wed, 22 Feb 2012 15:43:29 +0530
Subject: [PATCH] css

---
 chaloBEST/static/css/editstops.css | 36 +++++++++++++++++++++++++++---
 chaloBEST/static/js/editstops.js   | 24 ++++++++++++++++----
 chaloBEST/templates/editstops.html |  4 ++++
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/chaloBEST/static/css/editstops.css b/chaloBEST/static/css/editstops.css
index c388a21..7d65385 100644
--- a/chaloBEST/static/css/editstops.css
+++ b/chaloBEST/static/css/editstops.css
@@ -1,6 +1,7 @@
 html, body {
     width: 100%;
     height: 100%;
+    font-family: Arial, Helvetica, Verdana, sans-serif;
 }
 
 #wrapper {
@@ -38,6 +39,7 @@ html, body {
 
 .listItem {
     cursor: pointer;
+    font-size: 13px;
 }
 
 .tabButton {
@@ -49,12 +51,20 @@ html, body {
     padding: 4px;
 }
 
+
+.listItemText {
+    display: block;
+}
+
 .selectedListItem .listItemText {
-    color: blue;
+    background: #666;
+    color: #fff;
 }
 
 .selectedStop {
-    color: blue !important;
+    background: #ffff00;
+    color: #666 !important;
+    font-weight: bold;
 }
 
 .clear {
@@ -71,10 +81,30 @@ html, body {
 
 ul {
     list-style-type: none;
-    padding-left: 4px;
+    padding: 4px;
+    font-size: 12px;
 }
 
 .highlightedStop {
     background-color: #FFFF00;
 }
 
+#formCol {
+    font-size: 13px;
+}
+
+#formCol div {
+    margin-bottom: 4px;
+}
+
+.stopSlug {
+    font-style: italic;
+}
+
+#stopForm label {
+    display: block;
+}
+
+#stopForm input {
+    width: 90%;
+}
diff --git a/chaloBEST/static/js/editstops.js b/chaloBEST/static/js/editstops.js
index 96d0336..c567b5d 100644
--- a/chaloBEST/static/js/editstops.js
+++ b/chaloBEST/static/js/editstops.js
@@ -43,10 +43,19 @@ var API_BASE = "/1.0/",
             if ($target.data("loading")) {
                 return;
             }
-            $('.selectedListItem').find(".stopsList").hide();
+            if ($target.hasClass("selectedListItem")) {
+                $target.find(".stopsList").hide().remove();
+                $target.removeClass("selectedListItem");
+                return;
+            }
+            $('.selectedListItem').find(".stopsList").hide().remove();
             $('.selectedListItem').removeClass("selectedListItem");
             $target.addClass("selectedListItem");
             if ($target.data("hasList")) {
+                var $stopsList = $target.find(".stopsList"); 
+                $stopsList.slideDown();
+                return;
+                /*
                 var $stopsList = $target.find(".stopsList"); 
                 if (!$stopsList.is(":visible")) {
                     $stopsList.slideDown();    
@@ -54,7 +63,8 @@ var API_BASE = "/1.0/",
                     $stopsList.slideUp();
                     $target.removeClass("selectedListItem");
                 }
-                return;         
+                return;
+                */         
             } 
             var url = API_BASE + name + "/" + $target.find(".listItemText").text();
             $target.data("loading", true);
@@ -77,7 +87,7 @@ var API_BASE = "/1.0/",
                 var maxExtent = jsonLayer.getDataExtent();
                 map.zoomToExtent(maxExtent);                
                 $target.append($stopsList);
-                $target.data("hasList", true);
+                // $target.data("hasList", true);
                 $target.data("loading", false);
             });
         });
@@ -149,8 +159,9 @@ var API_BASE = "/1.0/",
         var $displayName = $('<div />').text(stop.display_name).appendTo($div);
         var $slug = $('<div />').addClass("stopSlug").text(stop.slug).appendTo($div);
         var $routes = $('<div />').text("Routes: " + stop.routes).appendTo($div); 
+//        var $formLabel = $("<div />").text("Edit:").appendTo($div);
         var $form = $('<form />').attr("id", "stopForm").appendTo($div);
-        
+        var $display_name_label = $('<label />').attr("for", "displayName").text("Display Name:").appendTo($form);;        
         var $display_name_input = $('<input />')
             .val(stop.display_name)
             .attr("id", "displayName")
@@ -158,6 +169,8 @@ var API_BASE = "/1.0/",
                 $form.submit();
              })
             .appendTo($form);
+        $('<br />').appendTo($form);
+        var $name_mr_label = $('<label />').attr("for", "displayNameMr").text("Marathi Name:").appendTo($form);
         var $name_mr_input = $('<input />')
             .val(stop.name_mr)
             .attr("id", "displayNameMr")
@@ -165,6 +178,8 @@ var API_BASE = "/1.0/",
                 $form.submit();
             })
             .appendTo($form);
+        $('<br />').appendTo($form);
+        var $alt_names_label = $('<label />').attr("for", "altNames").text("Alternative Names:").appendTo($form);
         var $alt_names_input = $('<input />')
             .val(stop.alternative_names)
             .attr("id", "altNames")
@@ -243,6 +258,7 @@ var API_BASE = "/1.0/",
                 } else {
                     var pt = new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat);
                     var feature = new OpenLayers.Feature.Vector(pt, stop);
+                    $('.selectedStop').removeClass("no_has_point").addClass("has_point");
                     //console.log("trying to add", feature);
                     jsonLayer.addFeatures([feature]);
                     mapControl.select(feature);
diff --git a/chaloBEST/templates/editstops.html b/chaloBEST/templates/editstops.html
index d981826..1f33855 100644
--- a/chaloBEST/templates/editstops.html
+++ b/chaloBEST/templates/editstops.html
@@ -1,5 +1,9 @@
 {% extends 'base.html' %}
 
+{% block title %}
+    Edit Stops
+{% endblock %}
+
 {% block head %}
 <link rel="stylesheet" href="/static/css/editstops.css" />
 <script type="text/javascript" src="/static/js/editstops.js"></script>