Merge bea5505 into dadc165

bpz/static/js/bpz.js

@@ -45,7 +45,7 @@ function Location() {
 
   pos_desc = Object.getOwnPropertyDescriptor(this, 'pos');
 
-  WatchID = navigator.geolocation.watchPosition(pos_desc.set, fail, options);
+  WatchID = navigator.geolocation.getCurrentPosition(pos_desc.set, fail, options);
 
   this.ready = dfd.promise()
 
@@ -92,7 +92,8 @@ var bpz = {
   },
   activateMap: function () {
     d3.select("#map-canvas").classed("active",true);
-    bpz.map.setView(bpz.stored.currentLatLng);
+    var cL = bpz.stored.currentLatLng || [36.1587336,-95.9940543]
+    bpz.map.setView(cL);
     bpz.map.setZoom(14);
   },
   layers: {

bpz/templates/bpz/about.jinja2

@@ -5,23 +5,34 @@
 {% block body_container %}
 
 <div id="info_container" class="container">
-
   <div class="row">
-
     <div class="col-xs-12 col-sm-12 col-md-10 col-md-offset-1">
-      <h2 class="page-header">About</h2>
-      <p class="lead">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi accumsan lobortis justo, quis maximus urna placerat ut. Aenean porttitor lorem id maximus molestie. Integer mattis justo vulputate augue auctor, eu feugiat diam accumsan. Nullam metus elit, tincidunt sit amet ex malesuada, condimentum luctus dolor. Pellentesque eu aliquet neque. Integer gravida odio nibh, at fringilla enim maximus dictum. Proin tortor lectus, aliquet quis cursus a, malesuada sit amet massa. Sed efficitur finibus massa, pretium ornare dui venenatis tincidunt. Vivamus eget nisi tempus, aliquet ex sed, commodo dui. Aliquam sollicitudin tortor at varius blandit. Quisque condimentum congue lacus non commodo. Fusce dignissim ornare risus non tincidunt. Nulla fringilla rutrum dui, id iaculis velit dapibus nec.</p>
+      <h2 class="page-header">
+        About
+      </h2>
+      <p class="lead"></p>
+      <p>
+        TulsaNow is a grassroots organization focused on the intelligent and sustainable development, preservation, and revitalization of Tulsa. TulsaNow’s Mission is to help Tulsa become the most vibrant, diverse, sustainable and prosperous city of its size. We achieve this by focusing on the development of Tulsa’s distinctive identity and economic growth around a dynamic, urban core, complemented by a constellation of livable, thriving communities.
+      </p>
+      <p>
+        Each of these efforts requires more public involvement, and more education to the public about citizen-led planning, and land use / transportation issues. A diversity of opinion will help the city decide what is best for all its citizens. It so happens that INCOG manages two databases:
+      </p>
+      <p>
+        1. They have the list of every neighborhood association in the city.
+      </p>
+      <p>
+        2. They manage a mapped database of all zoning / planning issues, marked as “pending cases” http:// map3.incog.org/flex/landdev/pending/ So let’s say XYZ company is wanting to build in a certain location in the city, or the city is making changes, INCOG would map that location, flag it as a pending case, and these pending cases get brought before the TMAPC, or the Board of Adjustments, etc. for approval.
+      </p>
+      <p>
+        By connecting these two dots, we can create a tool that someone can use to enter their address, in order to find out about their nearest neighborhood association, and learn about pending cases in their area.
+      </p>
     </div>
-
   </div>
   <div class="row">
-
     <div class="col-xs-12 col-sm-12 col-md-10 col-md-offset-1">
-      <a href="/hoa" class="btn btn-success btn-block" id="btn-neighborhood">Find my Neighborhood&raquo;</a>
+      <a href="/hoa" class="btn btn-success btn-block" id="btn-neighborhood" name="btn-neighborhood">Find my Neighborhood»</a>
     </div>
-
   </div>
-
 </div><!-- /.container -->
 
 {% endblock %}

bpz/templates/bpz/base.jinja2

@@ -37,8 +37,8 @@
             <li><a href="/">Home</a></li>
             <li><a href="/about">About</a></li>
             <li><a href="/cases">Cases</a></li>
-            <li><a href="/hoa">HOA's</a></li>
-            <li><a href="/address">Set Address</a></li>
+            <li><a href="/hoa">HOA</a></li>
+            <li><a href="/address">Find me ...</a></li>
           </ul>
         </div><!--/.nav-collapse -->
       </div>

bpz/templates/bpz/cases.jinja2

@@ -8,7 +8,7 @@
   		<div class="col-xs-12 col-sm-12 col-md-10 col-md-offset-1">
   			<div class="panel panel-default">
     			<div class="panel-heading">
-						<h3 class="panel-title">Cases</h3>
+						<h3 class="panel-title">Zoning Change Cases</h3>
 					</div>
 
 					<div id="case-panel" class="scroll-area" data-spy="scroll" >

bpz/templates/bpz/home.jinja2

@@ -6,12 +6,6 @@
 <div id="intro_div" class="container">
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-10 col-md-offset-1">
-	<h3>Welcome to the Neighborhood Plugin!</h3>
-      <p class="lead"> The Neighborhood Plugin is a great way to help Tulsan's find their nearest neighborhood association and learn about pending zoning and planning cases in their area.  If you live in Tulsa and want to become more involved in your community, then all you need to do is provide your location to get started.  <a href="/about">Learn More&#62;&#62;</a> </p>
-    </div>
-  </div>
-
-  <!-- TODO:  Create a button that goes to the address page without using javascript -->
 
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-10 col-md-offset-1">
@@ -21,6 +15,14 @@
     </div>
 
   </div>
+	<h3>Welcome to the Neighborhood Plugin!</h3>
+
+      <p class="lead"> The Neighborhood Plugin is a great way to help Tulsan's find their nearest neighborhood association and learn about pending zoning and planning cases in their area.  If you live in Tulsa and want to become more involved in your community, then all you need to do is provide your location to get started.  <a href="/about">Learn More&#62;&#62;</a> </p>
+    </div>
+  </div>
+
+  <!-- TODO:  Create a button that goes to the address page without using javascript -->
+
 </div><!-- /.container -->
 
 {% endblock %}