Updated crap

silent1mezzo · Apr 14, 2012 · 82811f9 · 82811f9
1 parent a948604
commit 82811f9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/hackto/apps/around/forms.py b/hackto/apps/around/forms.py
@@ -2,4 +2,4 @@
 from django.contrib.localflavor.ca.forms import CAPostalCodeField
 
 class SearchForm(forms.Form):
-    forms.CharField(widget=forms.TextInput(attrs={'class':'input-xxlarge', 'placeholder':'Enter your address/postal code...'}))
+    address = forms.CharField(widget=forms.TextInput(attrs={'class':'input-xxlarge', 'placeholder':'Enter your address/postal code...'}))
diff --git a/hackto/apps/around/views.py b/hackto/apps/around/views.py
@@ -27,6 +27,8 @@ def search(request):
         form = SearchForm(request.POST)
         if form.is_valid():
             address = form.cleaned_data['address']
+
+            dict['lat'],dict['lon'] = get_lat_long(address)
     else:
         form = SearchForm()
 

diff --git a/hackto/static_media/js/around.js b/hackto/static_media/js/around.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
     $('#map_canvas').gmap().bind('init', function(ev, map) {
-        $('#map_canvas').gmap('addMarker', {'position': '57.7973333,12.0502107', 'bounds': true}).click(function() {
+        $('#map_canvas').gmap('addMarker', {'position': $LAT,$LON, 'bounds': true}).click(function() {
             $('#map_canvas').gmap('openInfoWindow', {'content': 'Hello World!'}, this);
         });
     });

diff --git a/hackto/templates/base.html b/hackto/templates/base.html
@@ -61,8 +61,7 @@
                         <div class="search">
                             <form class="form-inline" method='post' action='{% url search %}'>
                                 {% csrf_token %}
-                                {{ form.address }} or 
-                                {{ form.postal_code }}
+                                {{ form.address }}
                                 <button type="submit" class="btn btn-large btn-orange">Search</button>
                             </form>
                         </div>
@@ -85,6 +84,10 @@
     <!-- Le javascript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <script type="text/javascript">
+        $LAT = {{ lat }};
+        $LON = {{ lon }};
+    </script>
     <script src="{{ STATIC_URL }}js/jquery.js"></script>
     <script src="{{ STATIC_URL }}js/bootstrap.js"></script>
     <script src="http://maps.googleapis.com/maps/api/js?key={{ MAPS_API_KEY }}&sensor=false" type="text/javascript"></script>

diff --git a/hackto/templates/search.html b/hackto/templates/search.html
@@ -8,8 +8,7 @@
                     <form class="form-inline" method='post' action='{% url search %}'>
                         {% csrf_token %}
                         {{ form.errors }}
-                        {{ form.address }} or 
-                        {{ form.postal_code }}
+                        {{ form.address }}
                         <button type="submit" class="btn btn-large btn-orange">Search</button>
                     </form>
                 </div>