Skip to content
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.

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

Views tracking #142

Closed
wants to merge 41 commits into from
Closed
Changes from 32 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
c186189
Testing
Apr 24, 2014
ccaec90
Increased timeout to capture visualization clearly
Apr 24, 2014
9382e00
Implemented Staic ImageLookup,fixed missing label issues in tree_map …
Apr 24, 2014
ebe1e62
Fix update_viz base url issue
benjaminleichter Apr 30, 2014
20d21d6
Updated previous_page conditions to include beta
benjaminleichter Apr 30, 2014
f74b012
Removed stray console.log()
benjaminleichter May 1, 2014
a11e9e9
Fixed highlight box overflow issue
benjaminleichter May 5, 2014
d4a11fe
Cleaning up directory
benjaminleichter May 5, 2014
12c6a3e
Merge pull request #114 from cid-harvard/highlight
benjaminleichter May 5, 2014
aa8daae
Fixed tour / spotlight buttons
benjaminleichter May 5, 2014
7b6b6d2
Adding d3plus 1.2.4
romsson May 6, 2014
bc1ef1a
Boilerplate for new app (ex: scatterplot)
romsson May 6, 2014
824d774
Progress on new scatterplot app
romsson May 6, 2014
ee4f953
implemented generate log files,input list of urls,export option and S…
May 7, 2014
3176a1e
Fixed #110
romsson May 7, 2014
b3866f9
Added placeholders for ranking app
romsson May 7, 2014
b0519de
Progress on ranking app
romsson May 7, 2014
f2263cd
Fixed footerInner overflow issue
benjaminleichter May 7, 2014
ae7b644
Progress on rankings app
romsson May 7, 2014
ccdf129
Merge pull request #126 from cid-harvard/footer
benjaminleichter May 7, 2014
420117f
First version of rankings
romsson May 7, 2014
854a6a7
Misc fixes for rankings
romsson May 7, 2014
e1c1b18
ungrouped viz buttons in trade flow tab
benjaminleichter May 7, 2014
7703424
Added space to TF viz buttons
benjaminleichter May 7, 2014
c5570f1
fixed #50 (menu margins)
benjaminleichter May 8, 2014
84721aa
Fixed #16
benjaminleichter May 8, 2014
c05874f
Restored body background color
benjaminleichter May 9, 2014
5a8d86f
Add icons for #120 and fixed #128
benjaminleichter May 9, 2014
90263ec
Fixes #136
makmanalp May 9, 2014
dfee7b1
Merge branch '2digit_product_code_url_fix' into beta
makmanalp May 9, 2014
019f3da
Revert "Merge branch '2digit_product_code_url_fix' into beta"
makmanalp May 9, 2014
0e0ba33
Update html headers
romsson May 12, 2014
2f7bc1c
Progress on rankings
romsson May 12, 2014
3707ca8
Fixed #133 and adde new icons
benjaminleichter May 12, 2014
f3c6650
Re-fixed #31
romsson May 12, 2014
00c22b9
Merge branch 'beta' into Phase2_Mindteck
makmanalp May 12, 2014
a9a8c16
Progress on scatterplot app
romsson May 13, 2014
45ee5a1
Updates
romsson May 13, 2014
2b5a78f
Replaced stacked_controls container
benjaminleichter May 13, 2014
92639c7
merge branch 'beta' into Phase2_Mindteck
romsson May 13, 2014
1beb7e3
Views tracking with redis, saves a timestamp, image url and title.
makmanalp May 14, 2014
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
9 changes: 3 additions & 6 deletions html/about/data.html
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@
</div>
</div>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

<p>The Atlas online provides access to bilateral trade data for roughly 200 countries spanning 50 years and across 1000 different products, using the Standardized International Trade Code at the four-digit level (SITC-4) revision 2 classification. The Atlas online also provides world trade data in the Harmonized System Classification (HS4) maintained by the Centre d’Etudes Prospectives et d’Informations Internationales (CEPII) dating back to 1995. The sources of the data used are:</p>

@@ -50,9 +50,8 @@
<li>2001 – 2012: UN COMTRADE</li>
</ul>

<p><b>All the information related to data processing are now available on GitHub:</b></p>
<p><b>All the information related to data processing are now available on our <a href="https://github.com/cid-harvard/atlas-data">GitHub</a>.</b><p>

<p style="text-align:center"><a href="https://github.com/cid-harvard/atlas-data">https://github.com/cid-harvard/atlas-data</a></p>.

