Merge fe1e8b8 into 313af99

codefortulsa · Aug 29, 2014 · dbe5cfc · dbe5cfc
2 parents 313af99 + fe1e8b8
commit dbe5cfc
Show file tree

Hide file tree

Showing 11 changed files with 182 additions and 6 deletions.
diff --git a/bpz/static/js/bpz.js b/bpz/static/js/bpz.js
@@ -0,0 +1,38 @@
+// function Location() {
+//   var options = {
+//     enableHighAccuracy: true
+//   },
+//     inner_pos = {},
+//     dfd = new $.Deferred(),
+//     moved = function(pos) {
+//       inner_pos = pos || {};
+//       dfd.resolve()
+//     },
+//     fail = function(err) {
+//       if (err) {
+//         console.warn('ERROR(' + err.code + '): ' + err.message);
+//       }
+//       dfd.reject()
+//     };
+//
+//   this.__defineGetter__("lat", function() {
+//     return inner_pos.coords ? inner_pos.coords.latitude : null;
+//   });
+//
+//   this.__defineGetter__("lng", function() {
+//     return inner_pos.coords ? inner_pos.coords.longitude : null;
+//   });
+//
+//   this.WatchID = navigator.geolocation.watchPosition(moved, fail, options);
+//
+//   this.ready = dfd.promise()
+// }
+//
+//
+//
+
+jQuery(document).ready(function () {
+  L.mapbox.accessToken ='pk.eyJ1IjoiamR1bmdhbiIsImEiOiJlOTl6MFpNIn0.-3o5vIOCjkfXd-7ibZrb8A'
+  map = L.mapbox.map('map-canvas', 'jdungan.jbbebonl').setView([36.1587336,-95.9940543],16);
+
+});
diff --git a/bpz/templates/address.html b/bpz/templates/address.html
diff --git a/bpz/templates/base.html b/bpz/templates/base.html
@@ -0,0 +1,39 @@
+{% spaceless %}
+<!DOCTYPE html> 
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes">
+
+    <script src='https://api.tiles.mapbox.com/mapbox.js/v2.0.1/mapbox.js'></script>
+    <link href='https://api.tiles.mapbox.com/mapbox.js/v2.0.1/mapbox.css' rel='stylesheet' />
+
+    <script src= "http://code.jquery.com/jquery-1.10.2.min.js"></script>
+    <script src= "http://code.jquery.com/mobile/1.4.0/jquery.mobile-1.4.0.min.js"></script>  
+    <script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.3.13/d3.min.js" charset="utf-8"></script>
+
+    <script src='https://api.tiles.mapbox.com/mapbox.js/v2.0.1/mapbox.js'></script>
+    <link href='https://api.tiles.mapbox.com/mapbox.js/v2.0.1/mapbox.css' rel='stylesheet' />
+
+</head>
+<body>
+
+    <div id="page" class="page" data-role="page" >
+
+        <div data-role="header" data-position="fixed">
+        </div><!--  /header -->
+
+        <div data-role="content" >
+
+            {% block content %}
+            <p> Content goes here </p>
+            {% endblock %}
+
+        </div>    <!-- End of content -->
+
+    </div><!-- End of page -->
+
+
+</body>
+</html>{% endspaceless %}
diff --git a/bpz/templates/bpz/base.jinja2 b/bpz/templates/bpz/base.jinja2
@@ -10,6 +10,10 @@
     <link href="{{ static('vendor/bootstrap-3.2.0-dist/css/bootstrap-theme.min.css') }}" rel="stylesheet">
     <link href="{{ static('css/bpz.css') }}" rel="stylesheet">
 
+    <script src='https://api.tiles.mapbox.com/mapbox.js/v2.0.1/mapbox.js'></script>
+    <link href='https://api.tiles.mapbox.com/mapbox.js/v2.0.1/mapbox.css' rel='stylesheet' />
+
+
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
@@ -47,7 +51,6 @@
 
     <script src="{{ static('vendor/jquery/jquery-1.11.1.min.js') }}"></script>
     <script src="{{ static('vendor/bootstrap-3.2.0-dist/js/bootstrap.min.js') }}"></script>
-    <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyA4JQW3kTKVpzBIroZ1mXguTPt2J1F1zXU"></script>
     <script src="{{ static('js/bpz.js') }}"></script>
     {% block body_js -%}
     {%- endblock body_js %}

