Skip to content

moved nav; small css changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
awolfe76 wants to merge 1 commit into
base: gh-pages
Choose a base branch
from
Open

moved nav; small css changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!--[if lte IE 8]>
<link href='//api.tiles.mapbox.com/mapbox.js/v1.4.0/mapbox.ie.css' rel='stylesheet'>
<![endif]-->
<script src='//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-hash/v0.2.1/leaflet-hash.js'></script>
<script src='//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-hash/v0.2.1/leaflet-hash.js'></script>
<script src='//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v0.0.1/Leaflet.fullscreen.min.js'></script>
<link href='//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v0.0.1/leaflet.fullscreen.css' rel='stylesheet' />
<link href="{{ site.baseurl }}/css/styles.css" rel="stylesheet">
Expand Down
59 changes: 31 additions & 28 deletions _layouts/map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@
<div id="title" class="container">
<div class="content">
<h3>Measuring Broadband America Mobile Broadband Services</h3>
</div>
</div>

<div id="map-c" class="container">
<div class="content">
<div id="map"></div>
<ul class="inline">
<li><a href='javascript:void(0)' id='mayor' class='sel active'>Overall Participation</a></li>
<li><strong>View: </strong><a href='javascript:void(0)' id='mayor' class='sel active'>Overall Participation</a></li>
</ul>
<ul class="inline">
<li><strong>Download Speeds:</strong></li>
<li><a href='javascript:void(0)' id='ds_att' class='sel inactive'>ATT</a></li>
<li><strong>View Download Speeds for:</strong></li>
<li><a href='javascript:void(0)' id='ds_att' class='sel inactive'>AT&T</a></li>
<li><a href='javascript:void(0)' id='ds_sprint' class='sel inactive'>Sprint</a></li>
<li><a href='javascript:void(0)' id='ds_tmobile' class='sel inactive'>T-Mobile</a></li>
<li><a href='javascript:void(0)' id='ds_vz' class='sel inactive'>Verizon</a></li>
Expand All @@ -23,9 +17,15 @@ <h3>Measuring Broadband America Mobile Broadband Services</h3>
</div>
</div>

<div id="map-c" class="container">
<div class="content">
<div id="map"></div>
</div>
</div>

<div class="container">
<div class="content">
<aside id="map-legend">
<aside id="map-legend">
<table class="table">
<caption>Number of Mobile Tests</caption>
<tfoot>
Expand Down Expand Up @@ -54,14 +54,17 @@ <h3>Measuring Broadband America Mobile Broadband Services</h3>
</table>
</aside>
<h5 id="map-hd">FCC Mobile Speed Test</h5>
<p id="map-desc">This map represents the number of mobile speed tests collected to date on all networks by the FCC Mobile Speed Test app. These are early results, and the maps are a work in progress. The intent is to show preliminary activity from the project. Crowdsourced maps evolve and change over time as more users participate in the program; to contribute your results, download the FCC Speed Test app from the <a href="https://play.google.com/store/apps/details?id=com.samknows.fcc&hl=en" target="google_play">Google Play</a> or <a href="https://itunes.apple.com/us/app/fcc-speed-test/id794322383?mt=8&uo=4" target="app_store">iTunes app store</a>.</p>
<p id="map-desc">This map represents the number of mobile speed tests collected to date on all networks by the FCC Mobile Speed Test app. These are early results, and the maps are a work in progress. The intent is to show preliminary activity from the project. Crowdsourced maps evolve and change over time as more users participate in the program; to contribute your results, download the FCC Speed Test app from the <a href="https://play.google.com/store/apps/details?id=com.samknows.fcc&hl=en" target="google_play">Google Play</a> or <a href="https://itunes.apple.com/us/app/fcc-speed-test/id794322383?mt=8&uo=4" target="app_store">iTunes app store</a>.</p>
</div>
</div>

<div class="container">
<div class="content">
<hr>

{{ content }}
{{ content }}
</div>
</div>

