From c60ea07117df40f20e1c5c4f87877171ac477354 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 6 Apr 2021 16:46:34 +0200
Subject: [PATCH] template changes
---
.../templates/rki_bundeslaender/rki_bundeslaender_info.html | 2 +-
.../rki_bundeslaender/rki_bundeslaender_tasks.html | 2 +-
.../templates/rki_bundeslaender/rki_bundeslaender_test.html | 2 +-
.../templates/rki_landkreise/rki_landkreise_imported.html | 2 +-
.../templates/rki_landkreise/rki_landkreise_info.html | 2 +-
.../templates/rki_landkreise/rki_landkreise_tasks.html | 2 +-
.../blueprints/rki/rki_vaccination/rki_vaccination_views.py | 4 ++--
.../rki_vaccination/{ => data}/rki_vaccination_data.html | 6 +++---
.../rki_vaccination_data_pagination.html} | 2 +-
.../rki_vaccination_data_table.html} | 4 ++--
.../rki_vaccination_data_table_head.html} | 0
.../fragment_rki_vaccination_data_table_imported.html | 4 ++--
.../fragment_rki_vaccination_imported_pagination.html | 0
.../{ => imported}/rki_vaccination_imported.html | 0
14 files changed, 16 insertions(+), 16 deletions(-)
rename src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/{ => data}/rki_vaccination_data.html (61%)
rename src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/{fragments/fragment_rki_vaccination_data_pagination.html => data/rki_vaccination_data_pagination.html} (97%)
rename src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/{fragments/fragment_rki_vaccination_data_table.html => data/rki_vaccination_data_table.html} (92%)
rename src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/{fragments/fragment_rki_vaccination_data_table_head.html => data/rki_vaccination_data_table_head.html} (100%)
rename src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/{fragments => imported}/fragment_rki_vaccination_data_table_imported.html (92%)
rename src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/{fragments => imported}/fragment_rki_vaccination_imported_pagination.html (100%)
rename src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/{ => imported}/rki_vaccination_imported.html (100%)
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
index 2af87848..1b666e09 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html' %}
+ {% include 'rki_bundeslaender/navigation/rki_bundeslaender_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
index 48b6b4c4..b62f9970 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html' %}
+ {% include 'rki_bundeslaender/navigation/rki_bundeslaender_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_test.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_test.html
index 44d1d015..c87ce9ce 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_test.html
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_test.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html' %}
+ {% include 'rki_bundeslaender/navigation/rki_bundeslaender_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html
index 0b4202bf..c7eac471 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html
+++ b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
-{% include 'rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html' %}
+{% include 'rki_landkreise/navigation/rki_landkreise_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html
index fa4e012a..4b00cd59 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html
+++ b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html' %}
+ {% include 'rki_landkreise/navigation/rki_landkreise_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_tasks.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_tasks.html
index 82dbfb2d..d8dc6b7d 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_tasks.html
+++ b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_tasks.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html' %}
+ {% include 'rki_landkreise/navigation/rki_landkreise_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
index c93b94cc..9c89afac 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
+++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
@@ -45,7 +45,7 @@ def url_vaccination_imported(page=1):
page_info = ApplicationPage('Vaccination', "Data: Germany Timeline imported")
page_data = RkiVaccinationImport.get_all_as_page(page)
return render_template(
- 'rki_vaccination/rki_vaccination_imported.html',
+ 'rki_vaccination/imported/rki_vaccination_imported.html',
page_data=page_data,
page_info=page_info)
@@ -56,7 +56,7 @@ def url_vaccination_data(page=1):
page_info = ApplicationPage('Vaccination', "Data: Germany Timeline")
page_data = RkiVaccinationData.get_all_as_page(page)
return render_template(
- 'rki_vaccination/rki_vaccination_data.html',
+ 'rki_vaccination/data/rki_vaccination_data.html',
page_data=page_data,
page_info=page_info)
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html
similarity index 61%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html
index 184c9dae..7faa0cb6 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
+++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html
similarity index 97%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html
index fc3c7bab..70b84e01 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html
+++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html
@@ -1,4 +1,4 @@
-{% if page_data.pages > 1 %}
+ {% if page_data.pages > 1 %}
<!-- previous page -->
<ul class="pagination">
{% if page_data.has_prev %}
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html
similarity index 92%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html
index b9a65f41..a0ad3415 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html
+++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html
@@ -2,7 +2,7 @@
<div class="table-responsive">
<table class="table table-hover table-striped table-sm table-bordered">
<thead>
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_table_head.html' %}
</thead>
<tbody>
{% for data_item in page_data.items %}
@@ -40,7 +40,7 @@
{% endfor %}
</tbody>
<tfoot>
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_table_head.html' %}
</tfoot>
</table>
</div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table_head.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table_head.html
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_data_table_imported.html
similarity index 92%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_data_table_imported.html
index 30e4e391..3cc74ead 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html
+++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_data_table_imported.html
@@ -2,7 +2,7 @@
<div class="table-responsive">
<table class="table table-hover table-striped table-sm table-bordered">
<thead>
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %}
+ {% include 'rki_vaccination/fragments/../data/rki_vaccination_data_table_head.html' %}
</thead>
<tbody>
{% for data_item in page_data.items %}
@@ -40,7 +40,7 @@
{% endfor %}
</tbody>
<tfoot>
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %}
+ {% include 'rki_vaccination/fragments/../data/rki_vaccination_data_table_head.html' %}
</tfoot>
</table>
</div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_imported_pagination.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_imported_pagination.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_imported_pagination.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_imported_pagination.html
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_imported.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_imported.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html
--
GitLab