<a name="notes"></a>
<h3>Notes</h3>
@@ -71,11 +70,9 @@ <h3>Re-using and Contributing</h3>
<p>The Atlas online is published under a <a href="http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License">Creative Commons Attribution-Sharealike 3.0 Unported License</a>, so feel free to share the site and embed the apps anywhere on the Internet. When doing so, please remember to attribute the site and its <a href="about/#team">creators</a>.</p>


<p>As an open source platform, The Atlas online welcomes any and all collaborators to the project. We also provide an <a href="about/api/">API</a> for the casual user interested in embedding their own Atlas app on any webpage. If interested, fork the site at:</p>
<p>As an open source platform, The Atlas online welcomes any and all collaborators to the project. We also provide an <a href="about/api/">API</a> for the casual user interested in embedding their own Atlas app on any webpage. If interested, fork the site <a href="github.com/cid-harvard/atlas-economic-complexity">here</a>.</p>


<p style="text-align:center"><a href="github.com/cid-harvard/atlas-economic-complexity">http://github.com/Harvard-CID/observatory_economic_complexity/</a></p>

When referring to the site in publications, please cite the following reference:

<blockquote>"The Atlas of Economic Complexity," Center for International Development at Harvard University, http://www.atlas.cid.harvard.edu</blockquote>
2 changes: 1 addition & 1 deletion html/about/glossary.html
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
}
</style>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

{% include "about/glossary_text.html" %}

6 changes: 3 additions & 3 deletions html/about/glossary_text.html
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
<br>
<dl class="dl-horizontal">
<a name="capabilitydistance"></a>
<dt>Capability Distance:</dt>
<dd>A measure of a country’s ability to make a specific product determined by what it can currently produce. For every pair of goods in the world there is a notion of distance between them: if 2 goods require highly similar inputs and endowments, then they are ‘closer’ together, but if they require totally different capabilities, they are ‘further’ apart. </dd>
<dd>We calculate capability distance by the proportion of knowledge necessary for a product that the country does not have. The knowledge that the country does have is measured by the proximity between products it is currently making and the product of interest P. The knowledge it does not have is measured by the proximity between products it is not making and the product of interest P. Capability distance is therefore calculated as the sum of the proximities between good P and all the products that country C is not currently exporting, normalized by the sum of proximities between all products and product P. Formally, </dd>
<dt style="clear:none;">Capability Distance:</dt>
<dd>A measure of a country’s ability to make a specific product determined by what it can currently produce. For every pair of goods in the world there is a notion of distance between them: if 2 goods require highly similar inputs and endowments, then they are ‘closer’ together, but if they require totally different capabilities, they are ‘further’ apart.
We calculate capability distance by the proportion of knowledge necessary for a product that the country does not have. The knowledge that the country does have is measured by the proximity between products it is currently making and the product of interest P. The knowledge it does not have is measured by the proximity between products it is not making and the product of interest P. Capability distance is therefore calculated as the sum of the proximities between good P and all the products that country C is not currently exporting, normalized by the sum of proximities between all products and product P. Formally, </dd>

\begin{equation}\label{Distance}
d_{cp} = \frac{\sum\nolimits_{p'}\left(1 - M_{cp'}\right)\Phi_{p,p'}}{\sum\nolimits_{p'}\Phi_{p,p'}}
188 changes: 91 additions & 97 deletions html/about/index.html
Original file line number Diff line number Diff line change
@@ -2,10 +2,98 @@

{% block page_title %}About{% endblock %}
{% block heading_title %}About{% endblock %}

{% block css %}{% endblock %}

{% block content %}
<style>
body{
background-color: rgb(250, 250, 250);
}
ol.slats {
list-style: none;
}
ol.slats li {
margin: 0 0 10px 0;
padding: 0 0 10px 0;
border-bottom: 1px solid #eee;
}
ol.slats li:last-child {
margin: 0;
padding: 0;
border-bottom: none;
}
ol.slats li a {
text-decoration: none;
}
ol.slats li a h3 {
font-size: 18px;
font-weight: bold;
line-height: 1.1;
margin: 0 0 8px 0;
}
ol.slats li a img {
float: left;
margin: 0 10px 0 0;
padding: 4px;
border: 1px solid #eee;
}
ol.slats li a:hover img {
background: #eee;
}
ol.slats li a p {
margin: 0 0 0 110px;
font-size: 14px;
line-height: 1.4;
color: #555;
min-height: 75px;
}
ol.slats li a p span.meta {
display: block;
font-size: 12px;
color: #999;
}
@media screen and (max-width: 700px) {
ol.slats li a img {
display: block;
float: none;
margin: 0 0 5px 0;
}
ol.slats li a p {
margin: 0;
}
}
ol.v_slats {
list-style: none;
}
ol.v_slats li {
display: inline-block;
height: 150px;
margin: 0 15px 15px 0;
padding: 10px;
border: 1px solid #eee;
vertical-align: top;
width: 100px;
}
ol.v_slats li a {
text-decoration: none;
}
ol.v_slats li a h3 {
font-size: 16px;
line-height: 1.1;
margin: 0 0 8px 0;
}
.group img {
width:100px;
max-height:150px;
overflow: hidden;
}
.group {
height: 150px;
}
#sticky{
width: 265px;
}
</style>
<!-- the left pane -->

