From e95b2434b61257da94da069ef677fab9bc35108f Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Mon, 25 Jan 2021 12:58:12 +0100
Subject: [PATCH] work
---
app.py | 8 ++++----
templates/vaccination/fragment_navtabs_vaccination.html | 2 +-
...l => fragment_vaccination_timeline_germany_table.html} | 0
...ny_timeline.html => vaccination_timeline_germany.html} | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
rename templates/vaccination/{fragment_vaccination_germany_timeline_table.html => fragment_vaccination_timeline_germany_table.html} (100%)
rename templates/vaccination/{vaccination_germany_timeline.html => vaccination_timeline_germany.html} (85%)
diff --git a/app.py b/app.py
index 00d65d52..86b80a4e 100644
--- a/app.py
+++ b/app.py
@@ -651,13 +651,13 @@ def url_vaccination_update_data():
return redirect(url_for('url_vaccination_tasks'))
-@app.route('/vaccination/imported/page/<int:page>')
-@app.route('/vaccination/imported')
-def url_vaccination_germany_timeline(page=1):
+@app.route('/vaccination/timeline/germany/page/<int:page>')
+@app.route('/vaccination/timeline/germany')
+def url_vaccination_timeline_germany(page=1):
page_info = ApplicationPage('Vaccination', "Germany Timeline")
page_data = VaccinationGermanyTimeline.get_all_as_page(page)
return render_template(
- 'vaccination/vaccination_germany_timeline.html',
+ 'vaccination/vaccination_timeline_germany.html',
page_data=page_data,
page_info=page_info)
diff --git a/templates/vaccination/fragment_navtabs_vaccination.html b/templates/vaccination/fragment_navtabs_vaccination.html
index cf9ade0b..c163cf23 100644
--- a/templates/vaccination/fragment_navtabs_vaccination.html
+++ b/templates/vaccination/fragment_navtabs_vaccination.html
@@ -7,7 +7,7 @@
<a class="nav-link" href="/vaccination/info">Vaccination Info</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/vaccination/imported">Vaccination imported</a>
+ <a class="nav-link" href="/vaccination/timeline/germany">Vaccination :: Timeline :: Germany</a>
</li>
</ul>
</nav>
\ No newline at end of file
diff --git a/templates/vaccination/fragment_vaccination_germany_timeline_table.html b/templates/vaccination/fragment_vaccination_timeline_germany_table.html
similarity index 100%
rename from templates/vaccination/fragment_vaccination_germany_timeline_table.html
rename to templates/vaccination/fragment_vaccination_timeline_germany_table.html
diff --git a/templates/vaccination/vaccination_germany_timeline.html b/templates/vaccination/vaccination_timeline_germany.html
similarity index 85%
rename from templates/vaccination/vaccination_germany_timeline.html
rename to templates/vaccination/vaccination_timeline_germany.html
index b10cd69e..d01da379 100644
--- a/templates/vaccination/vaccination_germany_timeline.html
+++ b/templates/vaccination/vaccination_timeline_germany.html
@@ -19,7 +19,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_vaccination_germany_timeline', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('url_vaccination_timeline_germany', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -27,7 +27,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_vaccination_germany_timeline', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('url_vaccination_timeline_germany', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -43,13 +43,13 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_vaccination_germany_timeline', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('url_vaccination_timeline_germany', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'vaccination/fragment_vaccination_germany_timeline_table.html' %}
+ {% include 'vaccination/fragment_vaccination_timeline_germany_table.html' %}
{% endblock %}
--
GitLab