Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updating pictures. Still not good enough though.
  • Loading branch information
zmaril committed Jun 25, 2012
1 parent 8ba0f7a commit e5559c3
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 171 deletions.
Binary file modified country-dashboard/assets/bubble.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified country-dashboard/assets/compare.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified country-dashboard/assets/watch.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion country-dashboard/css/index.css
Expand Up @@ -3,9 +3,15 @@
}

#table{

}

.action > a > img{
width: 100%;
}

.row:nth-child(odd){
.action > p{
text-align: left;
}
/* Brand management */
.odesk-logo{
Expand Down
181 changes: 11 additions & 170 deletions country-dashboard/index.html
Expand Up @@ -107,179 +107,20 @@ <h1>Explore our world</h1>

</div>
</div>
<div class="row-fluid front-buttons">
<div class="span2"></div>

<div class="span2 well">
<img src="./assets/compare.png" ></img> <br /> <br />
<p>Compare the level of activity between countries. </p>
<p><a class="btn btn-large" href="#/compare">Compare Activity</a></p>
</div>

<div class="span1"></div>

<div class="span2 well">
<img src="./assets/watch.png"></img> <br /> <br />
<p>Watch the entire oDesk market through a typical day.</p>
<p><a class="btn btn-large" href="#/watch">Watch
Activity</a></p>
</div>

<div class="span1"></div>

<div class="span2 well">
<img src="./assets/bubble.png"></img> <br /> <br />
<p>Explore the types of projects being done on oDesk.</p>
<p><a class="btn btn-large" href="#/bubble">Project Bubbles</a></p>
</div>

<!-- <div class="span3"> -->
<!-- <img src="./assets/rank.png" width=200 height=200></img> -->
<!-- <br /> -->
<!-- <br /> -->
<!-- <p>Examine the types of projects being completed on -->
<!-- oDesk.</p> -->
<!-- <p><a class="btn btn-large" href="#/chart">Project Charts</a></p> -->
<!-- </div> -->

</div>
</div>
</section>

<section id="about" class="tab hidden">
<div class="container">
<div class="row">
<div class="span12">
<div class="row">
<div class="span6">
<div class="well">
<h1>oDesk serves the world</h1>
<p>
Over 250,000 businesses worldwide have used oDesk
to work with contractors. We've helped people
connect across oceans, mountains, and cultures. We
want to provide you with a way to explore oDesk
and get a global perspective of our
marketplace. If you feel inspired, head
over to oDesk and <a rel="nofollow"
class="buttonYellow postJobButton"
href="http://www.odesk.com/w/postjob.php"
alt="Post a job for free" title="Post a job for
free">post a job for free</a>
or <a href="http://www.odesk.com/w/professionals.php"
alt="Looking for work?" title="Looking for
work?">start looking for work</a>.
</p>
</div>
</div>
<div class="span6">
<div class="well">
<h1>Acknowledgements</h1>
<p>
This dashboard rests on the shoulders of open
source giants:
<ul>
<li><a href="http://www.d3js.org">d3.js</a></li>
<li><a href="https://github.com/shutterstock/rickshaw">Rickshaw</a></li>
<li><a href="http://www.jquery.com">jQuery</a></li>
<li><a href="http://twitter.github.com/bootstrap/index.html">Bootstrap</a></li>
<li><a href="http://www.bootswatch.com">Bootswatch</a></li>
<li><a href="http://backbonejs.org/">Backbone</a></li>
<li> “Globe” symbol in the background by Proletkult Graphik,
from <a href="http://thenounproject.com/">The Noun
Project</a> collection.</li>
</ul>
To give back, we
have <a href="https://github.com/johnjosephhorton/gg2d3/tree/master/country-dashboard">
open sourced </a> this project.
</p>
</div>
</div>
</div>
</div>
</div>
<div class="well">
<h1>Contributors</h1>
<div class="row">
<div class="offset1 span3">

<img src="./assets/horton.jpg" height=200>
<p>
<a href="https://twitter.com/#!/johnjhorton">John
Horton</a>
<br />
Labor Economist, oDesk
</p>

</div>

<div class="span3">

<img src="./assets/panos.jpg" height=200>
<p>
<a href="https://twitter.com/#!/ipeirotis">Panos Ipeirotis</a>
<br />
Academic in residence, oDesk
</p>

</div>
<div class="row-fluid front-buttons">
<div class="span1"> </div>
<div class="container-fluid span10">
<div class="row-fluid">

<div class=" span3">

<img src="./assets/maril.jpg" height=200>
<div class="span4 well action">
<a href="#/compare">
<img src="./assets/compare.png" ></img> <br /> <br />
</a>
<p>
<a href="https://twitter.com/#!/ZackMaril">Zack Maril</a>
<br />
Visualization
Consultant, <a href="https://www.odesk.com/users/~~80bea7ba2750c34b"> oDesk
</a>
<br />
</p>

</div>
</div>
</div>
</div>
</section>

<section id="compare" class="tab hidden">
<div class="container-fluid">
<div class="row-fluid">

<div class="span4">
<div class="well">
<h1>Compare Activity</h1>
<p>
There are contractors from over 180 different countries
on oDesk, each representing a distinct culture. This
section lets you cross these boundaries and compare each
country according to their own local time. Examples to
get you started:
<a href="#/compare/true/Spain/Portugal/United%20States/Canada/France/United Kingdom/Italy/Japan/"> G8
countries</a>,
<a href="#/compare/false/Bolivia/Argentina/Brazil/Uruguay/Peru/Colombia/Venezuela">
South America</a>, and <a href="#/compare/true/Russia/United%20States/Sweden/Finland/Canada/">a
selection of Northern countries</a>.
</p>
</div>

<div class="well">
<h3>Map</h3>
<p>Click on a country to toggle its selection. Hover to
display names.</p>
<div id="comparemap"></div>
</div>
</div>

<div class="span6">
<div class="well">
<h3>Number of
workers <span class="active-ex">active</span> during the
week</h3>
<div class="row-fluid">
<div class="span8">
<p>A chart of the number of workers active over the
course of the week. Hover to see the time interval,
Compare the levels of activity between over 180
countries. See how contractors work during the week
and the patterns that the time interval,
country name, and number of workers online.
</p>
</div>
Expand Down

0 comments on commit e5559c3

Please sign in to comment.