From 62aa25f974381ccd4f9a9b3caee20f8f259ab0eb Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 6 Apr 2021 13:22:06 +0200
Subject: [PATCH] template changes
---
.../date_reported/ecdc_date_reported_all.html | 46 +++--------------
.../date_reported/ecdc_date_reported_one.html | 51 +++----------------
2 files changed, 12 insertions(+), 85 deletions(-)
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
index d714114b..e053984f 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
@@ -7,46 +7,7 @@
<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_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 %}
+ {% include 'ecdc/date_reported/ecdc_date_reported_all_pagination.html' %}
</div>
</div>
<div class="row">
@@ -54,6 +15,11 @@
{% include 'ecdc/fragments/fragment_ecdc_table_date_reported.html' %}
</div>
</div>
+ <div class="row">
+ <div class="col">
+ {% include 'ecdc/date_reported/ecdc_date_reported_all_pagination.html' %}
+ </div>
+ </div>
</div>
{% endblock %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
index d0ca8bf6..4a2e1a71 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
@@ -7,51 +7,7 @@
<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_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 %}
+ {% include 'ecdc/date_reported/ecdc_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
@@ -59,6 +15,11 @@
{% include 'ecdc/fragments/fragment_ecdc_table_data.html' %}
</div>
</div>
+ <div class="row">
+ <div class="col">
+ {% include 'ecdc/date_reported/ecdc_date_reported_one_pagination.html' %}
+ </div>
+ </div>
</div>
{% endblock %}
--
GitLab