From 93ccea351f18d4bbedf06e1358651abaad96c8e1 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 6 Apr 2021 14:56:01 +0200
Subject: [PATCH] template changes
---
.../owid/country/owid_country_all_pagination.html | 6 +++---
.../owid/country/owid_country_one_germany_pagination.html | 6 +++---
.../owid/country/owid_country_one_pagination.html | 6 +++---
.../owid_date_reported_one_cases_cumulative.html | 8 ++++----
.../date_reported/owid_date_reported_one_cases_new.html | 8 ++++----
.../owid_date_reported_one_deaths_cumulative.html | 8 ++++----
.../date_reported/owid_date_reported_one_deaths_new.html | 2 +-
.../date_reported/owid_date_reported_one_pagination.html | 6 +++---
.../owid/templates/owid/navigation/owid_navtabs.html | 4 ++++
9 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html
index 2309b8d3..b1f1e1ef 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_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_test', page=page_data.prev_num) }}">Previous</a>
+ href="{{ url_for('owid.url_owid_country_all', 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_test', page=page_num) }}">{{ page_num }}</a>
+ href="{{ url_for('owid.url_owid_country_all', 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_test', page=page_data.next_num) }}">Next</a>
+ href="{{ url_for('owid.url_owid_country_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html
index 2309b8d3..f821a6ad 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_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_test', page=page_data.prev_num) }}">Previous</a>
+ href="{{ url_for('owid.url_owid_country_one_germany', 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_test', page=page_num) }}">{{ page_num }}</a>
+ href="{{ url_for('owid.url_owid_country_one_germany', 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_test', page=page_data.next_num) }}">Next</a>
+ href="{{ url_for('owid.url_owid_country_one_germany', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
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 2309b8d3..8f1305b5 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_test', page=page_data.prev_num) }}">Previous</a>
+ href="{{ url_for('owid.url_owid_country_one', 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_test', page=page_num) }}">{{ page_num }}</a>
+ href="{{ url_for('owid.url_owid_country_one', 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_test', page=page_data.next_num) }}">Next</a>
+ href="{{ url_for('owid.url_owid_country_one', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
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 7337b92a..6fc04644 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
@@ -12,7 +12,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_deaths_cumulative',
date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -21,7 +21,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_deaths_cumulative',
date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -38,7 +38,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_deaths_cumulative',
date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
@@ -48,7 +48,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
+ {% include 'owid/date_reported/owid_date_reported_one_table.html' %}
</div>
</div>
</div>
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 22eea526..d213649b 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
@@ -12,7 +12,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owiddate_reported_cases_new',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_new',
date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">
Previous
</a>
@@ -23,7 +23,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owiddate_reported_cases_new',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_new',
date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -40,7 +40,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owiddate_reported_cases_new',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_new',
date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
@@ -50,7 +50,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
+ {% include 'owid/date_reported/owid_date_reported_one_table.html' %}
</div>
</div>
</div>
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 7337b92a..a66b424b 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
@@ -12,7 +12,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_cumulative',
date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -21,7 +21,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_cumulative',
date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -38,7 +38,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one_cases_cumulative',
date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
@@ -48,7 +48,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
+ {% include 'owid/date_reported/owid_date_reported_one_table.html' %}
</div>
</div>
</div>
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 cf5bce32..8c94c181 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
@@ -54,7 +54,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
+ {% include 'owid/date_reported/owid_date_reported_one_table.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html
index 238c9a32..fd70c0b9 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html
@@ -3,7 +3,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owid_date_reported',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one',
date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -12,7 +12,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owid_date_reported',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one',
date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -29,7 +29,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('owid.url_owid_date_reported',
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_one',
date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
diff --git a/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html b/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html
index 3385ee54..9f01db3a 100644
--- a/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html
+++ b/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html
@@ -24,6 +24,10 @@
<a class="nav-link"
href="{{ url_for( 'owid.url_owid_country_all') }}">OWID Countries</a>
</li>
+ <li class="nav-item">
+ <a class="nav-link"
+ href="{{ url_for( 'owid.url_owid_country_one_germany') }}">OWID Germany</a>
+ </li>
<li class="nav-item">
<a class="nav-link"
href="{{ url_for( 'owid.url_owid_imported') }}">OWID imported</a>
--
GitLab