diff --git a/src/covid19/blueprints/owid/owid_model.py b/src/covid19/blueprints/owid/owid_model.py
index a31a43798a45410a761e7f2f8c0d6ed6ea82b123..0c57f6a68558d9aed82967cce1b038917a1cf419 100644
--- a/src/covid19/blueprints/owid/owid_model.py
+++ b/src/covid19/blueprints/owid/owid_model.py
@@ -194,8 +194,6 @@ class OwidData(db.Model):
).populate_existing().options(
joinedload(cls.country),
joinedload(cls.date_reported),
- ).order_by(
- cls.country.location
).paginate(page, per_page=ITEMS_PER_PAGE)
@classmethod
diff --git a/src/covid19/blueprints/owid/owid_views.py b/src/covid19/blueprints/owid/owid_views.py
index b4b75a0d81a2f222bbef3834603c6bf9517b6044..d36530d72d1df4a540260322c35181403ed2747a 100644
--- a/src/covid19/blueprints/owid/owid_views.py
+++ b/src/covid19/blueprints/owid/owid_views.py
@@ -410,7 +410,7 @@ def url_owid_country_one(country_id: int, page: int = 1):
page_info = ApplicationPage(
"country: " + owid_country_one.location,
'OWID',
- "data for OWID continent " + owid_country_one.region + " "
+ "data for OWID continent " + owid_country_one.continent.region + " "
)
try:
page_data = OwidData.get_data_for_country(owid_country_one, page)
@@ -431,7 +431,7 @@ def url_owid_country_one_germany(page: int = 1):
page_info = ApplicationPage(
"country: " + owid_country_one.location,
'OWID',
- "data for OWID continent " + owid_country_one.region + " "
+ "data for OWID continent " + owid_country_one.continent.region + " "
)
try:
page_data = OwidData.get_data_for_country(owid_country_one, page)
diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html
index c2ec50a9ef86733d360933ed619c4b677720751a..3137b1ec9e5eeab575e1a7f175d8dc1859684dd1 100644
--- a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/continent/owid_continent_all_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html
index 4cb0990df4f30ab2462732f3a898dbfce558c909..96ccd639b8d89a48283c8ab791b4a532f13b59dc 100644
--- a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/continent/owid_continent_one_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html
index c0b3e63911155ec746abf693d4b911f992194f19..a7cddc477d4aec6b41b3cf48da304573fb2351d2 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/country/owid_country_all_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html
index 41d35c4b466e7152d195743d8eeae915e267a6dd..73457f71b375d1aa03dec90761688f173ca60ac0 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html
@@ -24,13 +24,21 @@
<tbody>
{% for owid_country in page_data.items %}
<tr>
- <td>{{ owid_country.iso_code }}</td>
+ <td>
+ <a href="{{ url_for( 'owid.url_owid_country_one', country_id=owid_country.id) }}">
+ {{ owid_country.iso_code }}
+ </a>
+ </td>
<td>
<a href="{{ url_for( 'owid.url_owid_continent_one', continent_id=owid_country.continent.id) }}">
{{ owid_country.continent.region }}
</a>
</td>
- <td>{{ owid_country.location }}</td>
+ <td>
+ <a href="{{ url_for( 'owid.url_owid_country_one', country_id=owid_country.id) }}">
+ {{ owid_country.location }}
+ </a>
+ </td>
<td>{{ owid_country.population }}</td>
<td>{{ owid_country.population_density }}</td>
<td>{{ owid_country.median_age }}</td>
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html
index 877593380bc76614c4c4d049d0db192fe915a5ad..d1e72c2287b004408d1469c462fa9829b5a24996 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/country/owid_country_one_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
index 877593380bc76614c4c4d049d0db192fe915a5ad..d1e72c2287b004408d1469c462fa9829b5a24996 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/country/owid_country_one_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html
index 8f1305b53ea9c626c0a7f929b45edcf2a56aa4ce..199068c6f0bc34f021ca9188301337285ee93781 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html
@@ -4,7 +4,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('owid.url_owid_country_one', page=page_data.prev_num) }}">Previous</a>
+ href="{{ url_for('owid.url_owid_country_one', country_id=owid_country.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -13,7 +13,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('owid.url_owid_country_one', page=page_num) }}">{{ page_num }}</a>
+ href="{{ url_for('owid.url_owid_country_one', country_id=owid_country.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -30,7 +30,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('owid.url_owid_country_one', page=page_data.next_num) }}">Next</a>
+ href="{{ url_for('owid.url_owid_country_one', country_id=owid_country.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
index 1a443f7530daefe80f0de659ba3537008c094ea2..fca14b608beb62a3e674b967130fd08784e0d016 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_all_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
index bdd55720d6e40d18f15111a55092826635f6a3ea..507a19cd08a16de7a3a5d9781d5d6ed3d212a9f7 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
index 22a2b8de5bb5e793fbe146213a783905d2d56dd8..9936b1d3ab1ea04351f1a7da984e1fd2a229a4c4 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/fragments/fragment_owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_cases_cumulative_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
index c83b49497bb8f95645187c1ddd66457cd3991880..2c1b5ff2b1a65f68b3f5e32916f4ee47bbd5865b 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/fragments/fragment_owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_cases_new_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
index a98fb91b6d70e873d4614d3e98ba187c8cf13c2d..e0c793f4cc9dff7a8c2d6db80e67a725e916f0bd 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/fragments/fragment_owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_deaths_cumulative_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
index 0cc555e1ac3e1376f86616a27eccf981455618f4..6cbae917275c762b0f26a93a2ba711afc7be442d 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/fragments/fragment_owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_deaths_new_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html b/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html
index 5f32b6b8d1630a4c47d58c5c2f03c046cdb0050d..0422eb7d5235f4478fba98d7942f5dd7e5008a63 100644
--- a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html
+++ b/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/imported/owid_imported_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_info.html b/src/covid19/blueprints/owid/templates/owid/owid_info.html
index dd71fb641e7b962aaf9fcf862f76d1ec924a61e6..6628f1fe5dd6fa7c6abe427429614681533233b2 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_info.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_info.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
<div class="card">
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
index d545594470befb7aef741498f83613531c2ced04..12a85c1e3b39f745a6d85d418e770ce67cec5406 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
@@ -4,13 +4,10 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
- <a class="btn btn-danger btn-lg btn-block text-left"
- href="{{ url_for('owid.url_owid_test') }}"
- role="button">OWID :: TEST</a>
<a class="btn btn-primary btn-lg btn-block text-left"
href="{{ url_for( 'owid.url_task_owid_update_star_schema_initial') }}"
role="button">OWID :: Task :: update :: star_schema :: initial</a>