Skip to content

Commit

Permalink
Merge 2ff0dc1 into 64a5eab
Browse files Browse the repository at this point in the history
  • Loading branch information
jdungan committed Sep 4, 2014
2 parents 64a5eab + 2ff0dc1 commit d30e4d5
Show file tree
Hide file tree
Showing 14 changed files with 447 additions and 11 deletions.
Binary file added .DS_Store
Binary file not shown.
21 changes: 19 additions & 2 deletions bpz/static/css/bpz.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
body {
padding-top:70px;
overflow:scroll;
position:relative;
}
#map-canvas {

#map-canvas.active {
height:250px;
width:100%;
}


ul#list-group {
overflow:scroll;
top:'300px'

}

#btn-neighborhood {
font-size:2em;
}

.case-path{
fill:blue;
}


78 changes: 78 additions & 0 deletions bpz/static/js/bpz.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
var call_map, bpz, value, _fn, _i, _len;



//TODO: replace
function Location() {
var options = {enableHighAccuracy: true},
dfd = new $.Deferred(),
inner_pos = {}
moved = function(pos) {
inner_pos = pos || {};
dfd.resolve(this)
},
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.__defineGetter__("pos", function() {
return {lng:this.lng,lat:this.lat};
});
this.position = inner_pos;

this.WatchID = navigator.geolocation.watchPosition(moved, fail, options);

this.ready = dfd.promise()

}


bpz = {
_map:false,
api: {},
'location': new Location(),
get map() {
if (!bpz._map){
//TODO: Move access token into environment variable
L.mapbox.accessToken ='pk.eyJ1IjoiamR1bmdhbiIsImEiOiJlOTl6MFpNIn0.-3o5vIOCjkfXd-7ibZrb8A'
bpz._map=L.mapbox.map('map-canvas', 'jdungan.jbbebonl').setView([36.1587336,-95.9940543],12);
}
return bpz._map
}
};


bpz.api.call = function(resource, ajax_params) {
ajax_params = ajax_params || {};
return $.ajax({
type: "get",
url: "/api" + resource,
data: ajax_params,
dataType: "json"
});
};

call_map = [["cases", "/cases"],["hoa", "/hoas"]];

_fn = function(value) {
return bpz.api[value[0]] = function(params) {
return bpz.api.call(value[1], params);
};
};

for (_i = 0, _len = call_map.length; _i < _len; _i++) {
value = call_map[_i];
_fn(value);
}

6 changes: 6 additions & 0 deletions bpz/static/vendor/underscore-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions bpz/templates/bpz/about.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,11 @@
</div><!-- /.container -->

{% endblock %}

{% block body_js -%}

<script>
d3.select("#map-canvas").classed("active",false)
</script>
{%- endblock body_js %}

4 changes: 4 additions & 0 deletions bpz/templates/bpz/address.jinja2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{% extends "bpz/base.jinja2" %}


{% endblock %}
17 changes: 13 additions & 4 deletions bpz/templates/bpz/base.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
<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' />
<script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.3.13/d3.min.js" charset="utf-8"></script>
<script src="{{ static('vendor/jquery/jquery-1.11.1.min.js') }}"></script>
<script src="{{ static('vendor/underscore-min.js') }}"></script>


<!-- 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]>
Expand All @@ -33,22 +40,24 @@
<ul class="nav navbar-nav">
<li><!-- if home page li class="active"--><a href="/">Home</a></li>
<li><!-- if about page li class="active"--><a href="/about">About</a></li>
<li><!-- if about page li class="active"--><a href="/cases">Cases</a></li>
<li><!-- if about page li class="active"--><a href="/hoa">HOA's'</a></li>

</ul>
</div><!--/.nav-collapse -->

</div>
<div id="map-canvas" > </div>
</div>

{% block body_container -%}
{% block body_title_elem -%}
<h1>{% block body_title %}TODO: set block title{% endblock %}</h1>
{%- endblock body_title_elem %}
{% block content %}{% endblock %}
{%- endblock body_container %}

<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 %}
</body>
Expand Down

0 comments on commit d30e4d5

Please sign in to comment.