From c50b224c235c25c5c30760603617901af634af30 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Fri, 5 Oct 2012 17:25:44 +0530
Subject: [PATCH 1/4] remove instructions right now

---
 chaloBEST/mumbai/apiviews.py     | 2 ++
 smsBEST/templates/dashboard.html | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/chaloBEST/mumbai/apiviews.py b/chaloBEST/mumbai/apiviews.py
index 09e0b6a..cd4b003 100644
--- a/chaloBEST/mumbai/apiviews.py
+++ b/chaloBEST/mumbai/apiviews.py
@@ -87,6 +87,8 @@ def stops(request):
 def stop(request, slug):
     srid = int(request.GET.get("srid", 4326))
     if request.POST and request.POST.has_key('geojson'):
+        if not request.user.is_staff():
+            return render_to_json_response({'error': 'No permission'})
         if not slug:
             stop = Stop() #FIXME: should this return an error instead?
         else:
diff --git a/smsBEST/templates/dashboard.html b/smsBEST/templates/dashboard.html
index 69d70d1..c9a7a53 100755
--- a/smsBEST/templates/dashboard.html
+++ b/smsBEST/templates/dashboard.html
@@ -121,6 +121,7 @@ $(function() {
 
 <!-- <h1> Short Instructions</h1> -->
 <h2> Welcome!</h2>
+<!--
 <ul><li class="english"> With this service, you can send and receive simple queries by SMS about bus stops, bus numbers and routing on BEST.<br><br>Send SMS to <number>9619524420</number> and you will receive a return SMS with the information you need.
 </li><li class="marathi"> चलोबेस्टद्वारे आपल्याला वेगवेगळ्या  बेस्ट बसस्थानकांची, बसक्रमांकाची तसेच बसमार्गांची माहिती SMS ने मिळू शकते. <br><br>आपला SMS <number>९६१९५२४४२०</number> या क्रमांकावर पाठवावा, आम्ही आपल्याला पाहिजे असलेली माहिती SMS द्वारे परत पाठवू.
 </li><li class="hindi"> इस सुविधा से आप साधारण SMS के ज़रिये बेस्ट बस स्टॉप, बस क्रमांक और मार्गों की जानकारी पा सकते हैं| <br><br><number>9619524420</number> ईस नंबर पर SMS भेजनेपर आपको जवाबी SMS से जरुरी जानकारी मिलेगी।
@@ -154,7 +155,7 @@ $(function() {
 </li><li class="hindi"> चलोबेस्ट सेवा की फिलहाल जाँच शुरु है। जल्दही हम ये सेवा पुरी तरह से शुरु करेंगे। ईस सेवा के बारे में आपके विचार और प्रतिक्रिया जानने पर हमें खुशी होगी। आप हमें  info@chalobest.in ईस ईमेल पर अपनी राय दे सकते है।
 </li><li class="gujarati"> ચલોબેસ્ટ હાલ પ્રાયોગિક ધોરણે દાખલ કરેલ છે. જાહેર ઉપયોગ માટે ટૂંક સમય માં એનું વિમોચન થશે. info@chalobest.in પર ઈ-મેઈલ  દ્વારા તમારી પ્રતિક્રિયા તેમજ સૂચન નું આવકાર છે.
 </li></ul>
-
+-->
 </div>
 
 <!--

From 4a2995f573654ac5a0a8ab99bca20d368695bfdb Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Fri, 5 Oct 2012 17:26:47 +0530
Subject: [PATCH 2/4] link to instructions:

---
 smsBEST/templates/dashboard.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/smsBEST/templates/dashboard.html b/smsBEST/templates/dashboard.html
index c9a7a53..b9520cd 100755
--- a/smsBEST/templates/dashboard.html
+++ b/smsBEST/templates/dashboard.html
@@ -121,6 +121,8 @@ $(function() {
 
 <!-- <h1> Short Instructions</h1> -->
 <h2> Welcome!</h2>
+<br />
+<a href="http://chalobest.in/sms">click here for instructions</a>
 <!--
 <ul><li class="english"> With this service, you can send and receive simple queries by SMS about bus stops, bus numbers and routing on BEST.<br><br>Send SMS to <number>9619524420</number> and you will receive a return SMS with the information you need.
 </li><li class="marathi"> चलोबेस्टद्वारे आपल्याला वेगवेगळ्या  बेस्ट बसस्थानकांची, बसक्रमांकाची तसेच बसमार्गांची माहिती SMS ने मिळू शकते. <br><br>आपला SMS <number>९६१९५२४४२०</number> या क्रमांकावर पाठवावा, आम्ही आपल्याला पाहिजे असलेली माहिती SMS द्वारे परत पाठवू.

From 7019c75d080d7d4ed374182ea2e6fe82710e5d7c Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Fri, 5 Oct 2012 17:30:05 +0530
Subject: [PATCH 3/4] is_staff is a bool, not callable

---
 chaloBEST/mumbai/apiviews.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chaloBEST/mumbai/apiviews.py b/chaloBEST/mumbai/apiviews.py
index cd4b003..f94a635 100644
--- a/chaloBEST/mumbai/apiviews.py
+++ b/chaloBEST/mumbai/apiviews.py
@@ -87,7 +87,7 @@ def stops(request):
 def stop(request, slug):
     srid = int(request.GET.get("srid", 4326))
     if request.POST and request.POST.has_key('geojson'):
-        if not request.user.is_staff():
+        if not request.user.is_staff:
             return render_to_json_response({'error': 'No permission'})
         if not slug:
             stop = Stop() #FIXME: should this return an error instead?

From cb22529db892bfc85764a15b6dce82dd3aa63178 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Fri, 5 Oct 2012 18:00:25 +0530
Subject: [PATCH 4/4] client side stop saving fixed

---
 chaloBEST/mumbai/apiviews.py            | 2 +-
 chaloBEST/mumbai/static/js/editstops.js | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/chaloBEST/mumbai/apiviews.py b/chaloBEST/mumbai/apiviews.py
index f94a635..b07c69c 100644
--- a/chaloBEST/mumbai/apiviews.py
+++ b/chaloBEST/mumbai/apiviews.py
@@ -88,7 +88,7 @@ def stop(request, slug):
     srid = int(request.GET.get("srid", 4326))
     if request.POST and request.POST.has_key('geojson'):
         if not request.user.is_staff:
-            return render_to_json_response({'error': 'No permission'})
+            return render_to_json_response({'errors': 'No permission'})
         if not slug:
             stop = Stop() #FIXME: should this return an error instead?
         else:
diff --git a/chaloBEST/mumbai/static/js/editstops.js b/chaloBEST/mumbai/static/js/editstops.js
index c8c75d3..b08fb6d 100644
--- a/chaloBEST/mumbai/static/js/editstops.js
+++ b/chaloBEST/mumbai/static/js/editstops.js
@@ -92,7 +92,7 @@ var API_BASE = "/1.0/",
                 stopsGeojson.features = stopsWithGeom;
                 var currFeatures = jsonLayer.features;
                 jsonLayer.removeFeatures(currFeatures);
-                console.log(stopsWithGeom);
+                //console.log(stopsWithGeom);
                 if (stopsWithGeom.length !== 0) {
                     jsonLayer.addFeatures(geojson_format.read(stopsGeojson));
                     var maxExtent = jsonLayer.getDataExtent();
@@ -129,6 +129,7 @@ var API_BASE = "/1.0/",
         var $ul = $('<ul />')
             .addClass("stopsList")
             .click(function(e) {
+                //e.stopPropagation();
                 var $target = $(e.target);
                 if ($target.hasClass("selectedStop")) {
                     return;
@@ -136,8 +137,11 @@ var API_BASE = "/1.0/",
 //                $('.selectedStop').removeClass("selectedStop");
 //                $target.addClass("selectedStop");
                 var props = $target.data("properties");
+                //console.log($target, props);
                 var geom = $target.data("geometry");
                 var $form = getStopForm(props, geom);
+                //GLOB_FORM = $form;
+                //console.log($form);
                 var slug = $target.data("slug");
                 if ($target.hasClass("has_point")) {
                     selectStopOnMap(slug);
@@ -169,6 +173,7 @@ var API_BASE = "/1.0/",
     function getStopForm(stop, geom) {
     //    console.log(stop);
     //    console.log(geom);
+        //console.log(stop);
         var lon = !$.isEmptyObject(geom) ? geom.coordinates[0] : '';
         var lat = !$.isEmptyObject(geom) ? geom.coordinates[1] : '';
         var $div = $('<div />');
@@ -334,7 +339,7 @@ var API_BASE = "/1.0/",
         //alert("selected " + slug);
         $('.selectedStop').removeClass("selectedStop");
         highlightStop(slug);
-        var stop = e.feature.attributes;
+        var stop = $('.selectedStop').data("properties");
         var geom = {
             'coordinates': [e.feature.geometry.x, e.feature.geometry.y]
         };