<script>
var map = L.mapbox.map('map', 'fcc.map-kzt95hy6', {attributionControl: false,maxZoom:8})
.setView([38.82, -94.96], 4);
Expand Down Expand Up @@ -89,15 +92,15 @@ <h5 id="map-hd">FCC Mobile Speed Test</h5>
var ds_att_TL = L.mapbox.tileLayer('fcc.0novfgvi');
var ds_att_GL = L.mapbox.gridLayer('fcc.0novfgvi');
var ds_att_GC = L.mapbox.gridControl(ds_att_GL, {follow: true});

var ds_sprint_TL = L.mapbox.tileLayer('fcc.vy722o6r');
var ds_sprint_GL = L.mapbox.gridLayer('fcc.vy722o6r');
var ds_sprint_GC = L.mapbox.gridControl(ds_sprint_GL, {follow: true});

var ds_tmobile_TL = L.mapbox.tileLayer('fcc.xuwyiudi');
var ds_tmobile_GL = L.mapbox.gridLayer('fcc.xuwyiudi');
var ds_tmobile_GC = L.mapbox.gridControl(ds_tmobile_GL, {follow: true});

var ds_vz_TL = L.mapbox.tileLayer('fcc.y9nc23xr');
var ds_vz_GL = L.mapbox.gridLayer('fcc.y9nc23xr');
var ds_vz_GC = L.mapbox.gridControl(ds_vz_GL, {follow: true});
Expand All @@ -111,22 +114,22 @@ <h5 id="map-hd">FCC Mobile Speed Test</h5>
ds_all: {
title: 'Median Speeds - Combined',
description: 'This map represents the median mobile download speed for tests collected to date on all networks by the FCC Mobile Speed Test app. These are early results, and the maps are a work in progress. The intent is to show preliminary activity from the project. Crowdsourced maps evolve and change over time as more users participate in the program; to contribute your results, download the FCC Speed Test app from the <a href="https://play.google.com/store/apps/details?id=com.samknows.fcc&hl=en" target="_new">Google Play</a> or <a href="https://itunes.apple.com/us/app/fcc-speed-test/id794322383?mt=8&uo=4" target="_new">iTunes app store</a>.',
legend: '<table class="table"><caption>Median Mobile Speed</caption><tfoot><tr><td colspan="3"><p class="caption">Mobile Tests 11/1/13 to 2/28/14</p></td></tr></tfoot><tbody><tr><th style="white-space:nowrap;">&lt; 1 Mbps</th><td><span style="background-color:#dfcfc0"></span></td></tr><tr><th style="white-space:nowrap;">1 to 3 Mbps</th><td><span style="background-color:#e9af78"></span></td></tr><tr><th style="white-space:nowrap;">3 to 5 Mbps</th><td><span style="background-color:#f79030"></span></td></tr><tr><th style="white-space:nowrap;">&gt; 5 Mbps</th><td><span style="background-color:#df5900"></span></td></tr></tbody></table>'
legend: '<table class="table"><caption>Median Mobile Speed</caption><tfoot><tr><td colspan="3"><p class="caption">Mobile Tests 11/1/13 to 2/28/14</p></td></tr></tfoot><tbody><tr><th style="white-space:nowrap;">&lt; 1 Mbps</th><td><span style="background-color:#dfcfc0"></span></td></tr><tr><th style="white-space:nowrap;">1 to 3 Mbps</th><td><span style="background-color:#e9af78"></span></td></tr><tr><th style="white-space:nowrap;">3 to 5 Mbps</th><td><span style="background-color:#f79030"></span></td></tr><tr><th style="white-space:nowrap;">&gt; 5 Mbps</th><td><span style="background-color:#df5900"></span></td></tr></tbody></table>'
},
ds_att: {
title: 'Median Speeds - AT&T',
description: 'This map represents the median mobile download speed for tests collected to date on the AT&T network by the FCC Mobile Speed Test app. These are early results, and the maps are a work in progress. The intent is to show preliminary activity from the project. Crowdsourced maps evolve and change over time as more users participate in the program; to contribute your results, download the FCC Speed Test app from the <a href="https://play.google.com/store/apps/details?id=com.samknows.fcc&hl=en" target="_new">Google Play</a> or <a href="https://itunes.apple.com/us/app/fcc-speed-test/id794322383?mt=8&uo=4" target="_new">iTunes app store</a>.',
legend: '<table class="table"><caption>Median Mobile Speed</caption><tfoot><tr><td colspan="3"><p class="caption">Mobile Tests 11/1/13 to 2/28/14</p></td></tr></tfoot><tbody><tr><th style="white-space:nowrap;">&lt; 1 Mbps</th><td><span style="background-color:#BBBDBF"></span></td></tr><tr><th style="white-space:nowrap;">1 to 3 Mbps</th><td><span style="background-color:#afd1e7"></span></td></tr><tr><th style="white-space:nowrap;">3 to 5 Mbps</th><td><span style="background-color:#3d8dc3"></span></td></tr><tr><th style="white-space:nowrap;">&gt; 5 Mbps</th><td><span style="background-color:#08306b"></span></td></tr><tr><th style="white-space:nowrap;">Too few tests</th><td><span style="border: 1px solid #08306b;"></span></td></tr></tbody></table>'
legend: '<table class="table"><caption>Median Mobile Speed</caption><tfoot><tr><td colspan="3"><p class="caption">Mobile Tests 11/1/13 to 2/28/14</p></td></tr></tfoot><tbody><tr><th style="white-space:nowrap;">&lt; 1 Mbps</th><td><span style="background-color:#BBBDBF"></span></td></tr><tr><th style="white-space:nowrap;">1 to 3 Mbps</th><td><span style="background-color:#afd1e7"></span></td></tr><tr><th style="white-space:nowrap;">3 to 5 Mbps</th><td><span style="background-color:#3d8dc3"></span></td></tr><tr><th style="white-space:nowrap;">&gt; 5 Mbps</th><td><span style="background-color:#08306b"></span></td></tr><tr><th style="white-space:nowrap;">Too few tests</th><td><span style="border: 1px solid #08306b;"></span></td></tr></tbody></table>'
},
ds_sprint: {
title: 'Median Speeds - Sprint',
description: 'This map represents the median mobile download speed for tests collected to date on the Sprint network by the FCC Mobile Speed Test app. These are early results, and the maps are a work in progress. The intent is to show preliminary activity from the project. Crowdsourced maps evolve and change over time as more users participate in the program; to contribute your results, download the FCC Speed Test app from the <a href="https://play.google.com/store/apps/details?id=com.samknows.fcc&hl=en" target="_new">Google Play</a> or <a href="https://itunes.apple.com/us/app/fcc-speed-test/id794322383?mt=8&uo=4" target="_new">iTunes app store</a>.',
legend: '<table class="table"><caption>Median Mobile Speed</caption><tfoot><tr><td colspan="3"><p class="caption">Mobile Tests 11/1/13 to 2/28/14</p></td></tr></tfoot><tbody><tr><th style="white-space:nowrap;">&lt; 1 Mbps</th><td><span style="background-color:#CECFCD"></span></td></tr><tr><th style="white-space:nowrap;">1 to 3 Mbps</th><td><span style="background-color:#777877"></span></td></tr><tr><th style="white-space:nowrap;">3 to 5 Mbps</th><td><span style="background-color:#505150"></span></td></tr><tr><th style="white-space:nowrap;">&gt; 5 Mbps</th><td><span style="background-color:#141313"></span></td></tr><tr><th style="white-space:nowrap;">Too few tests</th><td><span style="border: 1px solid #141313;"></span></td></tr></tbody></table>'
legend: '<table class="table"><caption>Median Mobile Speed</caption><tfoot><tr><td colspan="3"><p class="caption">Mobile Tests 11/1/13 to 2/28/14</p></td></tr></tfoot><tbody><tr><th style="white-space:nowrap;">&lt; 1 Mbps</th><td><span style="background-color:#CECFCD"></span></td></tr><tr><th style="white-space:nowrap;">1 to 3 Mbps</th><td><span style="background-color:#777877"></span></td></tr><tr><th style="white-space:nowrap;">3 to 5 Mbps</th><td><span style="background-color:#505150"></span></td></tr><tr><th style="white-space:nowrap;">&gt; 5 Mbps</th><td><span style="background-color:#141313"></span></td></tr><tr><th style="white-space:nowrap;">Too few tests</th><td><span style="border: 1px solid #141313;"></span></td></tr></tbody></table>'
},
ds_tmobile: {
title: 'Median Speeds - T-Mobile',
description: 'This map represents the median mobile download speed for tests collected to date on the T-Mobile network by the FCC Mobile Speed Test app. These are early results, and the maps are a work in progress. The intent is to show preliminary activity from the project. Crowdsourced maps evolve and change over time as more users participate in the program; to contribute your results, download the FCC Speed Test app from the <a href="https://play.google.com/store/apps/details?id=com.samknows.fcc&hl=en" target="_new">Google Play</a> or <a href="https://itunes.apple.com/us/app/fcc-speed-test/id794322383?mt=8&uo=4" target="_new">iTunes app store</a>.',
legend: '<table class="table"><caption>Median Mobile Speed</caption><tfoot><tr><td colspan="3"><p class="caption">Mobile Tests 11/1/13 to 2/28/14</p></td></tr></tfoot><tbody><tr><th style="white-space:nowrap;">&lt; 1 Mbps</th><td><span style="background-color:#ffe3f0"></span></td></tr><tr><th style="white-space:nowrap;">1 to 3 Mbps</th><td><span style="background-color:#ff99e3"></span></td></tr><tr><th style="white-space:nowrap;">3 to 5 Mbps</th><td><span style="background-color:#ff4fd6"></span></td></tr><tr><th style="white-space:nowrap;">&gt; 5 Mbps</th><td><span style="background-color:#b5048f"></span></td></tr><tr><th style="white-space:nowrap;">Too few tests</th><td><span style="border: 1px solid #b5048f;"></span></td></tr></tbody></table>'
legend: '<table class="table"><caption>Median Mobile Speed</caption><tfoot><tr><td colspan="3"><p class="caption">Mobile Tests 11/1/13 to 2/28/14</p></td></tr></tfoot><tbody><tr><th style="white-space:nowrap;">&lt; 1 Mbps</th><td><span style="background-color:#ffe3f0"></span></td></tr><tr><th style="white-space:nowrap;">1 to 3 Mbps</th><td><span style="background-color:#ff99e3"></span></td></tr><tr><th style="white-space:nowrap;">3 to 5 Mbps</th><td><span style="background-color:#ff4fd6"></span></td></tr><tr><th style="white-space:nowrap;">&gt; 5 Mbps</th><td><span style="background-color:#b5048f"></span></td></tr><tr><th style="white-space:nowrap;">Too few tests</th><td><span style="border: 1px solid #b5048f;"></span></td></tr></tbody></table>'
},
ds_vz: {
title: 'Median Speeds - Verizon',
Expand All @@ -142,21 +145,21 @@ <h5 id="map-hd">FCC Mobile Speed Test</h5>
d3.select('.map-legend').remove();
d3.selectAll(".sel").attr("class","sel inactive");
d3.select(this).attr("class","sel active");

tileName = d3.select(this).attr("id");
activeLayerGroup.clearLayers();

activeLayerGroup.addLayer(eval(tileName+"_TL"));
activeLayerGroup.addLayer(eval(tileName+"_GL"));
activeLayerGroup.addLayer(eval(tileName+"_GC"));


d3.select('#map-hd').text(mapHd[this.id].title);
d3.select('#map-desc').html(mapHd[this.id].description);
d3.select('#map-legend').html(mapHd[this.id].legend);
d3.select('#map-legend').html(mapHd[this.id].legend);
}
});

</script>

{% include footer.html %}
{% include footer.html %}
5 changes: 2 additions & 3 deletions css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ ul.inline {
list-style: none;
margin: 10px 0 0;
padding: 0;
text-align: center;
}
ul.inline li {
display: inline-block;
Expand Down Expand Up @@ -196,7 +195,7 @@ h6 {
hr {
border: none;
border-top: 1px solid #dddddd;
margin: 4rem 0;
margin: 100px 0 30px;
}

.container {
Expand Down Expand Up @@ -461,7 +460,7 @@ th {
}
#map-legend {
float: right;
top: -90px;
top: 0;
width: 33.33333%;
}

Expand Down