From 76f900520b474d6df43c455d954b3868acb4714b Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 6 Apr 2021 13:14:22 +0200
Subject: [PATCH] template changes
---
src/covid19/blueprints/ecdc/ecdc_views.py | 2 +-
.../ecdc/continent/ecdc_continent_all.html | 48 +++----------------
...tml => ecdc_continent_all_pagination.html} | 34 ++-----------
.../ecdc_continent_all_table.html} | 0
.../ecdc/continent/ecdc_continent_one.html | 48 +++----------------
.../ecdc_continent_one_pagination.html | 40 ++++++++++++++++
.../ecdc/country/ecdc_country_all.html | 48 +++----------------
.../country/ecdc_country_all_pagination.html | 40 ++++++++++++++++
.../ecdc_country_all_table.html} | 0
.../ecdc_country_germany_pagination.html | 40 ++++++++++++++++
.../country/ecdc_country_one_pagination.html | 45 +++++++++++++++++
.../ecdc_date_reported_all_pagination.html | 40 ++++++++++++++++
..._reported_one_cases_weekly_pagination.html | 45 +++++++++++++++++
...reported_one_deaths_weekly_pagination.html | 45 +++++++++++++++++
...rted_one_notification_rate_pagination.html | 45 +++++++++++++++++
.../ecdc_date_reported_one_pagination.html | 45 +++++++++++++++++
.../ecdc/imported/ecdc_imported.html | 33 +++++++++++++
.../ecdc_imported_pagination.html} | 29 +----------
.../ecdc_imported_table.html} | 0
19 files changed, 444 insertions(+), 183 deletions(-)
rename src/covid19/blueprints/ecdc/templates/ecdc/continent/{ecdc_continent_germany.html => ecdc_continent_all_pagination.html} (71%)
rename src/covid19/blueprints/ecdc/templates/ecdc/{fragments/fragment_ecdc_table_continent.html => continent/ecdc_continent_all_table.html} (100%)
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_pagination.html
rename src/covid19/blueprints/ecdc/templates/ecdc/{fragments/fragment_ecdc_table_country.html => country/ecdc_country_all_table.html} (100%)
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one_pagination.html
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html
create mode 100644 src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html
rename src/covid19/blueprints/ecdc/templates/ecdc/{ecdc_imported.html => imported/ecdc_imported_pagination.html} (73%)
rename src/covid19/blueprints/ecdc/templates/ecdc/{fragments/fragment_ecdc_table_data_imported.html => imported/ecdc_imported_table.html} (100%)
diff --git a/src/covid19/blueprints/ecdc/ecdc_views.py b/src/covid19/blueprints/ecdc/ecdc_views.py
index 79f33d86..41545393 100644
--- a/src/covid19/blueprints/ecdc/ecdc_views.py
+++ b/src/covid19/blueprints/ecdc/ecdc_views.py
@@ -49,7 +49,7 @@ def url_ecdc_data_imported(page=1):
page_info = ApplicationPage('Europe', "Last Import")
page_data = EcdcImport.get_all_as_page(page)
return render_template(
- 'ecdc/ecdc_imported.html',
+ 'ecdc/imported/ecdc_imported.html',
page_data=page_data,
page_info=page_info)
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
index 568456f5..e95a022b 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
@@ -7,51 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% if page_data.pages > 1 %}
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_continent_all', page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_continent_all', page=page_num) }}">
- {{ page_num }}
- </a>
- </li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
- </li>
- {% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_continent_all', page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
+ {% include 'ecdc/continent/ecdc_continent_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'ecdc/fragments/fragment_ecdc_table_continent.html' %}
+ {% include 'ecdc/continent/ecdc_continent_all_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'ecdc/continent/ecdc_continent_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html
similarity index 71%
rename from src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
rename to src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html
index 6368d826..01506846 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html
@@ -1,18 +1,9 @@
-{% extends 'application/page_layout.html' %}
-
-{% block content %}
- {{super()}}
- {% include 'ecdc/navigation/ecdc_navtabs.html' %}
-
- <div class="container">
- <div class="row">
- <div class="col">
{% if page_data.pages > 1 %}
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_continent', page=page_data.prev_num) }}">
+ href="{{ url_for( 'ecdc.url_ecdc_continent_all', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -22,7 +13,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_continent', page=page_num) }}">
+ href="{{ url_for( 'ecdc.url_ecdc_continent_all', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -40,29 +31,10 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_continent', page=page_data.next_num) }}">
+ href="{{ url_for( 'ecdc.url_ecdc_continent_all', page=page_data.next_num) }}">
Next
</a>
</li>
{% endif %}
</ul>
{% endif %}
- </div>
- </div>
- <div class="row">
- <div class="col">
- {% include 'ecdc/fragments/fragment_ecdc_table_country.html' %}
- </div>
- </div>
- </div>
-
-{% endblock %}
-
-
-{% block footer_container %}
- <div>
- {% for error in errors %}
- <h4>{{ error }}</h4>
- {% endfor %}
- </div>
-{% endblock %}
\ No newline at end of file
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_continent.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_table.html
similarity index 100%
rename from src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_continent.html
rename to src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_table.html
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
index 819ad9e7..24faf027 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
@@ -7,51 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% if page_data.pages > 1 %}
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_continent_one', continent_id=continent.id, page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_continent_one', continent_id=continent.id, page=page_num) }}">
- {{ page_num }}
- </a>
- </li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
- </li>
- {% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_continent_one', continent_id=continent.id, page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
+ {% include 'ecdc/continent/ecdc_continent_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'ecdc/fragments/fragment_ecdc_table_country.html' %}
+ {% include 'ecdc/fragments/../country/ecdc_country_all_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'ecdc/continent/ecdc_continent_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html
new file mode 100644
index 00000000..640fae08
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html
@@ -0,0 +1,40 @@
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_continent_one', continent_id=continent.id, page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_continent_one', continent_id=continent.id, page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_continent_one', continent_id=continent.id, page=page_data.next_num) }}">
+ Next
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
index 2286f3ef..ca07d13d 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
@@ -7,51 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% if page_data.pages > 1 %}
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_country_all', page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_country_all', page=page_num) }}">
- {{ page_num }}
- </a>
- </li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
- </li>
- {% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'ecdc.url_ecdc_country_all', page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
+ {% include 'ecdc/country/ecdc_country_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'ecdc/fragments/fragment_ecdc_table_country.html' %}
+ {% include 'ecdc/country/ecdc_country_all_table.html' %}
+ </div>
+ </div>ecdc_country_all_
+ <div class="row">
+ <div class="col">
+ {% include 'ecdc/country/ecdc_country_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_pagination.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_pagination.html
new file mode 100644
index 00000000..697038ca
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_pagination.html
@@ -0,0 +1,40 @@
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_country_all', page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_country_all', page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_country_all', page=page_data.next_num) }}">
+ Next
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_country.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_table.html
similarity index 100%
rename from src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_country.html
rename to src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_table.html
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html
new file mode 100644
index 00000000..18d29112
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html
@@ -0,0 +1,40 @@
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_country_germany', page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_country_germany', page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_country_germany', page=page_data.next_num) }}">
+ Next
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one_pagination.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one_pagination.html
new file mode 100644
index 00000000..975fdac2
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one_pagination.html
@@ -0,0 +1,45 @@
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_country_one',
+ country_id=europe_country.id,
+ page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_country_one',
+ country_id=europe_country.id,
+ page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_country_one',
+ country_id=europe_country.id, page=page_data.next_num) }}">
+ Next
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html
new file mode 100644
index 00000000..bc390d07
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html
@@ -0,0 +1,40 @@
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_all', page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_all', page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_all', page=page_data.next_num) }}">
+ Next
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html
new file mode 100644
index 00000000..8098718f
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html
@@ -0,0 +1,45 @@
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'europe.url_ecdc_date_reported_one_cases_weekly',
+ europe_date_reported_id=europe_date_reported.id,
+ page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'europe.url_ecdc_date_reported_one_cases_weekly',
+ europe_date_reported_id=europe_date_reported.id,
+ page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'europe.url_ecdc_date_reported_one_cases_weekly',
+ europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
+ Next
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html
new file mode 100644
index 00000000..dd00d3ad
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html
@@ -0,0 +1,45 @@
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_deaths_weekly',
+ europe_date_reported_id=europe_date_reported.id,
+ page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_deaths_weekly',
+ europe_date_reported_id=europe_date_reported.id,
+ page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_deaths_weekly',
+ europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
+ Next
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html
new file mode 100644
index 00000000..06e66841
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html
@@ -0,0 +1,45 @@
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_notification_rate',
+ europe_date_reported_id=europe_date_reported.id,
+ page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_notification_rate',
+ europe_date_reported_id=europe_date_reported.id,
+ page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_notification_rate',
+ europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
+ Next
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html
new file mode 100644
index 00000000..12d302ba
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html
@@ -0,0 +1,45 @@
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_one',
+ europe_date_reported_id=europe_date_reported.id,
+ page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_one',
+ europe_date_reported_id=europe_date_reported.id,
+ page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'ecdc.url_ecdc_date_reported_one',
+ europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
+ Next
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html b/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html
new file mode 100644
index 00000000..157df00e
--- /dev/null
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html
@@ -0,0 +1,33 @@
+{% extends 'application/page_layout.html' %}
+
+{% block content %}
+ {{super()}}
+ {% include 'ecdc/navigation/ecdc_navtabs.html' %}
+
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% include 'ecdc/imported/ecdc_imported_pagination.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'ecdc/imported/ecdc_imported_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'ecdc/imported/ecdc_imported_pagination.html' %}
+ </div>
+ </div>
+ </div>
+
+{% endblock %}
+
+{% block footer_container %}
+ <div>
+ {% for error in errors %}
+ <h4>{{ error }}</h4>
+ {% endfor %}
+ </div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html b/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_pagination.html
similarity index 73%
rename from src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
rename to src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_pagination.html
index 44aaf2ed..40548e26 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_pagination.html
@@ -1,14 +1,5 @@
-{% extends 'application/page_layout.html' %}
-
-{% block content %}
- {{super()}}
- {% include 'ecdc/navigation/ecdc_navtabs.html' %}
-
- <div class="container">
- <div class="row">
- <div class="col">
{% if page_data.pages > 1 %}
- <!-- previous page -->
+ <!-- previous page -->
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
@@ -44,21 +35,3 @@
{% endif %}
</ul>
{% endif %}
- </div>
- </div>
- <div class="row">
- <div class="col">
- {% include 'ecdc/fragments/fragment_ecdc_table_data_imported.html' %}
- </div>
- </div>
- </div>
-
-{% endblock %}
-
-{% block footer_container %}
- <div>
- {% for error in errors %}
- <h4>{{ error }}</h4>
- {% endfor %}
- </div>
-{% endblock %}
\ No newline at end of file
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_data_imported.html b/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_table.html
similarity index 100%
rename from src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_data_imported.html
rename to src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_table.html
--
GitLab