Skip to content

Commit

Permalink
Change method of downloading data
Browse files Browse the repository at this point in the history
  • Loading branch information
@kamicut
kamicut committed Jun 11, 2014
1 parent 2f7e291 commit acb5458
Show file tree
Hide file tree
Showing 15 changed files with 31 additions and 68 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ node_modules
.DS_Store
.tmp
.sass-cache
experiments
experiments
*.zip
4 changes: 3 additions & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ module.exports = function (grunt) {
dest: '<%= yeoman.app %>',
src: [
'data/**',
'data.zip'
]
}]
},
Expand All @@ -232,7 +233,8 @@ module.exports = function (grunt) {
'styles/{,*/}*.css',
'bower_components/**',
'data/**',
'CNAME'
'CNAME',
'data.zip'
]
}]
}
Expand Down
7 changes: 1 addition & 6 deletions app/confessions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@
<ul id='toolbar'>
<li class='langbtn' id="home-btn">HOME</li>
<li class="langbtn" id="about-btn">ABOUT</li>
<li class='langbtn' id='download-data'>DOWNLOAD DATA
<ul id='toolbar-download'>
<a href="data/confessions/confessions.csv" > <li class='download-li'>CSV</li> </a>
<a href="data/confessions/confessions.geojson" > <li class='download-li'>GEOJSON</li> </a>
</ul>
</li>
<a href="https://github.com/ladeleb/platform/releases/latest" target="_blank"><li class='langbtn' id='download-data'>DOWNLOAD DATA</li></a>
<li class='langbtn' id='share-data'>SHARE
<ul id='toolbar-share'>
<a class='tweet' href="http://ladeleb.github.io/platform/confessions.html" title="#Lebanon voter trends by confession - Visualization by @ladeleb">
Expand Down
7 changes: 1 addition & 6 deletions app/gender.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@
<ul id='toolbar'>
<li class='langbtn' id="home-btn">HOME</li>
<li class="langbtn" id="about-btn">ABOUT</li>
<li class='langbtn' id='download-data'>DOWNLOAD DATA
<ul id='toolbar-download'>
<a href="data/gender/gender.csv" > <li class='download-li'>CSV</li> </a>
<a href="data/gender/gender.geojson" > <li class='download-li'>GEOJSON</li> </a>
</ul>
</li>
<a href="https://github.com/ladeleb/platform/releases/latest" target="_blank"><li class='langbtn' id='download-data'>DOWNLOAD DATA</li></a>
<!-- <li class='langbtn'>ABOUT THIS DATA</li> -->

<li class='langbtn' id='share-data'>SHARE
Expand Down
18 changes: 9 additions & 9 deletions app/scripts/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ M.Map.prototype.init = function(){
});


$('#download-data').on('click', function(){
if ($('#toolbar-download').is(':visible'))
$('#toolbar-download').fadeOut(75);
else
$('#toolbar-download').fadeIn(75);
});
$('.download-li').on('click', function(){
$('#toolbar-download').fadeOut(75);
});
// $('#download-data').on('click', function(){
// if ($('#toolbar-download').is(':visible'))
// $('#toolbar-download').fadeOut(75);
// else
// $('#toolbar-download').fadeIn(75);
// });
// $('.download-li').on('click', function(){
// $('#toolbar-download').fadeOut(75);
// });

