Skip to content
Browse files

Changed the starting countries for compare

  • Loading branch information...
1 parent b9e721b commit 6a9b1ba194c10e196834487a6989d44c1f26e002 @zmaril zmaril committed Jun 27, 2012
View
2 build.sh
@@ -10,3 +10,5 @@ cd ../css/
cat swatchmaker/swatch/bootstrap.css index.css rickshaw.min.css jquery-ui-1.8.20.custom.css > together.css
uglifycss together.css > ../../prod-country-dashboard/css/index.css
+
+cd ../..
View
7 country-dashboard/js/index.coffee
@@ -46,12 +46,7 @@ HashBangs = Backbone.Router.extend
if countries
selectedCountries = _.map(countries.split("/"), (c)-> if c.length is 0 then null else decodeURI(c))
else
- selectedCountries = _.chain(data.working).keys()
- .intersect(worldCountries)
- .intersect()
- .filter((d)-> data.working[d].normal_hours?)
- .shuffle().value()
- .slice(10,20)
+ selectedCountries = ["Philippines","India","Bangladesh","Pakistan","Russia","Ukraine","United States"]
while selectedCountries.length isnt 60 #compare.rainbow.length
selectedCountries.push(null)
View
4 country-dashboard/js/index.js
@@ -50,9 +50,7 @@ HashBangs = Backbone.Router.extend({
}
});
} else {
- selectedCountries = _.chain(data.working).keys().intersect(worldCountries).intersect().filter(function(d) {
- return data.working[d].normal_hours != null;
- }).shuffle().value().slice(10, 20);
+ selectedCountries = ["Philippines", "India", "Bangladesh", "Pakistan", "Russia", "Ukraine", "United States"];
}
while (selectedCountries.length !== 60) {
selectedCountries.push(null);
View
4 country-dashboard/js/together.js
@@ -1498,9 +1498,7 @@ HashBangs = Backbone.Router.extend({
}
});
} else {
- selectedCountries = _.chain(data.working).keys().intersect(worldCountries).intersect().filter(function(d) {
- return data.working[d].normal_hours != null;
- }).shuffle().value().slice(10, 20);
+ selectedCountries = ["Philippines", "India", "Bangladesh", "Pakistan", "Russia", "Ukraine", "United States"];
}
while (selectedCountries.length !== 60) {
selectedCountries.push(null);
View
28 prod-country-dashboard/index.html
@@ -8,7 +8,10 @@
<meta name="author" content="">
<!-- Le styles -->
+ <link href="./css/swatchmaker/swatch/bootstrap.css" rel="stylesheet">
<link href="./css/index.css" rel="stylesheet">
+ <link href="./css/rickshaw.min.css" rel="stylesheet">
+ <link href="./css/jquery-ui-1.8.20.custom.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
@@ -491,7 +494,30 @@ <h4 id="bubble-projects"></h4>
</div>
</div>
</section>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+
+
+
+ <!-- Le javascript
+ ================================================== -->
+ <!-- Placed at the end of the document so the pages load faster -->
+ <script src="./js/jquery-1.7.2.min.js"></script>
+ <script src="./js/jquery-ui-1.8.20.custom.min.js"></script>
+
+ <script src="./js/bootstrap.min.js"></script>
+ <script src="./js/custom-tooltip.js"></script>
+
+ <script src="./js/underscore.min.js"></script>
+ <script src="./js/backbone.min.js"></script>
+
+ <script src="./js/d3.v2.min.js"></script>
+ <script src="./js/fisheye.js"></script>
+ <script src="./js/rickshaw.min.js"></script>
+
+ <script src="./js/start.js"></script>
+ <script src="./js/bubble.js"></script>
+ <script src="./js/watch.js"></script>
+ <script src="./js/compare.js"></script>
+ <!-- <script src="./js/rank.js"></script> -->
<script src="./js/index.js"></script>
</body>
View
2 prod-country-dashboard/js/index.js
1 addition, 1 deletion not shown because the diff is too large. Please use a local Git client to view these changes.

0 comments on commit 6a9b1ba

Please sign in to comment.
Something went wrong with that request. Please try again.