From fdad47f6ff2f9465dd9bbf7dc7d001c64a023bfe Mon Sep 17 00:00:00 2001 From: romsson Date: Mon, 4 Aug 2014 15:10:21 -0400 Subject: [PATCH 01/82] Adding links to products in rankings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ideally should point to the product’s page, but does not exist yet. --- html/rankings/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/rankings/index.html b/html/rankings/index.html index 70fdea06..b5445971 100644 --- a/html/rankings/index.html +++ b/html/rankings/index.html @@ -150,7 +150,7 @@

Download

{{r.0}} {{r.1}} - {% if category == "country" %}{{r.2}}{% else %}{{r.2}}{% endif %} + {% if category == "country" %}{{r.2}}{% else %}{{r.2}}{% endif %} {{r.3}} {% if r.4 > 0 %}
{% endif %}{% if r.4 == 0 %}-{% endif %}{% if r.4 < 0 %}
{% endif %} {{r.4}} From ef41a4c7227bbd61ebba82b61230f8fea0ff12a6 Mon Sep 17 00:00:00 2001 From: romsson Date: Mon, 4 Aug 2014 15:50:20 -0400 Subject: [PATCH 02/82] Link products to product page --- html/rankings/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/rankings/index.html b/html/rankings/index.html index b5445971..ec83ed06 100644 --- a/html/rankings/index.html +++ b/html/rankings/index.html @@ -150,7 +150,7 @@

Download

{{r.0}} {{r.1}} - {% if category == "country" %}{{r.2}}{% else %}{{r.2}}{% endif %} + {% if category == "country" %}{{r.2}}{% else %}{{r.2}}{% endif %} {{r.3}} {% if r.4 > 0 %}
{% endif %}{% if r.4 == 0 %}-{% endif %}{% if r.4 < 0 %}
{% endif %} {{r.4}} From 780f7aff51d0a2d306122ab457b6af31f340dc9f Mon Sep 17 00:00:00 2001 From: romsson Date: Mon, 4 Aug 2014 16:11:55 -0400 Subject: [PATCH 03/82] Adding links and icons to country pages links --- html/overview/country.html | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/html/overview/country.html b/html/overview/country.html index 45275a4b..77ea2638 100644 --- a/html/overview/country.html +++ b/html/overview/country.html @@ -94,6 +94,7 @@ border: 1px solid #666; } .dropdown dt a { + /*font-family: 'Cardo', serif, 'Times';*/ font-size: 30px; font-weight: normal; line-height: 36px; @@ -123,7 +124,7 @@ overflow-y: scroll; } .dropdown span.value { display:none; } -.dropdown dd ul li a { padding:5px; display:block;} +.dropdown dd ul li a { padding: 5px; display:block;} .dropdown dd ul li a:hover { background-color:#eee;} #content h2 { @@ -242,6 +243,13 @@ #quick_info table td:nth-child(1) { width: 170px; } + +a.product, a.country { + text-decoration: none; + padding: 0px; + margin: 0px; +} + {% endblock %} @@ -270,7 +278,7 @@ {% for p in export_products %} {% if forloop.counter < 6 %} - {{p.3}} ({{p.5|floatformat:0}}%){% if forloop.counter != 5 %},{% endif %} + {{p.1}}{{p.3}}({{p.5|floatformat:0}}%){% if forloop.counter != 5 %},{% endif %} {% endif %} {% endfor %} @@ -280,7 +288,7 @@ {% for p in import_products %} {% if forloop.counter < 6 %} - {{p.3}} ({{p.5|floatformat:0}}%){% if forloop.counter != 5 %},{% endif %} + {{p.1}}{{p.3}} ({{p.5|floatformat:0}}%){% if forloop.counter != 5 %},{% endif %} {% endif %} {% endfor %} @@ -290,7 +298,7 @@ {% for p in export_countries %} {% if forloop.counter < 6 %} - {{p.1}} ({{p.3|floatformat:0}}%){% if forloop.counter != 5 %},{% endif %} + {{p.1}} {{p.1}} ({{p.3|floatformat:0}}%){% if forloop.counter != 5 %},{% endif %} {% endif %} {% endfor %} @@ -300,7 +308,7 @@ {% for p in import_countries %} {% if forloop.counter < 6 %} - {{p.1}} ({{p.3|floatformat:0}}%){% if forloop.counter != 5 %},{% endif %} + {{p.1}} {{p.1}} ({{p.3|floatformat:0}}%){% if forloop.counter != 5 %},{% endif %} {% endif %} {% endfor %} @@ -498,4 +506,4 @@

What countries does {{country.name}} import from?

} }) -{% endblock %} +{% endblock %} \ No newline at end of file From e9dc00cf3a5c85abdfa01b95ffc464fd1635e569 Mon Sep 17 00:00:00 2001 From: romsson Date: Mon, 4 Aug 2014 16:20:15 -0400 Subject: [PATCH 04/82] Fixing iframe links --- html/overview/product.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/html/overview/product.html b/html/overview/product.html index 367aa00b..7396bf21 100644 --- a/html/overview/product.html +++ b/html/overview/product.html @@ -4,8 +4,8 @@ {% block page_title %}{{product.name_en}} Exporters and Importers{% endblock %} {% block heading_title %} -Learn More About: Trade of -