$("#home-btn").on('click', function() {
var s = window.location.href;
Expand Down
7 changes: 1 addition & 6 deletions app/vote_power.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,7 @@
<ul id='toolbar'>
<li class='langbtn' id="home-btn">HOME</li>
<li class="langbtn" id="about-btn">ABOUT</li>
<li class='langbtn' id='download-data'>DOWNLOAD DATA
<ul id='toolbar-download'>
<a href="data/vote_power/vote_power.csv" > <li class='download-li'>CSV</li> </a>
<a href="data/vote_power/vote_power.geojson" > <li class='download-li'>GEOJSON</li> </a>
</ul>
</li>
<a href="https://github.com/ladeleb/platform/releases/latest" target="_blank"><li class='langbtn' id='download-data'>DOWNLOAD DATA</li></a>
<!-- <li class='langbtn'>ABOUT THIS DATA</li> -->

<li class='langbtn' id='share-data'>SHARE
Expand Down
7 changes: 1 addition & 6 deletions app/white_ballots.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@

<li class='langbtn' id="home-btn">HOME</li>
<li class="langbtn" id="about-btn">ABOUT</li>
<li class='langbtn' id='download-data'>DOWNLOAD DATA
<ul id='toolbar-download'>
<a href="data/white_ballots/white_ballots_csv.zip" > <li class='download-li'>CSV</li> </a>
<a href="data/white_ballots/white_ballots_geojson.zip" > <li class='download-li'>GEOJSON</li> </a>
</ul>
</li>
<a href="https://github.com/ladeleb/platform/releases/latest" target="_blank"><li class='langbtn' id='download-data'>DOWNLOAD DATA</li></a>
<!-- <li class='langbtn'>ABOUT THIS DATA</li> -->

<li class='langbtn' id='share-data'>SHARE
Expand Down
Binary file removed data.zip
View file
Binary file not shown.
Binary file removed data/white_ballots/white_ballots_csv.zip
View file
Binary file not shown.
Binary file removed data/white_ballots/white_ballots_geojson.zip
View file
Binary file not shown.
7 changes: 1 addition & 6 deletions dist/confessions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@
<ul id="toolbar">
<li class="langbtn" id="home-btn">HOME</li>
<li class="langbtn" id="about-btn">ABOUT</li>
<li class="langbtn" id="download-data">DOWNLOAD DATA
<ul id="toolbar-download">
<a href="data/confessions/confessions.csv"> <li class="download-li">CSV</li> </a>
<a href="data/confessions/confessions.geojson"> <li class="download-li">GEOJSON</li> </a>
</ul>
</li>
<a href="https://github.com/ladeleb/platform/releases/latest" target="_blank"><li class="langbtn" id="download-data">DOWNLOAD DATA</li></a>
<li class="langbtn" id="share-data">SHARE
<ul id="toolbar-share">
<a class="tweet" href="http://ladeleb.github.io/platform/confessions.html" title="#Lebanon voter trends by confession - Visualization by @ladeleb">
Expand Down
7 changes: 1 addition & 6 deletions dist/gender.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@
<ul id="toolbar">
<li class="langbtn" id="home-btn">HOME</li>
<li class="langbtn" id="about-btn">ABOUT</li>
<li class="langbtn" id="download-data">DOWNLOAD DATA
<ul id="toolbar-download">
<a href="data/gender/gender.csv"> <li class="download-li">CSV</li> </a>
<a href="data/gender/gender.geojson"> <li class="download-li">GEOJSON</li> </a>
</ul>
</li>
<a href="https://github.com/ladeleb/platform/releases/latest" target="_blank"><li class="langbtn" id="download-data">DOWNLOAD DATA</li></a>
<!-- <li class='langbtn'>ABOUT THIS DATA</li> -->

<li class="langbtn" id="share-data">SHARE
Expand Down
18 changes: 9 additions & 9 deletions dist/scripts/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ M.Map.prototype.init = function(){
});


$('#download-data').on('click', function(){
if ($('#toolbar-download').is(':visible'))
$('#toolbar-download').fadeOut(75);
else
$('#toolbar-download').fadeIn(75);
});
$('.download-li').on('click', function(){
$('#toolbar-download').fadeOut(75);
});
// $('#download-data').on('click', function(){
// if ($('#toolbar-download').is(':visible'))
// $('#toolbar-download').fadeOut(75);
// else
// $('#toolbar-download').fadeIn(75);
// });
// $('.download-li').on('click', function(){
// $('#toolbar-download').fadeOut(75);
// });

$("#home-btn").on('click', function() {
var s = window.location.href;
Expand Down
7 changes: 1 addition & 6 deletions dist/vote_power.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,7 @@
<ul id="toolbar">
<li class="langbtn" id="home-btn">HOME</li>
<li class="langbtn" id="about-btn">ABOUT</li>
<li class="langbtn" id="download-data">DOWNLOAD DATA
<ul id="toolbar-download">
<a href="data/vote_power/vote_power.csv"> <li class="download-li">CSV</li> </a>
<a href="data/vote_power/vote_power.geojson"> <li class="download-li">GEOJSON</li> </a>
</ul>
</li>
<a href="https://github.com/ladeleb/platform/releases/latest" target="_blank"><li class="langbtn" id="download-data">DOWNLOAD DATA</li></a>
<!-- <li class='langbtn'>ABOUT THIS DATA</li> -->

<li class="langbtn" id="share-data">SHARE
Expand Down
7 changes: 1 addition & 6 deletions dist/white_ballots.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@

<li class="langbtn" id="home-btn">HOME</li>
<li class="langbtn" id="about-btn">ABOUT</li>
<li class="langbtn" id="download-data">DOWNLOAD DATA
<ul id="toolbar-download">
<a href="data/white_ballots/white_ballots_csv.zip"> <li class="download-li">CSV</li> </a>
<a href="data/white_ballots/white_ballots_geojson.zip"> <li class="download-li">GEOJSON</li> </a>
</ul>
</li>
<a href="https://github.com/ladeleb/platform/releases/latest" target="_blank"><li class="langbtn" id="download-data">DOWNLOAD DATA</li></a>
<!-- <li class='langbtn'>ABOUT THIS DATA</li> -->

<li class="langbtn" id="share-data">SHARE
Expand Down

0 comments on commit acb5458

Please sign in to comment.