<div id="sticky-anchor"></div>
@@ -32,101 +120,7 @@
</div>
</div>

<style>
body{
background-color: rgb(250, 250, 250);
}
ol.slats {
list-style: none;
}
ol.slats li {
margin: 0 0 10px 0;
padding: 0 0 10px 0;
border-bottom: 1px solid #eee;
}
ol.slats li:last-child {
margin: 0;
padding: 0;
border-bottom: none;
}
ol.slats li a {
text-decoration: none;
}
ol.slats li a h3 {
font-size: 18px;
font-weight: bold;
line-height: 1.1;
margin: 0 0 8px 0;
}
ol.slats li a img {
float: left;
margin: 0 10px 0 0;
padding: 4px;
border: 1px solid #eee;
}
ol.slats li a:hover img {
background: #eee;
}
ol.slats li a p {
margin: 0 0 0 110px;
font-size: 14px;
line-height: 1.4;
color: #555;
min-height: 75px;
}
ol.slats li a p span.meta {
display: block;
font-size: 12px;
color: #999;
}
@media screen and (max-width: 700px) {
ol.slats li a img {
display: block;
float: none;
margin: 0 0 5px 0;
}
ol.slats li a p {
margin: 0;
}
}

ol.v_slats {
list-style: none;
}
ol.v_slats li {
display: inline-block;
height: 150px;
margin: 0 15px 15px 0;
padding: 10px;
border: 1px solid #eee;
vertical-align: top;
width: 100px;
}
ol.v_slats li a {
text-decoration: none;
}
ol.v_slats li a h3 {
font-size: 16px;
line-height: 1.1;
margin: 0 0 8px 0;
}

.group img {
width:100px;
max-height:150px;
overflow: hidden;
}

.group {
height: 150px;
}
#sticky{
width: 265px;
}
</style>


<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

<h3>What is it?</h3>

@@ -320,7 +314,7 @@ <h3>Press</h3>



Activates Tooptips
<!-- Activates Tooptips -->

<script type="text/javascript" src="../media/js/explore/tooltips.js"></script>
<script type="text/javascript" src="../media/js/libs/tipsy/tipsy.jquery.js"></script>
2 changes: 1 addition & 1 deletion html/about/permissions.html
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
</nav>
</div>

<div id="content">
<div id="aboutContent">
<div class="app_title" id="title"><h2>Permissions</h2></div>
<br><br><br><br>
<p>The observatory is published under a <a href="http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License">Creative Commons Attribution-Sharealike 3.0 Unported License</a> so feel free to share the site and embed the apps anywhere on the internet. When doing so, please remember to attribute the site and its <a href="about/#team">creators</a><p>
2 changes: 1 addition & 1 deletion html/about/privacy.html
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
</div>
</div>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

<h4>Privacy Statement for The Atlas online</h4>

2 changes: 1 addition & 1 deletion html/about/research.html
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
</div>
</div>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

<a name="growthlab"></a>
<h3>The Growth Lab</h3>
2 changes: 1 addition & 1 deletion html/about/support.html
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@
</div>
</div>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">
<p>The ongoing development and evolution of The Atlas online is made possible by the Founding Members. The Founding Members are a group of leading institutions that believe in the vision of The Atlas online and provide funding and support instrumental to the development and maintenance of this public good. The Founding Members are provided with training to maximize the utility of The Atlas online within their organizations, and they collaborate with the Center for International Development (CID) by offering feedback on the tool’s functionality.</p>

<p>Our Founding Members include:</p>
Loading