diff --git a/covid19/blueprints/admin/admin_views.py b/covid19/blueprints/admin/admin_views.py
index 41dd5e2e6927b565d5ed4d2c0e9c96563c559cb3..dbf157a0de695edf400e2481e5e6795fa8748e24 100644
--- a/covid19/blueprints/admin/admin_views.py
+++ b/covid19/blueprints/admin/admin_views.py
@@ -54,7 +54,7 @@ def task_admin_database_drop_create(self):
def url_admin_tasks():
page_info = ApplicationPage('Admin', "Tasks")
return render_template(
- 'admin/admin_tasks.html',
+ 'templates/admin/admin_tasks.html',
page_info=page_info)
@@ -62,7 +62,7 @@ def url_admin_tasks():
def url_admin_info():
page_info = ApplicationPage('Admin', "Info")
return render_template(
- 'admin/admin_info.html',
+ 'templates/admin/admin_info.html',
page_info=page_info)
diff --git a/covid19/blueprints/admin/templates/__init__.py b/covid19/blueprints/admin/templates/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/templates/admin/admin_info.html b/covid19/blueprints/admin/templates/admin/admin_info.html
similarity index 76%
rename from covid19/templates/admin/admin_info.html
rename to covid19/blueprints/admin/templates/admin/admin_info.html
index 2f3f9cafcd94539aa654fc1fb0f3967c19a5211e..04baf972c509c3b14cf0ec13f34bbec926967f26 100644
--- a/covid19/templates/admin/admin_info.html
+++ b/covid19/blueprints/admin/templates/admin/admin_info.html
@@ -5,7 +5,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'admin/fragments/fragment_admin_navtabs.html' %}
+ {% include 'admin/fragments/fragments/fragment_admin_navtabs.html' %}
{% endblock %}
{% block main_container %}
diff --git a/covid19/templates/admin/admin_tasks.html b/covid19/blueprints/admin/templates/admin/admin_tasks.html
similarity index 91%
rename from covid19/templates/admin/admin_tasks.html
rename to covid19/blueprints/admin/templates/admin/admin_tasks.html
index d30234c9e6beb387289453e27f32c8d0b7e47f35..766b2df815451580bb291c8029cd4a41abb9e873 100644
--- a/covid19/templates/admin/admin_tasks.html
+++ b/covid19/blueprints/admin/templates/admin/admin_tasks.html
@@ -5,7 +5,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'admin/fragments/fragment_admin_navtabs.html' %}
+ {% include 'admin/fragments/fragments/fragment_admin_navtabs.html' %}
{% endblock %}
{% block main_container %}
diff --git a/covid19/templates/admin/fragments/fragment_admin_navbar_dropdown.html b/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html
similarity index 100%
rename from covid19/templates/admin/fragments/fragment_admin_navbar_dropdown.html
rename to covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html
diff --git a/covid19/templates/admin/fragments/fragment_admin_navtabs.html b/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html
similarity index 100%
rename from covid19/templates/admin/fragments/fragment_admin_navtabs.html
rename to covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html
diff --git a/covid19/blueprints/europe/europe_views.py b/covid19/blueprints/europe/europe_views.py
index 519f46c58da7af505e1c3a455a598a96e4ea728c..72ba62f5f196fd782e9d9e25ffddc411d9568216 100644
--- a/covid19/blueprints/europe/europe_views.py
+++ b/covid19/blueprints/europe/europe_views.py
@@ -51,7 +51,7 @@ def task_europe_update_short(self):
def url_europe_info():
page_info = ApplicationPage('Europe', "Info")
return render_template(
- 'europe/europe_info.html',
+ 'templates/europe/europe_info.html',
title='Europe',
page_info=page_info)
@@ -60,7 +60,7 @@ def url_europe_info():
def url_europe_tasks():
page_info = ApplicationPage('Europe', "Tasks")
return render_template(
- 'europe/europe_tasks.html',
+ 'templates/europe/europe_tasks.html',
title='Europe Tasks',
page_info=page_info)
@@ -79,7 +79,7 @@ def url_europe_data_imported(page=1):
page_info = ApplicationPage('Europe', "Last Import")
page_data = EuropeDataImportTable.get_all_as_page(page)
return render_template(
- 'europe/europe_imported.html',
+ 'templates/europe/europe_imported.html',
page_data=page_data,
page_info=page_info)
@@ -90,7 +90,7 @@ def url_europe_date_reported_all(page=1):
page_info = ApplicationPage('Europe', "date_reported")
page_data = EuropeDateReported.get_all_as_page(page)
return render_template(
- 'europe/date_reported/europe_date_reported_all.html',
+ 'templates/europe/date_reported/europe_date_reported_all.html',
page_data=page_data,
page_info=page_info)
@@ -104,7 +104,7 @@ def url_europe_date_reported_one_notification_rate(europe_date_reported_id, page
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
page_data = EuropeData.find_by_date_reported_notification_rate(europe_date_reported, page)
return render_template(
- 'europe/date_reported/europe_date_reported_one_notification_rate.html',
+ 'templates/europe/date_reported/europe_date_reported_one_notification_rate.html',
europe_date_reported=europe_date_reported,
page_data=page_data,
page_info=page_info)
@@ -117,7 +117,7 @@ def url_europe_date_reported_one_deaths_weekly(europe_date_reported_id, page=1):
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
page_data = EuropeData.find_by_date_reported_deaths_weekly(europe_date_reported, page)
return render_template(
- 'europe/date_reported/europe_date_reported_one_deaths_weekly.html',
+ 'templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html',
europe_date_reported=europe_date_reported,
page_data=page_data,
page_info=page_info)
@@ -130,7 +130,7 @@ def url_europe_date_reported_one_cases_weekly(europe_date_reported_id, page=1):
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
page_data = EuropeData.find_by_date_reported_cases_weekly(europe_date_reported, page)
return render_template(
- 'europe/date_reported/europe_date_reported_one_cases_weekly.html',
+ 'templates/europe/date_reported/europe_date_reported_one_cases_weekly.html',
europe_date_reported=europe_date_reported,
page_data=page_data,
page_info=page_info)
@@ -142,7 +142,7 @@ def url_europe_continent_all(page=1):
page_info = ApplicationPage('Europe', "continent")
page_data = EuropeContinent.get_all_as_page(page)
return render_template(
- 'europe/continent/europe_continent_all.html',
+ 'templates/europe/continent/europe_continent_all.html',
page_data=page_data,
page_info=page_info)
@@ -154,7 +154,7 @@ def url_europe_continent_one(continent_id, page=1):
continent = EuropeContinent.get_by_id(continent_id)
page_data = EuropeCountry.find_by_continent(continent, page)
return render_template(
- 'europe/continent/europe_continent_one.html',
+ 'templates/europe/continent/europe_continent_one.html',
continent=continent,
page_data=page_data,
page_info=page_info)
@@ -166,7 +166,7 @@ def url_europe_country_all(page=1):
page_info = ApplicationPage('Europe', "country")
page_data = EuropeCountry.get_all_as_page(page)
return render_template(
- 'europe/country/europe_country_all.html',
+ 'templates/europe/country/europe_country_all.html',
page_data=page_data,
page_info=page_info)
@@ -178,7 +178,7 @@ def url_europe_country_one(country_id, page=1):
europe_country = EuropeCountry.get_by_id(country_id)
page_data = EuropeData.find_by_country(europe_country, page)
return render_template(
- 'europe/country/europe_country_one.html',
+ 'templates/europe/country/europe_country_one.html',
europe_country=europe_country,
page_data=page_data,
page_info=page_info)
@@ -194,7 +194,7 @@ def url_europe_country_germany(page=1):
return redirect(url_for('url_europe_tasks'))
page_data = EuropeData.find_by_country(europe_country, page)
return render_template(
- 'europe/country/europe_country_germany.html',
+ 'templates/europe/country/europe_country_germany.html',
europe_country=europe_country,
page_data=page_data,
page_info=page_info)
diff --git a/covid19/blueprints/europe/templates/__init__.py b/covid19/blueprints/europe/templates/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/templates/europe/continent/europe_continent_all.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
similarity index 92%
rename from covid19/templates/europe/continent/europe_continent_all.html
rename to covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
index ae1c59b84f4709c35fc1b252ebf15e82b1291193..c32f8575191e68685656ecb41aed06b8d4e82fb0 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_continent.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_continent.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/continent/europe_continent_germany.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
similarity index 92%
rename from covid19/templates/europe/continent/europe_continent_germany.html
rename to covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
index e3c8dbb9ca3b4ae057c298c7fc7ba868a14ce875..3e16b8be980f6490c4c7d51f62aaee508f05aa74 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_country.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/continent/europe_continent_one.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
similarity index 93%
rename from covid19/templates/europe/continent/europe_continent_one.html
rename to covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
index 40f0d16c48bbdd9c81de451c8c287ac873eb4e03..d80e6d7ee538ef3b2226b324f60f21c5a2cec942 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_country.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/country/europe_country_all.html b/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
similarity index 92%
rename from covid19/templates/europe/country/europe_country_all.html
rename to covid19/blueprints/europe/templates/europe/country/europe_country_all.html
index b779f9114eaa7b6dbe5996075879a83ff88b9a57..e902e4df99b6e75792d090d756f0d49a2594e6b6 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_country.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/country/europe_country_germany.html b/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
similarity index 91%
rename from covid19/templates/europe/country/europe_country_germany.html
rename to covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
index 603cc87db5d25e64e3686582830bb54581c0d080..b0f92e66d98b9b9a88c3aacdf590e0551d6e07be 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -47,7 +47,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/country/europe_country_one.html b/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
similarity index 92%
rename from covid19/templates/europe/country/europe_country_one.html
rename to covid19/blueprints/europe/templates/europe/country/europe_country_one.html
index 4cdf718205f20343cf90331b2547c33531c1aabe..2e01bb29ddd7a36c47ccaeadf794666338510b67 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -52,7 +52,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/date_reported/europe_date_reported_all.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html
similarity index 92%
rename from covid19/templates/europe/date_reported/europe_date_reported_all.html
rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html
index 0124a4fc1c6f22121a7a91873c866e28b696fc07..0b3cd11831911475b59331503ef7fbbaf9fff6cd 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_date_reported.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_date_reported.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/date_reported/europe_date_reported_one.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html
similarity index 92%
rename from covid19/templates/europe/date_reported/europe_date_reported_one.html
rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html
index a5468298cba512c54ea5e41d3676cf6a0b0c1224..eb6c8418be2369c274fa89095141209a7ac11fc8 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/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
similarity index 92%
rename from covid19/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
index 2526106f71e4f2f86807850a6ab6ff085b0a30b4..bc4fa5c1176fbdf6101d8c7b2e77b4703af91044 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/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
similarity index 93%
rename from covid19/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
index 12ac115ccfd4633920ea8b95de120134fc5dc442..b8d31dc084c72389df0698835c093ede53c9eea8 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/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
similarity index 93%
rename from covid19/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
index dd2a5d23d011a3dbf0f0831d94be98f6e2ad1293..2bd48023cc4c4499d5383c048b85b2a1a7bd47fe 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/europe_data.html b/covid19/blueprints/europe/templates/europe/europe_data.html
similarity index 93%
rename from covid19/templates/europe/europe_data.html
rename to covid19/blueprints/europe/templates/europe/europe_data.html
index 548cdf0744afccc37e864dd862f16e91953089cb..504ac78461641825fa5693925f20532c1934b3bf 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/europe_imported.html b/covid19/blueprints/europe/templates/europe/europe_imported.html
similarity index 92%
rename from covid19/templates/europe/europe_imported.html
rename to covid19/blueprints/europe/templates/europe/europe_imported.html
index a2159a2844d5a3ae2ab20daa6da19c5799675626..a4e10c84d5cdd5af03faa090acec0ae528b05e34 100644
--- a/covid19/templates/europe/europe_imported.html
+++ b/covid19/blueprints/europe/templates/europe/europe_imported.html
@@ -12,7 +12,7 @@
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
@@ -53,7 +53,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data_imported.html' %}
+ {% include 'europe/fragments/fragments/fragment_europe_table_data_imported.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/europe_info.html b/covid19/blueprints/europe/templates/europe/europe_info.html
similarity index 97%
rename from covid19/templates/europe/europe_info.html
rename to covid19/blueprints/europe/templates/europe/europe_info.html
index 34445d4ae14a58722bb7c3f0e6747ddf284900e6..dae19afa9f65637a5f1ba87073b39ec2f9842b9d 100644
--- a/covid19/templates/europe/europe_info.html
+++ b/covid19/blueprints/europe/templates/europe/europe_info.html
@@ -12,7 +12,7 @@
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/europe_tasks.html b/covid19/blueprints/europe/templates/europe/europe_tasks.html
similarity index 93%
rename from covid19/templates/europe/europe_tasks.html
rename to covid19/blueprints/europe/templates/europe/europe_tasks.html
index 97fc88a493ee64e45cea623daed77c7a0509b6ef..4953e23f1cdf8891e6d51f0dd49a754bda8c57e1 100644
--- a/covid19/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/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
diff --git a/covid19/templates/europe/fragments/fragment_europe_navbar_dropdown.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navbar_dropdown.html
similarity index 100%
rename from covid19/templates/europe/fragments/fragment_europe_navbar_dropdown.html
rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navbar_dropdown.html
diff --git a/covid19/templates/europe/fragments/fragment_europe_navtabs.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navtabs.html
similarity index 100%
rename from covid19/templates/europe/fragments/fragment_europe_navtabs.html
rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navtabs.html
diff --git a/covid19/templates/europe/fragments/fragment_europe_table_continent.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_continent.html
similarity index 100%
rename from covid19/templates/europe/fragments/fragment_europe_table_continent.html
rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_continent.html
diff --git a/covid19/templates/europe/fragments/fragment_europe_table_country.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_country.html
similarity index 100%
rename from covid19/templates/europe/fragments/fragment_europe_table_country.html
rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_country.html
diff --git a/covid19/templates/europe/fragments/fragment_europe_table_data.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html
similarity index 100%
rename from covid19/templates/europe/fragments/fragment_europe_table_data.html
rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html
diff --git a/covid19/templates/europe/fragments/fragment_europe_table_data_imported.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data_imported.html
similarity index 100%
rename from covid19/templates/europe/fragments/fragment_europe_table_data_imported.html
rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data_imported.html
diff --git a/covid19/templates/europe/fragments/fragment_europe_table_date_reported.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_date_reported.html
similarity index 100%
rename from covid19/templates/europe/fragments/fragment_europe_table_date_reported.html
rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_date_reported.html
diff --git a/covid19/blueprints/rki/rki_views.py b/covid19/blueprints/rki/rki_views.py
index 7566dbeb6bc4c4549ca4c87b45a3f999e09a449e..0162a0dac9d701e94d0be54109db48eb393f340c 100644
--- a/covid19/blueprints/rki/rki_views.py
+++ b/covid19/blueprints/rki/rki_views.py
@@ -21,7 +21,7 @@ app_rki = Blueprint('rki', __name__, template_folder='templates')
def url_rki_info():
page_info = ApplicationPage('RKI', "Info")
return render_template(
- 'rki/rki_info.html',
+ 'templates/rki/rki_info.html',
page_info=page_info)
@@ -29,7 +29,7 @@ def url_rki_info():
def url_rki_tasks():
page_info = ApplicationPage('RKI', "Tasks")
return render_template(
- 'rki/rki_tasks.html',
+ 'templates/rki/rki_tasks.html',
page_info=page_info)
@@ -43,6 +43,6 @@ def url_rki_imported(page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'rki/rki_imported.html',
+ 'templates/rki/rki_imported.html',
page_data=page_data,
page_info=page_info)
diff --git a/covid19/blueprints/rki/templates/__init__.py b/covid19/blueprints/rki/templates/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/templates/rki/fragment_rki_navbar_dropdown.html b/covid19/blueprints/rki/templates/rki/fragment_rki_navbar_dropdown.html
similarity index 100%
rename from covid19/templates/rki/fragment_rki_navbar_dropdown.html
rename to covid19/blueprints/rki/templates/rki/fragment_rki_navbar_dropdown.html
diff --git a/covid19/templates/rki/fragment_rki_navtabs.html b/covid19/blueprints/rki/templates/rki/fragment_rki_navtabs.html
similarity index 100%
rename from covid19/templates/rki/fragment_rki_navtabs.html
rename to covid19/blueprints/rki/templates/rki/fragment_rki_navtabs.html
diff --git a/covid19/templates/rki/rki_imported.html b/covid19/blueprints/rki/templates/rki/rki_imported.html
similarity index 100%
rename from covid19/templates/rki/rki_imported.html
rename to covid19/blueprints/rki/templates/rki/rki_imported.html
diff --git a/covid19/templates/rki/rki_info.html b/covid19/blueprints/rki/templates/rki/rki_info.html
similarity index 100%
rename from covid19/templates/rki/rki_info.html
rename to covid19/blueprints/rki/templates/rki/rki_info.html
diff --git a/covid19/templates/rki/rki_tasks.html b/covid19/blueprints/rki/templates/rki/rki_tasks.html
similarity index 100%
rename from covid19/templates/rki/rki_tasks.html
rename to covid19/blueprints/rki/templates/rki/rki_tasks.html
diff --git a/covid19/blueprints/vaccination/templates/__init__.py b/covid19/blueprints/vaccination/templates/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html b/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html
similarity index 100%
rename from covid19/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html
rename to covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html
diff --git a/covid19/templates/vaccination/fragments/fragment_vaccination_navtabs.html b/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navtabs.html
similarity index 100%
rename from covid19/templates/vaccination/fragments/fragment_vaccination_navtabs.html
rename to covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navtabs.html
diff --git a/covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html b/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html
similarity index 100%
rename from covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html
rename to covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html
diff --git a/covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html b/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html
similarity index 100%
rename from covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html
rename to covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html
diff --git a/covid19/templates/vaccination/vaccination_info.html b/covid19/blueprints/vaccination/templates/vaccination/vaccination_info.html
similarity index 89%
rename from covid19/templates/vaccination/vaccination_info.html
rename to covid19/blueprints/vaccination/templates/vaccination/vaccination_info.html
index a2dc028bc530fb0988ca84e41dfe12252d968803..614e1d0661313ef16e2626eb04181efe9acd15e7 100644
--- a/covid19/templates/vaccination/vaccination_info.html
+++ b/covid19/blueprints/vaccination/templates/vaccination/vaccination_info.html
@@ -6,7 +6,7 @@
{% block navigation_navtabs %}
- {% include 'vaccination/fragments/fragment_vaccination_navtabs.html' %}
+ {% include 'vaccination/fragments/fragments/fragment_vaccination_navtabs.html' %}
{% endblock %}
diff --git a/covid19/templates/vaccination/vaccination_tasks.html b/covid19/blueprints/vaccination/templates/vaccination/vaccination_tasks.html
similarity index 86%
rename from covid19/templates/vaccination/vaccination_tasks.html
rename to covid19/blueprints/vaccination/templates/vaccination/vaccination_tasks.html
index ebf1cfd103ccba5a23243fe68ca796b062c26e10..da60b04788e281c5a99cdc3db895b0aee796f1cf 100644
--- a/covid19/templates/vaccination/vaccination_tasks.html
+++ b/covid19/blueprints/vaccination/templates/vaccination/vaccination_tasks.html
@@ -5,7 +5,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'vaccination/fragments/fragment_vaccination_navtabs.html' %}
+ {% include 'vaccination/fragments/fragments/fragment_vaccination_navtabs.html' %}
{% endblock %}
{% block main_container %}
diff --git a/covid19/templates/vaccination/vaccination_timeline_germany.html b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
similarity index 90%
rename from covid19/templates/vaccination/vaccination_timeline_germany.html
rename to covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
index fe8e79494d21f7e38a68c52250054cbf79401c8f..d4330a26bfc9ea88aa0ff8509a1bd5f0522aea78 100644
--- a/covid19/templates/vaccination/vaccination_timeline_germany.html
+++ b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
@@ -8,7 +8,7 @@
{% block navigation_navtabs %}
- {% include 'vaccination/fragments/fragment_vaccination_navtabs.html' %}
+ {% include 'vaccination/fragments/fragments/fragment_vaccination_navtabs.html' %}
{% endblock %}
@@ -49,7 +49,7 @@
</ul>
{% endif %}
- {% include 'vaccination/fragments/fragment_vaccination_timeline_germany_table.html' %}
+ {% include 'vaccination/fragments/fragments/fragment_vaccination_timeline_germany_table.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/__init__.py b/covid19/blueprints/who/templates/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/templates/who/country/who_country_all.html b/covid19/blueprints/who/templates/who/country/who_country_all.html
similarity index 92%
rename from covid19/templates/who/country/who_country_all.html
rename to covid19/blueprints/who/templates/who/country/who_country_all.html
index ecaa1c45794539ecba5a145a5e0300b68ea48c80..dd739966a4cb287dd91c2d7461d89782a932b988 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -52,7 +52,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_who_country.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_who_country.html' %}
{% endblock %}
diff --git a/covid19/templates/who/country/who_country_germany.html b/covid19/blueprints/who/templates/who/country/who_country_germany.html
similarity index 93%
rename from covid19/templates/who/country/who_country_germany.html
rename to covid19/blueprints/who/templates/who/country/who_country_germany.html
index e03bb4f24fab8880b86ebf7e99df392ad42af592..76e05b8e4815cfa3d419dd30d00b2bcbfa96ca72 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/templates/who/country/who_country_one.html b/covid19/blueprints/who/templates/who/country/who_country_one.html
similarity index 93%
rename from covid19/templates/who/country/who_country_one.html
rename to covid19/blueprints/who/templates/who/country/who_country_one.html
index 011152524e7928373263089fdaea35153ca01bb2..92d210e7db2373933d692165bd13cce8e699244e 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/templates/who/country/who_country_one_cases_cumulative.html b/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
similarity index 93%
rename from covid19/templates/who/country/who_country_one_cases_cumulative.html
rename to covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
index 45ec6418ef765367e4aad5be93b12a8c80397653..f743b1d714c748a51df256663a4c50542fd15b2e 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/templates/who/country/who_country_one_cases_new.html b/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
similarity index 93%
rename from covid19/templates/who/country/who_country_one_cases_new.html
rename to covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
index 762f1696d543d7fcc8564ba4a88eb505f6656d63..13880351220297b9d21bb11fe83f3c195e04b292 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/templates/who/country/who_country_one_deaths_cumulative.html b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
similarity index 93%
rename from covid19/templates/who/country/who_country_one_deaths_cumulative.html
rename to covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
index ee46e9a0dd262d8180d524d16e9ef3117ccd4459..e0934567ce3220a1489d1b000840b4638857c596 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/templates/who/country/who_country_one_deaths_new.html b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
similarity index 93%
rename from covid19/templates/who/country/who_country_one_deaths_new.html
rename to covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
index 93d92ebeb5345ac051626c1f5963720518f8acb3..78b5b18a51611fd131893016dd4293c9505699bf 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/templates/who/date_reported/who_date_reported_all.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
similarity index 98%
rename from covid19/templates/who/date_reported/who_date_reported_all.html
rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
index a3aac1bf944007884ad9eba4f38376f49ae1f686..6c50492f72f37fb6632cee4ede8ba8264638bc10 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
diff --git a/covid19/templates/who/date_reported/who_date_reported_one.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
similarity index 93%
rename from covid19/templates/who/date_reported/who_date_reported_one.html
rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
index 392ededddea3e36293a3da757f3ad3ad7a3ebb24..16f25e24728187d543ce0152412e8804537fad17 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/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
similarity index 93%
rename from covid19/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
index 0df5ea6969508fa592041f10a04491bce5f820f8..23250f00d345167b55e2e160ee6e65d4d11707fd 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/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
similarity index 93%
rename from covid19/templates/who/date_reported/who_date_reported_one_cases_new.html
rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
index 466d412a235fa446204ce4e5e6084b85c231cf83..510196464b662b1ba4f714bbb20e7e4e8512edc4 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/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
similarity index 93%
rename from covid19/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
index 0df5ea6969508fa592041f10a04491bce5f820f8..23250f00d345167b55e2e160ee6e65d4d11707fd 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/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
similarity index 93%
rename from covid19/templates/who/date_reported/who_date_reported_one_deaths_new.html
rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
index 34a059a0aba1e79d8ffb7ab99ebe721868c01657..f4f8bb52a00b909e61c001ff7499622197993b0e 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/templates/who/fragments/fragment_who_navbar_dropdown.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html
similarity index 100%
rename from covid19/templates/who/fragments/fragment_who_navbar_dropdown.html
rename to covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html
diff --git a/covid19/templates/who/fragments/fragment_who_navtabs.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html
similarity index 100%
rename from covid19/templates/who/fragments/fragment_who_navtabs.html
rename to covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html
diff --git a/covid19/templates/who/fragments/fragment_who_table_global_data.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html
similarity index 100%
rename from covid19/templates/who/fragments/fragment_who_table_global_data.html
rename to covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html
diff --git a/covid19/templates/who/fragments/fragment_who_table_global_data_country.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_country.html
similarity index 100%
rename from covid19/templates/who/fragments/fragment_who_table_global_data_country.html
rename to covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_country.html
diff --git a/covid19/templates/who/fragments/fragment_who_table_global_data_date_reported.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_date_reported.html
similarity index 100%
rename from covid19/templates/who/fragments/fragment_who_table_global_data_date_reported.html
rename to covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_date_reported.html
diff --git a/covid19/templates/who/fragments/fragment_who_table_who_country.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_table_who_country.html
similarity index 100%
rename from covid19/templates/who/fragments/fragment_who_table_who_country.html
rename to covid19/blueprints/who/templates/who/fragments/fragment_who_table_who_country.html
diff --git a/covid19/templates/who/region/who_region_all.html b/covid19/blueprints/who/templates/who/region/who_region_all.html
similarity index 96%
rename from covid19/templates/who/region/who_region_all.html
rename to covid19/blueprints/who/templates/who/region/who_region_all.html
index 874b1184f0f8810d8950032530766088f175d6ad..d125b8845c536362726394cebf7168a6eaeb2e84 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
diff --git a/covid19/templates/who/region/who_region_one.html b/covid19/blueprints/who/templates/who/region/who_region_one.html
similarity index 93%
rename from covid19/templates/who/region/who_region_one.html
rename to covid19/blueprints/who/templates/who/region/who_region_one.html
index 6088487010816af209d569845eb4b004e948001a..a44d717d10823b050be6054cca11ce642674d388 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -53,7 +53,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/fragment_who_table_who_country.html' %}
+ {% include 'who/fragments/../fragments/fragment_who_table_who_country.html' %}
{% endblock %}
diff --git a/covid19/templates/who/who_imported.html b/covid19/blueprints/who/templates/who/who_imported.html
similarity index 97%
rename from covid19/templates/who/who_imported.html
rename to covid19/blueprints/who/templates/who/who_imported.html
index 41a7b0ee7053c99f24e4d1db524f0a3b198108b7..f75cdbffe3ea1fa5972fd7277d366f6cb18f6809 100644
--- a/covid19/templates/who/who_imported.html
+++ b/covid19/blueprints/who/templates/who/who_imported.html
@@ -10,7 +10,7 @@
{% block navigation_navtabs %}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragments/fragment_who_navtabs.html' %}
{% endblock %}
diff --git a/covid19/templates/who/who_info.html b/covid19/blueprints/who/templates/who/who_info.html
similarity index 91%
rename from covid19/templates/who/who_info.html
rename to covid19/blueprints/who/templates/who/who_info.html
index 85470ad804c56c4ba9a498a29a067dd1f5f6b76b..4f1327cbd793081a63caf5f025fc463b3cc12970 100644
--- a/covid19/templates/who/who_info.html
+++ b/covid19/blueprints/who/templates/who/who_info.html
@@ -6,7 +6,7 @@
{% block navigation_navtabs %}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragments/fragment_who_navtabs.html' %}
{% endblock %}
diff --git a/covid19/templates/who/who_tasks.html b/covid19/blueprints/who/templates/who/who_tasks.html
similarity index 89%
rename from covid19/templates/who/who_tasks.html
rename to covid19/blueprints/who/templates/who/who_tasks.html
index 7754283b0387ab92d3786bcb08ea4a4a7fecbdd7..30be589b362bccc268df26f0c7cb60391bb37fb1 100644
--- a/covid19/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/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/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 e57cc7b1f1295590a14b8a9f4dcc761736535b31..702d8f16d4531d8ee3665254163013fbae123b5b 100644
--- a/covid19/blueprints/who/who_views.py
+++ b/covid19/blueprints/who/who_views.py
@@ -65,7 +65,7 @@ def task_who_update_initial(self):
def url_who_info():
page_info = ApplicationPage('WHO', "Info")
return render_template(
- 'who/who_info.html',
+ 'templates/who/who_info.html',
page_info=page_info)
@@ -73,7 +73,7 @@ def url_who_info():
def url_who_tasks():
page_info = ApplicationPage('WHO', "Tasks")
return render_template(
- 'who/who_tasks.html',
+ 'templates/who/who_tasks.html',
page_info=page_info)
@@ -87,7 +87,7 @@ def url_who_imported(page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'who/who_imported.html',
+ 'templates/who/who_imported.html',
page_data=page_data,
page_info=page_info)
@@ -102,7 +102,7 @@ def url_who_date_reported_all(page=1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_all.html',
+ 'templates/who/date_reported/who_date_reported_all.html',
page_data=page_data,
page_info=page_info)
@@ -122,7 +122,7 @@ def url_who_date_reported(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one.html',
+ 'templates/who/date_reported/who_date_reported_one.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -143,7 +143,7 @@ def url_who_date_reported_cases_new(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one_cases_new.html',
+ 'templates/who/date_reported/who_date_reported_one_cases_new.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -164,7 +164,7 @@ def url_who_date_reported_cases_cumulative(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one_cases_cumulative.html',
+ 'templates/who/date_reported/who_date_reported_one_cases_cumulative.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -185,7 +185,7 @@ def url_who_date_reported_deaths_new(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one_deaths_new.html',
+ 'templates/who/date_reported/who_date_reported_one_deaths_new.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -206,7 +206,7 @@ def url_who_date_reported_deaths_cumulative(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one_deaths_cumulative.html',
+ 'templates/who/date_reported/who_date_reported_one_deaths_cumulative.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -222,7 +222,7 @@ def url_who_region_all(page=1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'who/region/who_region_all.html',
+ 'templates/who/region/who_region_all.html',
page_data=page_data,
page_info=page_info)
@@ -242,7 +242,7 @@ def url_who_region(region_id, page=1):
flash("No countries of that region in the database.")
page_data = None
return render_template(
- 'who/region/who_region_one.html',
+ 'templates/who/region/who_region_one.html',
who_region=who_region,
page_data=page_data,
page_info=page_info)
@@ -258,7 +258,7 @@ def url_who_country_all(page=1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'who/country/who_country_all.html',
+ 'templates/who/country/who_country_all.html',
page_data=page_data,
page_info=page_info)
@@ -272,7 +272,7 @@ 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(
- 'who/country/who_country_one.html',
+ 'templates/who/country/who_country_one.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -287,7 +287,7 @@ 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(
- 'who/country/who_country_one_cases_new.html',
+ 'templates/who/country/who_country_one_cases_new.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -302,7 +302,7 @@ 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(
- 'who/country/who_country_one_cases_cumulative.html',
+ 'templates/who/country/who_country_one_cases_cumulative.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -317,7 +317,7 @@ 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(
- 'who/country/who_country_one_deaths_new.html',
+ 'templates/who/country/who_country_one_deaths_new.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -332,7 +332,7 @@ 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(
- 'who/country/who_country_one_deaths_cumulative.html',
+ 'templates/who/country/who_country_one_deaths_cumulative.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -348,7 +348,7 @@ 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(
- 'who/country/who_country_germany.html',
+ 'templates/who/country/who_country_germany.html',
who_country=who_country_germany,
page_data=page_data,
page_info=page_info)
diff --git a/covid19/templates/common/fragment_navbar.html b/covid19/templates/common/fragment_navbar.html
index 414b4ecb2c4457886ea4a1095d69e7396d520af3..3719ba9f3b1c514b5c1d07e3195f9c25e5112f2c 100644
--- a/covid19/templates/common/fragment_navbar.html
+++ b/covid19/templates/common/fragment_navbar.html
@@ -13,15 +13,15 @@
<a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
</li>
- {% include 'who/fragments/fragment_who_navbar_dropdown.html' %}
+ {% include '../../blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html' %}
- {% include 'europe/fragments/fragment_europe_navbar_dropdown.html' %}
+ {% include '../../blueprints/europe/templates/europe/fragments/fragment_europe_navbar_dropdown.html' %}
- {% include 'vaccination/fragments/fragment_vaccination_navbar_dropdown.html' %}
+ {% include '../../blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html' %}
- {% include 'rki/fragment_rki_navbar_dropdown.html' %}
+ {% include '../../blueprints/rki/templates/rki/fragment_rki_navbar_dropdown.html' %}
- {% include 'admin/fragments/fragment_admin_navbar_dropdown.html' %}
+ {% include '../../blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html' %}
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
diff --git a/covid19/views.py b/covid19/views.py
index 257d93eb8503cd767276163a38cb32038b1a5d7a..bb0c0217d6c049c7505114c40245c72824a414db 100644
--- a/covid19/views.py
+++ b/covid19/views.py
@@ -8,6 +8,18 @@ import covid19.blueprints.vaccination.vaccination_views
import covid19.blueprints.rki.rki_views
import covid19.blueprints.admin.admin_views
+from covid19.blueprints.who.who_views import app_who
+from covid19.blueprints.europe.europe_views import app_europe
+from covid19.blueprints.vaccination.vaccination_views import app_vaccination
+from covid19.blueprints.rki.rki_views import app_rki
+from covid19.blueprints.admin.admin_views import app_admin
+
+app.register_blueprint(app_who, url_prefix='/who')
+app.register_blueprint(app_europe, url_prefix='/europe')
+app.register_blueprint(app_vaccination, url_prefix='/vaccination')
+app.register_blueprint(app_rki, url_prefix='/rki')
+app.register_blueprint(app_admin, url_prefix='/admin')
+
############################################################################################
#