diff --git a/bpz/templates/bpz/cases.jinja2 b/bpz/templates/bpz/cases.jinja2
@@ -0,0 +1,31 @@
+
+{% extends "bpz/base.jinja2" %}
+
+{% block content %}
+
+<div id="map-canvasd" 
+   class="ui-content search_map" 
+   role="main" data-role="content" data-theme="b">
+</div>
+
+
+
+<a>Get notified of building, planning, and zoning meetings in the Pearl District»</a>
+
+
+<script>
+  
+  
+  
+</script>
+
+
+{% endblock content %}
+
+
+
+
+
+
+
+
diff --git a/bpz/templates/bpz/home.jinja2 b/bpz/templates/bpz/home.jinja2
@@ -21,5 +21,4 @@
 {% endblock %}
 
 {% block body_js -%}
-<script src="{{ static('js/home.js') }}"></script>
 {%- endblock body_js %}
diff --git a/bpz/templates/bpz/hood.jinja2 b/bpz/templates/bpz/hood.jinja2
@@ -0,0 +1,27 @@
+{% extends 'bpz/base.jinja2' %}
+{% block content %}
+
+<script>
+  
+bound={{hood.boundary}}
+
+
+</script> 
+
+<div id="map_content" 
+   class="ui-content search_map" 
+   role="main" data-role="content" data-theme="b">
+</div>
+<div>
+
+  <p>Contact</p>{{ hood.contact}}
+  <p>Phone</p>{{ hood.phone}}
+  <p>Email</p>{{ hood.email}}
+  <p>Meetings</p>{{ hood.meetings}}
+  <p>Website</p>{{ hood.url}}
+
+  <a >BUTTON: View building, planning, and zoning meetings in the Pearl District</a>
+
+</div>
+
+{% endblock content %}
diff --git a/bpz/templates/bpz/notify.jinja2 b/bpz/templates/bpz/notify.jinja2
@@ -0,0 +1,13 @@
+{% extends 'bpz/base.jinja2' %}
+
+{% block content %}
+<p>Get informed about public meetings affecting your neighborhood. Sign up to receive notifications:</p>
+
+<form action="" method="post" data-ajax="false">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <input type="submit" value="Submit" />
+</form>
+{% endblock content %}
+
+
diff --git a/bpz/templates/home.html b/bpz/templates/home.html
@@ -0,0 +1,12 @@
+{% extends 'base.html' %}
+{% block content %}
+
+<div id="map_content" 
+   class="ui-content search_map" 
+   role="main" data-role="content" data-theme="b">
+</div>
+<div>
+  Hi, this is some information about what this app is, what it does, and why it needs to use your GPS to find your neighborhood. Learn more»
+</div>
+
+{% endblock content %}
diff --git a/bpz/urls.py b/bpz/urls.py
@@ -3,7 +3,7 @@
 from django.views.generic import TemplateView
 from rest_framework import routers
 
-from .views import CaseViewSet, HOAViewSet
+from .views import CaseViewSet, HOAViewSet, cases
 
 
 router = routers.DefaultRouter()
@@ -12,11 +12,18 @@
 
 urlpatterns = patterns(
     '',
+    url(r'^api/', include(router.urls)),
     url(r'^$',
         TemplateView.as_view(template_name='bpz/home.jinja2'),
         name='home'),
-    url(r'^about', TemplateView.as_view(
-        template_name='bpz/about.jinja2'),
+    url(r'^about',
+        TemplateView.as_view(template_name='bpz/about.jinja2'),
         name='about'),
-    url(r'^api/', include(router.urls)),
+    url(r'^hood',
+        TemplateView.as_view(template_name='bpz/hood.jinja2'),
+        name='neighborhood'),
+    url(r'^notify',
+        TemplateView.as_view(template_name='bpz/notify.jinja2'),
+        name='notify'),
+    url(r'^cases', cases, name='cases'),
 )
diff --git a/bpz/views.py b/bpz/views.py
@@ -1,3 +1,6 @@
+# bpz views here
+from django.shortcuts import render
+
 from rest_framework import viewsets
 
 from .models import Case, HomeOwnersAssociation
@@ -12,3 +15,7 @@ class CaseViewSet(viewsets.ModelViewSet):
 class HOAViewSet(viewsets.ModelViewSet):
     model = HomeOwnersAssociation
     serializer_class = HomeOwnersAssociationSerializer
+
+
+def cases(request):
+    return render(request, 'bpz/cases.jinja2', {'cases': Case.objects.all()})