Permalink
Browse files

Merge branch 'master' of github.com:brack3t/djangopeople.me

  • Loading branch information...
2 parents 067ad63 + 81578c6 commit 5448ab5a1d903e478773cc705927985e65c10ac8 @chrisjones-brack3t chrisjones-brack3t committed Jun 7, 2012
Showing with 25 additions and 6 deletions.
  1. +4 −6 dp/generic/forms.py
  2. +21 −0 dp/generic/templates/generic/search.html
View
@@ -41,12 +41,10 @@ def __init__(self, *args, **kwargs):
self.helper = FormHelper()
self.helper.form_method = "POST"
self.helper.layout = Layout(
- Fieldset("Search",
- "location",
- "distance",
- "units",
- "skills",
- ),
+ "location",
+ "distance",
+ "units",
+ "skills",
FormActions(
Submit("search", "Search", css_class="btn btn-info"),
)
@@ -3,6 +3,10 @@
{% block home_nav_class %}active{% endblock %}
+{% block page_header %}
+ <h1>Search</h>
+{% endblock %}
+
{% block page_content %}
<div class="row-fluid">
<div class="span3">
@@ -22,3 +26,20 @@
</div>
</div>
{% endblock %}
+
+{% block extra_js %}
+<script src="http://maps.stamen.com/js/tile.stamen.js"></script>
+<script>
+ var map = new L.Map("map", {
+ center: new L.LatLng(21.505, -0.09),
+ zoom: 3
+ });
+
+ var stamenLayer = new L.StamenTileLayer("watercolor", {
+ attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.'
+ });
+
+ //map.addLayer(stamenLayer).locateAndSetView(4);
+ map.addLayer(stamenLayer);
+</script>
+{% endblock %}

0 comments on commit 5448ab5

Please sign in to comment.