Skip to content

Commit

Permalink
build and build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Nate Smith committed Sep 4, 2014
1 parent c3344bc commit 30637ef
Show file tree
Hide file tree
Showing 18 changed files with 741 additions and 36 deletions.
1 change: 1 addition & 0 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ module.exports = function (grunt) {
'.htaccess',
'images/{,*/}*.{webp,gif}',
'styles/fonts/{,*/}*.*',
'fonts/{,*/}*.*'
]
}]
}
Expand Down
Binary file added app/fonts/glyphicons-halflings-regular.eot
View file
Binary file not shown.
229 changes: 229 additions & 0 deletions app/fonts/glyphicons-halflings-regular.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/fonts/glyphicons-halflings-regular.ttf
View file
Binary file not shown.
Binary file added app/fonts/glyphicons-halflings-regular.woff
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion app/styles/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ p, div, span, section, label, ul, li {
/************** Navs ********************************/

body .navbar {
min-height: 50px !important;
min-height: 65px !important;
height: 60px;
position: fixed;
z-index: 100;
Expand Down
Binary file added dist/fonts/glyphicons-halflings-regular.eot
View file
Binary file not shown.
229 changes: 229 additions & 0 deletions dist/fonts/glyphicons-halflings-regular.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/fonts/glyphicons-halflings-regular.ttf
View file
Binary file not shown.
Binary file added dist/fonts/glyphicons-halflings-regular.woff
View file
Binary file not shown.
83 changes: 50 additions & 33 deletions dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link href="img/favicon.ico" rel="shortcut icon">

<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<link rel="stylesheet" href="styles/2b7861ca.main.css">
<link rel="stylesheet" href="styles/d04aaa33.main.css">

<!--[if lt IE 9]>
<script src="scripts/vendor/ie9/html5shiv.js"></script>
Expand All @@ -30,43 +30,64 @@
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
</button>
<a class="navbar-brand layer" href="#" data-zoom="3" data-layer="all">
<a class="navbar-brand layer" href="#" data-zoom="5" data-layer="all">
<img src="img/who-logo-prp.gif" alt="who-logo-prp" height="60">
<span class="title">Ebola Outbreak Data</span>
<span class="title">Ebola Portal</span>
</a>
</div>
<div class="navbar-collapse collapse" role="navigation">
<ul class="nav nav-pills navbar-right" id="nav-main">
<li>
<a href="#" class="layer" data-zoom="3" data-layer="all">Home</a>
<a href="#" class="layer" data-zoom="5" data-layer="all">Map</a>
</li>

<li class="dropwdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Explore <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
<li><a href="#" class="layer" data-zoom="3" data-layer="risk">Risk</a></li>
<li><a href="#" class="layer" data-zoom="7" data-layer="cases">Cases</a></li>
<li><a href="#" class="layer" data-zoom="8" data-layer="response">Response</a></li>
</ul>
</li><li>

</li><li>
<a href="" data-toggle="modal" data-target="#dataModal">Data</a>
<li>
<a href="/roadmap">Roadmap</a>
</li>
<li>
<a href="/roadmap">Response</a>
</li>
<li>
<a href="/roadmap">Resources</a>
</li>
<li>
<a href="/roadmap">Contact Us</a>
</li>
</ul>
</div>
</div>
</div>
</div>

<div class="dropdown">
<button id="dLabel" class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">Explore
<span class="caret"></span>
</button>
<ul class="dropdown-menu menu-right" role="menu" aria-labelledby="dLabel">
<li role="presentation"><a role="menuitem" href="#" class="layer" data-zoom="6" data-layer="cases">Cases</a></li>
<li role="presentation"><a role="menuitem" href="#" class="layer" data-zoom="7" data-layer="response">District Response</a></li>
<li role="presentation"><a role="menuitem" href="#" class="layer" data-zoom="4" data-layer="risk">Global Response</a></li>
<li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" href="#" class="layer" data-zoom="5" data-layer="all">Reset Map</a></li>
</ul>
</div>

<div class="download">
<button class="btn btn-default" href="" data-toggle="modal" data-target="#dataModal">Data</button>
</div>

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

<div class="graph-container">



<div class="container">

<div class="row">

<div class="col-md-6" id="epi-graph">

<h5 class="who-title">Reported Ebola cases by week</h5>

<ul class="legend fixed-legend">
Expand All @@ -83,34 +104,33 @@ <h5 class="who-title" id="geography-zoom-level">Country-level response</h5>

<ul class="country legend inline-legend fixed-width bg-white">
<li><span class="box zone-0">&nbsp;</span></li>
<li><span class="box zone-1">&nbsp;</span></li>
<li><span class="box zone-2">&nbsp;</span></li>
<li><span class="box zone-3">&nbsp;</span></li>
<li><span class="box zone-4">&nbsp;</span></li>
<li>No Ebola cases/rumours</li>
<li>Rumour countries</li>
<li>At-risk countries</li>
<li>New countries with cases</li>
<li>Core zone</li>
<li>Land bordering countries</li>
<li>Initial Cases or localized transmission</li>
<li>Widespread & intense transmission</li>
</ul>

<ul class="district legend inline-legend fixed-width bg-white" style="display:none">
<li><span class="box zone-0">&nbsp;</span></li>
<li><span class="box zone-1">&nbsp;</span></li>
<li><span class="box zone-2">&nbsp;</span></li>
<li><span class="box zone-3">&nbsp;</span></li>
<li><span class="box zone-4">&nbsp;</span></li>
<li>No Ebola cases</li>
<li>New Ebola cases</li>
<li>Active transmission outside core zone</li>
<li>Active transmission with response hubs</li>
<li>Core zone</li>
<li>Not Active - No cases in previous 21 days</li>
<li>Active - New Cases in previous 21 days</li>
<li>Newly Infected - New cases in previous 7 days</li>
</ul>

<div class="row marker-legend">

<a href="#" class="legend-control" data-toggle="tooltip" data-placement="top" title="Toggle legend"><span class="glyphicon glyphicon-chevron-up"></span></a>

<div class="col-md-4 cases-marker">
<img src="img/cases-marker.png"> Ebola cases
<div class="cases-label">Cases in past 7 days</div>
<div class="cases-label">Cases in past 21 days</div>
</div>
<div class="col-md-4 response-marker">
<img src="img/triage-64x64.png"> Triage and Transit posts
Expand Down Expand Up @@ -145,18 +165,15 @@ <h4 class="modal-title" id="dataModalLabel">Download Our Data</h4>
<div class="modal-body">
<h4>Ebola Virus Disease (EVD) Case Data</h4>
<p>EVD case data contains deidentified data about each case reported to the WHO. This data is updated daily and contains information about date reported, 2nd admin level location, category, and outcome. This data is a complied list from all WHO partners.</p>
<button id="csv-download-cases" class="download-button btn btn-default">Download EVD case data</button>

<h4>WHO Facilities List</h4>
<p>WHO Facilities List data is an itemized list of treatment centers and triage locations. This data contains facility location information as well as status, bed capacity, and status.</p>
<button id="csv-download-facilities" class="download-button btn btn-default">Download WHO Facilities List</button>

<h4>WHO Response Level Categorization</h4>
<p>WHO response level classifies countries and administrative areas according to level of response. Data is categorized at the country globally, and at the province/district level in countries with confirmed cases. Countries and administrative areas are classified with a level between 1 to 5. Level corresponds to an evaluation criteria and is updated on a daily basis.</p>
<button id="csv-download-response" class="download-button btn btn-default">Download WHO Response Level Categorization</button>

<h4>License</h4>
<p>All data is public domain and made freely available under the <a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0 license</a>. </p>
<h4>Data Availability</h4>
<p>Data will be made available for open access in the coming days. All data will be made available via open format downloads as well as through an open access API.</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -226,7 +243,7 @@ <h4>License</h4>

<script src="scripts/2ee30a36.vendor.js"></script>

<script src="scripts/c0d27484.main.js"></script>
<script src="scripts/2261ef4e.main.js"></script>

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down
1 change: 1 addition & 0 deletions dist/scripts/2261ef4e.main.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/scripts/c0d27484.main.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion dist/styles/2b7861ca.main.css → dist/styles/d04aaa33.main.css
View file

Large diffs are not rendered by default.

Binary file added dist/styles/fonts/glyphicons-halflings-regular.eot
View file
Binary file not shown.
Loading

0 comments on commit 30637ef

Please sign in to comment.