diff --git a/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
index c32f8575191e68685656ecb41aed06b8d4e82fb0..ae1c59b84f4709c35fc1b252ebf15e82b1291193 100644
--- a/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
+++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_continent.html' %}
+ {% include 'europe/fragments/fragment_europe_table_continent.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
index 3e16b8be980f6490c4c7d51f62aaee508f05aa74..e3c8dbb9ca3b4ae057c298c7fc7ba868a14ce875 100644
--- a/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
+++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %}
+ {% include 'europe/fragments/fragment_europe_table_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
index d80e6d7ee538ef3b2226b324f60f21c5a2cec942..40f0d16c48bbdd9c81de451c8c287ac873eb4e03 100644
--- a/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
+++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %}
+ {% include 'europe/fragments/fragment_europe_table_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/country/europe_country_all.html b/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
index e902e4df99b6e75792d090d756f0d49a2594e6b6..b779f9114eaa7b6dbe5996075879a83ff88b9a57 100644
--- a/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
+++ b/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %}
+ {% include 'europe/fragments/fragment_europe_table_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html b/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
index b0f92e66d98b9b9a88c3aacdf590e0551d6e07be..603cc87db5d25e64e3686582830bb54581c0d080 100644
--- a/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
+++ b/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
@@ -1,7 +1,7 @@
{% extends 'common/page_layout.html' %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -47,7 +47,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/country/europe_country_one.html b/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
index 2e01bb29ddd7a36c47ccaeadf794666338510b67..4cdf718205f20343cf90331b2547c33531c1aabe 100644
--- a/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
+++ b/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
@@ -1,7 +1,7 @@
{% extends 'common/page_layout.html' %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -52,7 +52,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html
index 0b3cd11831911475b59331503ef7fbbaf9fff6cd..0124a4fc1c6f22121a7a91873c866e28b696fc07 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_date_reported.html' %}
+ {% include 'europe/fragments/fragment_europe_table_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html
index eb6c8418be2369c274fa89095141209a7ac11fc8..a5468298cba512c54ea5e41d3676cf6a0b0c1224 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html
@@ -4,7 +4,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
index bc4fa5c1176fbdf6101d8c7b2e77b4703af91044..2526106f71e4f2f86807850a6ab6ff085b0a30b4 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
@@ -4,7 +4,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
index b8d31dc084c72389df0698835c093ede53c9eea8..12ac115ccfd4633920ea8b95de120134fc5dc442 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
@@ -4,7 +4,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
index 2bd48023cc4c4499d5383c048b85b2a1a7bd47fe..dd2a5d23d011a3dbf0f0831d94be98f6e2ad1293 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
@@ -4,7 +4,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/europe_data.html b/covid19/blueprints/europe/templates/europe/europe_data.html
index 504ac78461641825fa5693925f20532c1934b3bf..548cdf0744afccc37e864dd862f16e91953089cb 100644
--- a/covid19/blueprints/europe/templates/europe/europe_data.html
+++ b/covid19/blueprints/europe/templates/europe/europe_data.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/europe_imported.html b/covid19/blueprints/europe/templates/europe/europe_imported.html
index a4e10c84d5cdd5af03faa090acec0ae528b05e34..a2159a2844d5a3ae2ab20daa6da19c5799675626 100644
--- a/covid19/blueprints/europe/templates/europe/europe_imported.html
+++ b/covid19/blueprints/europe/templates/europe/europe_imported.html
@@ -12,7 +12,7 @@
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
@@ -53,7 +53,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragments/fragment_europe_table_data_imported.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data_imported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/europe_info.html b/covid19/blueprints/europe/templates/europe/europe_info.html
index dae19afa9f65637a5f1ba87073b39ec2f9842b9d..34445d4ae14a58722bb7c3f0e6747ddf284900e6 100644
--- a/covid19/blueprints/europe/templates/europe/europe_info.html
+++ b/covid19/blueprints/europe/templates/europe/europe_info.html
@@ -12,7 +12,7 @@
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/europe_tasks.html b/covid19/blueprints/europe/templates/europe/europe_tasks.html
index 4953e23f1cdf8891e6d51f0dd49a754bda8c57e1..97fc88a493ee64e45cea623daed77c7a0509b6ef 100644
--- a/covid19/blueprints/europe/templates/europe/europe_tasks.html
+++ b/covid19/blueprints/europe/templates/europe/europe_tasks.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
diff --git a/covid19/blueprints/rki/rki_views.py b/covid19/blueprints/rki/rki_views.py
index 0162a0dac9d701e94d0be54109db48eb393f340c..3d39f5503d031decc707af4c6cc54ff42eb0ca4d 100644
--- a/covid19/blueprints/rki/rki_views.py
+++ b/covid19/blueprints/rki/rki_views.py
@@ -17,24 +17,24 @@ app_rki = Blueprint('rki', __name__, template_folder='templates')
# RKI
#
##################################################################################################################
-@app_rki.route('/rki/info')
+@app_rki.route('/info')
def url_rki_info():
page_info = ApplicationPage('RKI', "Info")
return render_template(
- 'templates/rki/rki_info.html',
+ 'rki/rki_info.html',
page_info=page_info)
-@app_rki.route('/rki/tasks')
+@app_rki.route('/tasks')
def url_rki_tasks():
page_info = ApplicationPage('RKI', "Tasks")
return render_template(
- 'templates/rki/rki_tasks.html',
+ 'rki/rki_tasks.html',
page_info=page_info)
-@app_rki.route('/rki/imported/page/<int:page>')
-@app_rki.route('/rki/imported')
+@app_rki.route('/imported/page/<int:page>')
+@app_rki.route('/imported')
def url_rki_imported(page=1):
page_info = ApplicationPage('RKI', "Last Import")
try:
@@ -43,6 +43,6 @@ def url_rki_imported(page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/rki/rki_imported.html',
+ 'rki/rki_imported.html',
page_data=page_data,
page_info=page_info)
diff --git a/covid19/blueprints/rki/templates/rki/rki_imported.html b/covid19/blueprints/rki/templates/rki/rki_imported.html
index 9831348fae8ffbcce63bdcabbfdfd054c14984e2..2a8897a1c4bc8588a48998b8e4b8422f2e33704d 100644
--- a/covid19/blueprints/rki/templates/rki/rki_imported.html
+++ b/covid19/blueprints/rki/templates/rki/rki_imported.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_rki_imported', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('rki.url_rki_imported', 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_rki_imported', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -43,7 +43,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_rki_imported', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/covid19/blueprints/rki/templates/rki/rki_tasks.html b/covid19/blueprints/rki/templates/rki/rki_tasks.html
index 14037156a342c029791895da264d4fa055f9ac9e..7511aae4c10a2b57bd2737a85c2c76917e050148 100644
--- a/covid19/blueprints/rki/templates/rki/rki_tasks.html
+++ b/covid19/blueprints/rki/templates/rki/rki_tasks.html
@@ -10,11 +10,11 @@
{% block main_container %}
<div class="btn-group" role="group" aria-label="Views">
- <a class="btn btn-secondary btn-lg" href="/rki_landkreise/region/all" role="button">RKI :: Region :: All</a>
+ <a class="btn btn-secondary btn-lg" href="/rki/region/all" role="button">RKI :: Region :: All</a>
</div>
<div class="btn-group" role="group" aria-label="Views">
- <a class="btn btn-primary btn-lg" href="/rki_landkreise/update/initial" role="button">RKI :: update :: initial</a>
- <a class="btn btn-secondary btn-lg" href="/rki_landkreise/update/short" role="button">RKI :: update :: short</a>
+ <a class="btn btn-primary btn-lg" href="/rki/update/initial" role="button">RKI :: update :: initial</a>
+ <a class="btn btn-secondary btn-lg" href="/rki/update/short" role="button">RKI :: update :: short</a>
</div>
{% endblock %}
diff --git a/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
index 0b0da8a92ba37fd9dbaa7a605e0da44a779b4dcb..fe8e79494d21f7e38a68c52250054cbf79401c8f 100644
--- a/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
+++ b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
@@ -49,7 +49,7 @@
</ul>
{% endif %}
- {% include 'vaccination/fragments/fragments/fragment_vaccination_timeline_germany_table.html' %}
+ {% include 'vaccination/fragments/fragment_vaccination_timeline_germany_table.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_all.html b/covid19/blueprints/who/templates/who/country/who_country_all.html
index dd739966a4cb287dd91c2d7461d89782a932b988..3849a1d4b9f813544ad5dbba03815f5fbde29448 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_all.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_all.html
@@ -12,7 +12,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -22,7 +22,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_country_all', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -30,7 +30,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_country_all', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -46,13 +46,13 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_country_all', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_who_country.html' %}
+ {% include 'who/fragments/fragment_who_table_who_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_germany.html b/covid19/blueprints/who/templates/who/country/who_country_germany.html
index 76e05b8e4815cfa3d419dd30d00b2bcbfa96ca72..ddb7bc1b5ad7f8c9e49033c7dc965d17ae25e20d 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_germany.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_germany.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_germany', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_germany', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_germany', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one.html b/covid19/blueprints/who/templates/who/country/who_country_one.html
index 92d210e7db2373933d692165bd13cce8e699244e..ebd1f959b35d7477aedf1ab52fabb32244d844be 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html b/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
index f743b1d714c748a51df256663a4c50542fd15b2e..38a0e74aba351580949d2965336f52079cff9be0 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_cumulative', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html b/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
index 13880351220297b9d21bb11fe83f3c195e04b292..36814ce8ac0b30637b481a99dbba83e5e7259e13 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_new', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_new', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_new', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
index e0934567ce3220a1489d1b000840b4638857c596..12b462c54514a21558ae9bb8d061dc52149a8214 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_cumulative', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
index 78b5b18a51611fd131893016dd4293c9505699bf..3f9665518c278dc8aa76eb6bc3a36e9f5e393547 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_new', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_new', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_new', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
index 6c50492f72f37fb6632cee4ede8ba8264638bc10..41b1c1f86995a6572a5e3e95e9e670858e9beb69 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
@@ -12,7 +12,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -22,7 +22,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_all', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -30,7 +30,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_all', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -46,7 +46,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_all', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
index 16f25e24728187d543ce0152412e8804537fad17..cbd813b7a2f5e9673176a6740406c7631fd4e011 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
index 23250f00d345167b55e2e160ee6e65d4d11707fd..ddafe9c1ef9ed3e0e9cb26cedb3282b46c4542d8 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
index 510196464b662b1ba4f714bbb20e7e4e8512edc4..9b24dd54edf40e2c7150bc715b786c7ace44fcfd 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_cases_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_cases_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_cases_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
index 23250f00d345167b55e2e160ee6e65d4d11707fd..ddafe9c1ef9ed3e0e9cb26cedb3282b46c4542d8 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
index f4f8bb52a00b909e61c001ff7499622197993b0e..b6f98b24c58c8fef759de78c71e1b6248a918e2d 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_new',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_new',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_new',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/region/who_region_all.html b/covid19/blueprints/who/templates/who/region/who_region_all.html
index d125b8845c536362726394cebf7168a6eaeb2e84..16d7266784b78ecc054e094b48d8ff112d570e91 100644
--- a/covid19/blueprints/who/templates/who/region/who_region_all.html
+++ b/covid19/blueprints/who/templates/who/region/who_region_all.html
@@ -12,7 +12,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -22,7 +22,7 @@
<!-- previous page -->
{% if page_data.has_prev %}
<li>
- <a href="{{ url_for('url_who_region_all', page=page_data.prev_num) }}">Previous</a>
+ <a href="{{ url_for('who.url_who_region_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -30,7 +30,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li>
- <a href="{{ url_for('url_who_region_all', page=page_num) }}">{{ page_num }}</a>
+ <a href="{{ url_for('who.url_who_region_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="active">
@@ -45,7 +45,7 @@
{% endfor %}
<!-- next page -->
{% if page_data.has_next %}
- <li><a href="{{ url_for('url_who_region_all', page=page_data.next_num) }}">Next</a></li>
+ <li><a href="{{ url_for('who.url_who_region_all', page=page_data.next_num) }}">Next</a></li>
{% endif %}
</ul>
{% endif %}
diff --git a/covid19/blueprints/who/templates/who/region/who_region_one.html b/covid19/blueprints/who/templates/who/region/who_region_one.html
index a44d717d10823b050be6054cca11ce642674d388..3169d6aa4d92c3492f1e9f8848018addfe0aed89 100644
--- a/covid19/blueprints/who/templates/who/region/who_region_one.html
+++ b/covid19/blueprints/who/templates/who/region/who_region_one.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_region', region_id=who_region.id , page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_who_region', region_id=who_region.id , page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -31,7 +31,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_region', region_id=who_region.id ,page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_who_region', region_id=who_region.id ,page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -47,13 +47,13 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_region', region_id=who_region.id , page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_who_region', region_id=who_region.id , page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_who_country.html' %}
+ {% include 'who/fragments/fragment_who_table_who_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/who_imported.html b/covid19/blueprints/who/templates/who/who_imported.html
index f75cdbffe3ea1fa5972fd7277d366f6cb18f6809..1ae7534299f897df35d607d613e561b2d9b04266 100644
--- a/covid19/blueprints/who/templates/who/who_imported.html
+++ b/covid19/blueprints/who/templates/who/who_imported.html
@@ -10,7 +10,7 @@
{% block navigation_navtabs %}
- {% include 'who/fragments/fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -21,7 +21,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_imported', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_who_imported', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -29,7 +29,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_imported', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_who_imported', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -45,7 +45,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_imported', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_who_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/covid19/blueprints/who/templates/who/who_info.html b/covid19/blueprints/who/templates/who/who_info.html
index 4f1327cbd793081a63caf5f025fc463b3cc12970..85470ad804c56c4ba9a498a29a067dd1f5f6b76b 100644
--- a/covid19/blueprints/who/templates/who/who_info.html
+++ b/covid19/blueprints/who/templates/who/who_info.html
@@ -6,7 +6,7 @@
{% block navigation_navtabs %}
- {% include 'who/fragments/fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/who_tasks.html b/covid19/blueprints/who/templates/who/who_tasks.html
index 30be589b362bccc268df26f0c7cb60391bb37fb1..7754283b0387ab92d3786bcb08ea4a4a7fecbdd7 100644
--- a/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/covid19/blueprints/who/templates/who/who_tasks.html
@@ -5,7 +5,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container %}
diff --git a/covid19/blueprints/who/who_views.py b/covid19/blueprints/who/who_views.py
index 702d8f16d4531d8ee3665254163013fbae123b5b..f02bedc855251332bbf0626325cc6500702d6fed 100644
--- a/covid19/blueprints/who/who_views.py
+++ b/covid19/blueprints/who/who_views.py
@@ -61,24 +61,24 @@ def task_who_update_initial(self):
return result
-@app_who.route('/who/info')
+@app_who.route('/info')
def url_who_info():
page_info = ApplicationPage('WHO', "Info")
return render_template(
- 'templates/who/who_info.html',
+ 'who/who_info.html',
page_info=page_info)
-@app_who.route('/who/tasks')
+@app_who.route('/tasks')
def url_who_tasks():
page_info = ApplicationPage('WHO', "Tasks")
return render_template(
- 'templates/who/who_tasks.html',
+ 'who/who_tasks.html',
page_info=page_info)
-@app_who.route('/who/imported/page/<int:page>')
-@app_who.route('/who/imported')
+@app_who.route('/imported/page/<int:page>')
+@app_who.route('/imported')
def url_who_imported(page=1):
page_info = ApplicationPage('WHO', "Last Import")
try:
@@ -87,13 +87,13 @@ def url_who_imported(page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/who_imported.html',
+ 'who/who_imported.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/all/page/<int:page>')
-@app_who.route('/who/date_reported/all')
+@app_who.route('/date_reported/all/page/<int:page>')
+@app_who.route('/date_reported/all')
def url_who_date_reported_all(page=1):
page_info = ApplicationPage('WHO', "Date Reported", "All")
try:
@@ -102,13 +102,13 @@ def url_who_date_reported_all(page=1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_all.html',
+ 'who/date_reported/who_date_reported_all.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>')
+@app_who.route('/date_reported/<int:date_reported_id>/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>')
def url_who_date_reported(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -122,14 +122,14 @@ def url_who_date_reported(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one.html',
+ 'who/date_reported/who_date_reported_one.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/cases_new/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>/cases_new')
+@app_who.route('/date_reported/<int:date_reported_id>/cases_new/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>/cases_new')
def url_who_date_reported_cases_new(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -143,14 +143,14 @@ def url_who_date_reported_cases_new(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one_cases_new.html',
+ 'who/date_reported/who_date_reported_one_cases_new.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/cases_cumulative/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>/cases_cumulative')
+@app_who.route('/date_reported/<int:date_reported_id>/cases_cumulative/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>/cases_cumulative')
def url_who_date_reported_cases_cumulative(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -164,14 +164,14 @@ def url_who_date_reported_cases_cumulative(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one_cases_cumulative.html',
+ 'who/date_reported/who_date_reported_one_cases_cumulative.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/deaths_new/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>/deaths_new')
+@app_who.route('/date_reported/<int:date_reported_id>/deaths_new/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>/deaths_new')
def url_who_date_reported_deaths_new(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -185,14 +185,14 @@ def url_who_date_reported_deaths_new(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one_deaths_new.html',
+ 'who/date_reported/who_date_reported_one_deaths_new.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/deaths_cumulative/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>/deaths_cumulative')
+@app_who.route('/date_reported/<int:date_reported_id>/deaths_cumulative/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>/deaths_cumulative')
def url_who_date_reported_deaths_cumulative(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -206,14 +206,14 @@ def url_who_date_reported_deaths_cumulative(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one_deaths_cumulative.html',
+ 'who/date_reported/who_date_reported_one_deaths_cumulative.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/region/all/page/<int:page>')
-@app_who.route('/who/region/all')
+@app_who.route('/region/all/page/<int:page>')
+@app_who.route('/region/all')
def url_who_region_all(page=1):
page_info = ApplicationPage('WHO', "Region", "All")
try:
@@ -222,13 +222,13 @@ def url_who_region_all(page=1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'templates/who/region/who_region_all.html',
+ 'who/region/who_region_all.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/region/<int:region_id>/page/<int:page>')
-@app_who.route('/who/region/<int:region_id>')
+@app_who.route('/region/<int:region_id>/page/<int:page>')
+@app_who.route('/region/<int:region_id>')
def url_who_region(region_id, page=1):
who_region = None
page_info = ApplicationPage("Countries", "WHO Region")
@@ -242,14 +242,14 @@ def url_who_region(region_id, page=1):
flash("No countries of that region in the database.")
page_data = None
return render_template(
- 'templates/who/region/who_region_one.html',
+ 'who/region/who_region_one.html',
who_region=who_region,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/all/page/<int:page>')
-@app_who.route('/who/country/all')
+@app_who.route('/country/all/page/<int:page>')
+@app_who.route('/country/all')
def url_who_country_all(page=1):
page_info = ApplicationPage('WHO', "Countries", "All")
try:
@@ -258,13 +258,13 @@ def url_who_country_all(page=1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'templates/who/country/who_country_all.html',
+ 'who/country/who_country_all.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>')
+@app_who.route('/country/<int:country_id>/page/<int:page>')
+@app_who.route('/country/<int:country_id>')
def url_who_country(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country(who_country, page)
@@ -272,14 +272,14 @@ def url_who_country(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one.html',
+ 'who/country/who_country_one.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/cases_new/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>/cases_new')
+@app_who.route('/country/<int:country_id>/cases_new/page/<int:page>')
+@app_who.route('/country/<int:country_id>/cases_new')
def url_who_country_cases_new(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country_order_by_cases_new(who_country, page)
@@ -287,14 +287,14 @@ def url_who_country_cases_new(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one_cases_new.html',
+ 'who/country/who_country_one_cases_new.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/cases_cumulative/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>/cases_cumulative')
+@app_who.route('/country/<int:country_id>/cases_cumulative/page/<int:page>')
+@app_who.route('/country/<int:country_id>/cases_cumulative')
def url_who_country_cases_cumulative(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country_order_by_cases_cumulative(who_country, page)
@@ -302,14 +302,14 @@ def url_who_country_cases_cumulative(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one_cases_cumulative.html',
+ 'who/country/who_country_one_cases_cumulative.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/deaths_new/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>/deaths_new')
+@app_who.route('/country/<int:country_id>/deaths_new/page/<int:page>')
+@app_who.route('/country/<int:country_id>/deaths_new')
def url_who_country_deaths_new(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country_order_by_deaths_new(who_country, page)
@@ -317,14 +317,14 @@ def url_who_country_deaths_new(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one_deaths_new.html',
+ 'who/country/who_country_one_deaths_new.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/deaths_cumulative/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>/deaths_cumulative')
+@app_who.route('/country/<int:country_id>/deaths_cumulative/page/<int:page>')
+@app_who.route('/country/<int:country_id>/deaths_cumulative')
def url_who_country_deaths_cumulative(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country_order_by_deaths_cumulative(who_country, page)
@@ -332,14 +332,14 @@ def url_who_country_deaths_cumulative(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one_deaths_cumulative.html',
+ 'who/country/who_country_one_deaths_cumulative.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/germany/page/<int:page>')
-@app_who.route('/who/germany')
+@app_who.route('/germany/page/<int:page>')
+@app_who.route('/germany')
def url_who_germany(page=1):
page_info = ApplicationPage('WHO', "Germany")
who_country_germany = WhoCountry.get_germany()
@@ -348,13 +348,13 @@ def url_who_germany(page=1):
return redirect(url_for('url_who_tasks'))
page_data = WhoGlobalData.get_data_for_country(who_country_germany, page)
return render_template(
- 'templates/who/country/who_country_germany.html',
+ 'who/country/who_country_germany.html',
who_country=who_country_germany,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/update')
+@app_who.route('/update')
def url_who_update_run():
app.logger.info("url_who_update_run [start]")
who_service.who_service_download.download_file()
@@ -365,7 +365,7 @@ def url_who_update_run():
return redirect(url_for('url_home'))
-@app_who.route('/who/update/short')
+@app_who.route('/update/short')
def url_who_update_short_run():
who_service.who_service_download.download_file()
task_who_update_short.apply_async()
@@ -374,7 +374,7 @@ def url_who_update_short_run():
return redirect(url_for('url_home'))
-@app_who.route('/who/update/initial')
+@app_who.route('/update/initial')
def url_who_update_initial_run():
who_service.who_service_download.download_file()
task_who_update_initial.apply_async()