Permalink
Browse files

Styling changes, added jQuery UI multiselect for drop down and report…

… metrics, some code clean up.
  • Loading branch information...
1 parent 7af6141 commit 2a705b62b431c7d6ecaa3b087194eb9c78f64baa @tobinbradley committed Feb 13, 2012
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -3,41 +3,44 @@
/* TEAM */
- <your title>: <your name>
- Site:
- Twitter:
- Location:
+ Tobin Bradley, Many Other Functions
+ Site: http://fuzzytolerance.info
+ Location: USA
/* THANKS */
Names (& URL):
/* SITE */
Standards: HTML5, CSS3
- Components: Modernizr, jQuery
- Software:
+ Components: Modernizr, jQuery, jQuery UI, Chosen plugin, Google Fusion Tables, Google Maps API
+ Software: Komodo Edit
+
+
-
- -o/-
- +oo//-
- :ooo+//:
- -ooooo///-
- /oooooo//:
- :ooooooo+//-
- -+oooooooo///-
- -://////////////+oooooooooo++////////////::
- :+ooooooooooooooooooooooooooooooooooooo+:::-
- -/+ooooooooooooooooooooooooooooooo+/::////:-
- -:+oooooooooooooooooooooooooooo/::///////:-
- --/+ooooooooooooooooooooo+::://////:-
- -:+ooooooooooooooooo+:://////:--
- /ooooooooooooooooo+//////:-
- -ooooooooooooooooooo////-
- /ooooooooo+oooooooooo//:
- :ooooooo+/::/+oooooooo+//-
- -oooooo/::///////+oooooo///-
- /ooo+::://////:---:/+oooo//:
- -o+/::///////:- -:/+o+//-
- :-:///////:- -:/://
- -////:- --//:
- -- -:
+ oooo$$$$$$$$$$$$oooo
+ oo$$$$$$$$$$$$$$$$$$$$$$$$o
+ oo$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o o$ $$ o$
+ o $ oo o$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o $$ $$ $$o$
+oo $ $ "$ o$$$$$$$$$ $$$$$$$$$$$$$ $$$$$$$$$o $$$o$$o$
+"$$$$$$o$ o$$$$$$$$$ $$$$$$$$$$$ $$$$$$$$$$o $$$$$$$$
+ $$$$$$$ $$$$$$$$$$$ $$$$$$$$$$$ $$$$$$$$$$$$$$$$$$$$$$$
+ $$$$$$$$$$$$$$$$$$$$$$$ $$$$$$$$$$$$$ $$$$$$$$$$$$$$ """$$$
+ "$$$""""$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ "$$$
+ $$$ o$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ "$$$o
+ o$$" $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $$$o
+ $$$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" "$$$$$$ooooo$$$$o
+ o$$$oooo$$$$$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ o$$$$$$$$$$$$$$$$$
+ $$$$$$$$"$$$$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $$$$""""""""
+ """" $$$$ "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" o$$$
+ "$$$o """$$$$$$$$$$$$$$$$$$"$$" $$$
+ $$$o "$$""$$$$$$"""" o$$$
+ $$$$o o$$$"
+ "$$$$o o$$$$$$o"$$$$o o$$$$
+ "$$$$$oo ""$$$$o$$$$$o o$$$$""
+ ""$$$$$oooo "$$$o$$$$$$$$$"""
+ ""$$$$$$$oo $$$$$$$$$$
+ """"$$$$$$$$$$$
+ $$$$$$$$$$$$
+ $$$$$$$$$$"
+ "$$$""""
View
0 img/beta_testing.jpg 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 img/quicklink.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 img/seals.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 img/seals.svg 100644 → 100755
No changes.
View
0 img/site-logo.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 img/social/googleplus.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -23,7 +23,7 @@
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
<!-- jQuery UI CSS -->
- <link type="text/css" media="all" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/south-street/jquery-ui.css" rel="stylesheet" />
+ <link type="text/css" media="all" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.17/themes/smoothness/jquery-ui.css" rel="stylesheet" />
<!-- CSS: implied media=all -->
<link href='http://fonts.googleapis.com/css?family=Arvo' rel='stylesheet' type='text/css'>
@@ -43,13 +43,14 @@
<div id="container">
<header>
<div class="clearfix">
- <div id="google_translate_element"></div>
- <nav id="header_top_nav">
- <a href="http://www.charmeck.org/">CharMeck.org</a> |
- <a href="http://www.charmeck.org/city/charlotte/">City of Charlotte</a> |
- <a href="http://www.charmeck.org/mecklenburg/county/">Mecklenburg County</a> |
- <a href="http://www.uncc.edu/">UNC Charlotte</a>
- </nav>
+ <div id="event_calendar" class="header_top_nav screen-only"><a href="http://charmeck.org/eventcalendar/Pages/Default.aspx">Event Calendar</a> | </div>
+ <div id="google_translate_element" class="screen-only"></div>
+ <nav id="header_top_nav_right" class="header_top_nav screen-only">
+ <a href="http://www.charmeck.org/">CharMeck.org</a> |
+ <a href="http://www.charmeck.org/city/charlotte/">City of Charlotte</a> |
+ <a href="http://www.charmeck.org/mecklenburg/county/">Mecklenburg County</a> |
+ <a href="http://www.uncc.edu/">UNC Charlotte</a>
+ </nav>
</div>
<div id="title">
<h1>Quality of Life Dashboard</h1>
@@ -58,7 +59,7 @@
<ul>
<li><a href="javascript:void(0)" id="selectNone">Welcome</a></li>
<li><a href="javascript:void(0)" id="showMetricslist">Metrics</a></li>
- <li><a href="javascript:void(0)" id="report">Print Report</a></li>
+ <li><a href="javascript:void(0)" id="report">Report</a></li>
<li><a href="http://www.google.com/fusiontables/DataSource?snapid=S289817c03d" target="_blank">Access Data</a></li>
<li><a href="javascript:void(0)" id="tutorial">Video Tutorial</a></li>
<li><a href="https://github.com/tobinbradley/Mecklenburg-County-Quality-of-Life-Dashboard" title="github">Source Code</a></li>
@@ -75,15 +76,15 @@
<p><a href="javascript:void(0)">Help</a></p>
</div>
- <div id="map">
- <select id="mapIndicie"></select>
+ <div id="map">
+ <select id="mapIndicie" class=""></select>
<div id="map-canvas"></div>
<div id="legend" class="hidden"></div>
</div>
<aside>
<div id="welcome">
- <h3>Welcome the the Quality of Life Dashboard</h3>
+ <h3>Welcome to the Quality of Life Dashboard</h3>
<div id="welcomeCharts"></div>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a lorem id ipsum sagittis faucibus sit amet vel nisl. Cras vel eros felis, a volutpat lacus. Suspendisse potenti. Praesent a sem felis, et luctus justo. Nulla quis felis eu nisi vestibulum rhoncus at at orci. Mauris tempus, lorem et faucibus tincidunt, arcu nisl adipiscing velit, non placerat nulla nibh vitae neque. Pellentesque facilisis, enim nec pharetra eleifend, tortor arcu molestie diam, eu viverra ligula est eget magna. Curabitur id imperdiet metus. Sed nec ipsum adipiscing purus lobortis rutrum. Etiam luctus euismod nunc vitae molestie. Morbi vel diam erat.
@@ -151,12 +152,14 @@ <h4 id="selectedNeighborhood">Neighborhood</h4>
<!-- Create report dialog -->
<div id="report-dialog" title="Create PDF Report" class="hidden">
<form action="php/report.php" method="get" target="_blank">
- <input type="hidden" name="m" id="report_measures" value="">
<h4>Neighborhood</h4>
<p>
<select id="report_neighborhood" name="n"></select>
</p>
- <p id="report-metrics"></p>
+ <h4>Metrics</h4>
+ <p id="report_measures">
+ <select id="report_metrics" multiple="multiple" name="m[]"></select>
+ </p>
<input type="submit" id="submitPDFReport" name="mysubmit" value="Go!" />
<a href="php/report.php" target="_blank" class="hidden">Try Work in Progress</a>
</form>
@@ -194,13 +197,13 @@ <h4 id="selectedNeighborhood">Neighborhood</h4>
<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=true"></script>
<!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline -->
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
- <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.17/jquery-ui.min.js"></script>
<!-- scripts concatenated and minified via ant build script-->
- <script defer src="js/plugins.js"></script>
- <script defer src="js/map.js"></script>
- <script defer src="js/script.js"></script>
+ <script src="js/plugins.js"></script>
+ <script src="js/map.js"></script>
+ <script src="js/script.js"></script>
<!-- end scripts-->
<!-- Google Translate -->
View
@@ -28,10 +28,12 @@ function mapInit() {
//add a click listener to the layer
google.maps.event.addListener(layer, 'click', function(e) {
//update the content of the InfoWindow
- e.infoWindowHtml = '<div class="googft-info-window"><h3>Neighborhood ' + e.row['ID'].value + "</h3>";
- e.infoWindowHtml += 'Score: ' + e.row[$("#mapIndicie option:selected").val()].value + '<br />';
+ e.infoWindowHtml = '<div class="googft-info-window">';
+ e.infoWindowHtml += '<h3>Neighborhood ' + e.row['ID'].value + "</h3>";
+ e.infoWindowHtml += '<strong>' + $("#mapIndicie option:selected").html() + '</strong><br />';
theID = $("#mapIndicie option:selected").val();
- e.infoWindowHtml += 'County Average: ' + countyAverage["AVERAGE(" + theID + ")"] + '<br />';
+ e.infoWindowHtml += 'Score: ' + e.row[$("#mapIndicie option:selected").val()].value + FTmeta[theID].style.units + '<br />';
+ e.infoWindowHtml += 'County Average: ' + countyAverage[theID] + FTmeta[theID].style.units + '<br />';
e.infoWindowHtml += '<p><a href="javascript:void(0)" onclick="selectNeighborhoodByID(' + e.row['ID'].value + ')">Select Neighborhood</a></p>';
e.infoWindowHtml += "</div>";
});
@@ -196,6 +198,22 @@ function styleMap() {
var style = [
{
+ featureType: 'all',
+ stylers: [{
+ saturation: -99
+ }]
+ }, {
+ featureType: 'poi',
+ stylers: [{
+ visibility: 'off'
+ }]
+ }, {
+ featureType: 'road',
+ stylers: [{
+ visibility: 'off'
+ }]
+ },
+ {
featureType: "administrative.locality",
elementType: "labels",
stylers: [
View
8 js/metrics.json 100644 → 100755
@@ -45,7 +45,7 @@
"tech_notes": "Data derived from the American Community Survey and only measures mode of transit from home to work.",
"source": "U.S. Census American Community Survey",
"links": {"text": [ "CATS Carpooling", "Guide for Bicyclists and Pedstrians" ], "links": [ "http://charmeck.org/city/charlotte/cats/commuting/Carpool/Pages/default.aspx", "http://charmeck.org/city/charlotte/cats/commuting/ETC/Pages/companies%20in%20ETC.aspx" ]},
- "style": { "type": "range", "units": "%", "breaks": ["0", "25", "50", "75"] , "colors": ["#d9d2e9", "#b4a7d6", "#8e7cc3", "#674ea7", "#351c75"] }
+ "style": { "type": "range", "units": "%", "breaks": ["0", "5", "10", "15", "20"] , "colors": ["#d9d2e9", "#b4a7d6", "#8e7cc3", "#674ea7", "#351c75"] }
},
"commute_carpool" : {
"field": "commute_carpool",
@@ -141,7 +141,7 @@
"tech_notes": "Data derived from the American Community Survey and only measures mode of transit from home to work.",
"source": "U.S. Census American Community Survey",
"links": {"text": [ "CATS Carpooling", "Guide for Bicyclists and Pedstrians" ], "links": [ "http://charmeck.org/city/charlotte/cats/commuting/Carpool/Pages/default.aspx", "http://charmeck.org/city/charlotte/cats/commuting/ETC/Pages/companies%20in%20ETC.aspx" ]},
- "style": { "type": "range", "units": "%", "breaks": ["0", "1", "3", "5", "7"] , "colors": ["#d9d2e9", "#b4a7d6", "#8e7cc3", "#674ea7", "#351c75"] }
+ "style": { "type": "range", "units": "%", "breaks": ["0", "1", "2", "3", "4"] , "colors": ["#d9d2e9", "#b4a7d6", "#8e7cc3", "#674ea7", "#351c75"] }
},
"commute_walk" : {
"field": "commute_walk",
@@ -153,7 +153,7 @@
"tech_notes": "Data derived from the American Community Survey and only measures mode of transit from home to work.",
"source": "U.S. Census American Community Survey",
"links": {"text": [ "CATS Carpooling", "Guide for Bicyclists and Pedstrians" ], "links": [ "http://charmeck.org/city/charlotte/cats/commuting/Carpool/Pages/default.aspx", "http://charmeck.org/city/charlotte/cats/commuting/ETC/Pages/companies%20in%20ETC.aspx" ]},
- "style": { "type": "range", "units": "%", "breaks": ["0", "25", "50", "75"] , "colors": ["#d9d2e9", "#b4a7d6", "#8e7cc3", "#674ea7", "#351c75"] }
+ "style": { "type": "range", "units": "%", "breaks": ["0", "1", "3", "5", "7"] , "colors": ["#d9d2e9", "#b4a7d6", "#8e7cc3", "#674ea7", "#351c75"] }
},
"commute_other" : {
"field": "commute_other",
@@ -177,7 +177,7 @@
"tech_notes": "Data derived from the American Community Survey and only measures mode of transit from home to work.",
"source": "U.S. Census American Community Survey",
"links": {"text": [ "CATS Carpooling", "Guide for Bicyclists and Pedstrians" ], "links": [ "http://charmeck.org/city/charlotte/cats/commuting/Carpool/Pages/default.aspx", "http://charmeck.org/city/charlotte/cats/commuting/ETC/Pages/companies%20in%20ETC.aspx" ]},
- "style": { "type": "range", "units": "%", "breaks": ["0", "25", "50", "75"] , "colors": ["#d9d2e9", "#b4a7d6", "#8e7cc3", "#674ea7", "#351c75"] }
+ "style": { "type": "range", "units": "%", "breaks": ["0", "2", "4", "6", "8"] , "colors": ["#d9d2e9", "#b4a7d6", "#8e7cc3", "#674ea7", "#351c75"] }
},
"health_1" : {
"field": "health_1",
Oops, something went wrong.

0 comments on commit 2a705b6

Please sign in to comment.