diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
index da3c31d72d0481d16de5409022113b1f148ca06e..4cf33bb185d154c1912746e73b3d3dd5b880bbf4 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_all_pagination.html' %}
+ {% include 'divi/country/divi_country_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_all_table.html' %}
+ {% include 'divi/country/divi_country_all_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_all_pagination.html' %}
+ {% include 'divi/country/divi_country_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
index 469047e8abf29b56d3caf686ed6b5ac01879ce85..6416bf0c054fbc94fa9e15cc2b4ed1a0085ef562 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
@@ -3,7 +3,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -11,7 +11,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -27,7 +27,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
index 29c2c8c55568d72950e35a1232b81e050172ec6f..9bb422cda256075da079920a65e3f6c16cc12264 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
@@ -8,26 +8,26 @@
country code
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_region_all') }}">region</a>
+ <a href="{{ url_for('who.url_divi_region_all') }}">region</a>
</th>
</tr>
</thead>
<tbody>
- {% for who_country in page_data.items %}
+ {% for divi_country in page_data.items %}
<tr>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_country.id) }}">
- {{ who_country.country }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_country.id) }}">
+ {{ divi_country.country }}
</a>
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_country.id) }}">
- {{ who_country.country_code }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_country.id) }}">
+ {{ divi_country.country_code }}
</a>
</td>
<th>
- <a href="{{ url_for('who.url_who_region', region_id=who_country.region.id) }}">
- {{ who_country.region.region }}
+ <a href="{{ url_for('who.url_divi_region', region_id=divi_country.region.id) }}">
+ {{ divi_country.region.region }}
</a>
</th>
</tr>
@@ -42,7 +42,7 @@
country code
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_region_all') }}">region</a>
+ <a href="{{ url_for('who.url_divi_region_all') }}">region</a>
</th>
</tr>
</tfoot>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
index cd4675faad9c64d74e8822f753415844f80a501a..2ed20c2cf902a2e4a1252300bcecb4f481a9acf1 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_germany_pagination.html' %}
+ {% include 'divi/country/divi_country_germany_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_germany_pagination.html' %}
+ {% include 'divi/country/divi_country_germany_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
index 3aaba2d4fe7668235622815621920e2926013b1e..2f158697da25b04eaf618e045a177f3d270abccb 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
@@ -3,7 +3,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
index 7f61469fe8597dc6f9005c58247e8160448000b0..2df755993825bf9a6c4b13a08c7674853cc30f82 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
@@ -2,21 +2,21 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_pagination.html' %}
+ {% include 'divi/country/divi_country_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="col">
- {% include 'who/country/who_country_one_pagination.html' %}
+ {% include 'divi/country/divi_country_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
index 5aae35beb7ca944108a520b7800393c22aa14aca..52ffbeb0c25c13c099f271ca51389692313c6877 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_cumulative_pagination.html' %}
+ {% include 'divi/country/divi_country_one_cases_cumulative_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_cumulative_pagination.html' %}
+ {% include 'divi/country/divi_country_one_cases_cumulative_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
index 9853ccedc91489e33fe7bef0c14509bfc8c6b579..ed138a323f1cee4bc255d7f59aaf1afad22f2e57 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
@@ -3,7 +3,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
index a522b64cdceb012b4ba9b9fb2c194ea7ee2500c5..2de058934da0aa6fc2d54113b717846e5b5e64c8 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_new_pagination.html' %}
+ {% include 'divi/country/divi_country_one_cases_new_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_new_pagination.html' %}
+ {% include 'divi/country/divi_country_one_cases_new_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
index fce53cfa7f626930a60ddc67ea12cb65fd959767..5fe0b4fd29b8edb05c003bc3cb008f6d3d80314d 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
@@ -3,7 +3,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
index d55e49fc8fbfb8c331de4c776f9d878148a6aa6b..204f21353713a9690cb208f2f752d5970be3dc78 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_deaths_cumulative_pagination.html' %}
+ {% include 'divi/country/divi_country_one_deaths_cumulative_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_deaths_cumulative_pagination.html' %}
+ {% include 'divi/country/divi_country_one_deaths_cumulative_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
index cce38e1b35985f1c07585b49da5aa8d09bef561b..b21dd80bb69bd7a986feb7b51de47a0c57cb90a8 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
@@ -3,7 +3,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
index 6a771b79bc54481fad5b95e556c13d23ddd0ba36..ef88f3cadf057c59325c23435636274bcba45b62 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
@@ -12,7 +12,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -22,7 +22,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -40,7 +40,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -51,7 +51,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
index 9a88e6709f638e8d5784ee79b6679e48643d94a2..b1471e8cc0c01b2854ae2640eb4de587a5c73391 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
@@ -3,7 +3,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
index c2561c3ef27f1618978e32f96bf3790e9e9a509e..ac27722a60b9b3f4186a6c545e80375113b5d3f8 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
@@ -3,7 +3,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
index f8537ede976f089bbf036965dd1935cb621933dc..5183d720619c78dc3c111ee88f40c2748a7d15d9 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
@@ -2,80 +2,80 @@
<thead class="table-secondary">
<tr>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_all') }}">
+ <a href="{{ url_for('who.url_divi_date_reported_all') }}">
date reported
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_deaths_new',country_id=who_country.id) }}">
+ <a href="{{ url_for('who.url_divi_country_deaths_new',country_id=divi_country.id) }}">
deaths new
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_cases_new',country_id=who_country.id) }}">
+ <a href="{{ url_for('who.url_divi_country_cases_new',country_id=divi_country.id) }}">
cases new
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_deaths_cumulative',country_id=who_country.id) }}">
+ <a href="{{ url_for('who.url_divi_country_deaths_cumulative',country_id=divi_country.id) }}">
deaths cumulative
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_cases_cumulative',country_id=who_country.id) }}">
+ <a href="{{ url_for('who.url_divi_country_cases_cumulative',country_id=divi_country.id) }}">
cases cumulative
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_all') }}">
+ <a href="{{ url_for('who.url_divi_country_all') }}">
country code
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_all') }}">
+ <a href="{{ url_for('who.url_divi_country_all') }}">
country
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_region_all') }}">
+ <a href="{{ url_for('who.url_divi_region_all') }}">
region
</a>
</th>
</tr>
</thead>
<tbody>
- {% for who_global_data in page_data.items %}
+ {% for divi_global_data in page_data.items %}
<tr>
<th>
- <a href="{{ url_for('who.url_who_date_reported',date_reported_id=who_global_data.date_reported.id) }}">
- {{ who_global_data.date_reported }}
+ <a href="{{ url_for('who.url_divi_date_reported',date_reported_id=divi_global_data.date_reported.id) }}">
+ {{ divi_global_data.date_reported }}
</a>
</th>
<td>
- {{ who_global_data.deaths_new }}
+ {{ divi_global_data.deaths_new }}
</td>
<td>
- {{ who_global_data.cases_new }}
+ {{ divi_global_data.cases_new }}
</td>
<td>
- {{ who_global_data.deaths_cumulative }}
+ {{ divi_global_data.deaths_cumulative }}
</td>
<td>
- {{ who_global_data.cases_cumulative }}
+ {{ divi_global_data.cases_cumulative }}
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_global_data.country.id) }}">
- {{ who_global_data.country.country_code }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}">
+ {{ divi_global_data.country.country_code }}
</a>
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_global_data.country.id) }}">
- {{ who_global_data.country.country }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}">
+ {{ divi_global_data.country.country }}
</a>
</td>
<th>
- <a href="{{ url_for('who.url_who_region', region_id=who_global_data.country.region.id) }}">
- {{ who_global_data.country.region.region }}
+ <a href="{{ url_for('who.url_divi_region', region_id=divi_global_data.country.region.id) }}">
+ {{ divi_global_data.country.region.region }}
</a>
</th>
</tr>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
index eea1d5dab6331468a984df2f3fc2fe962f0f3f34..fb27e4642fdff7cbfd7b48c4ea2c77a7e9be6ea2 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_all_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_all_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_all_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_all_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
index 3434879171248384b5af560384ba84e538558fce..135fc92280a38aeb234fcdf3ad36974c3b8ce8c9 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
@@ -3,7 +3,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -11,7 +11,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -27,7 +27,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
index ef541983181cfca3c2f92fcf3d2271dcf7659647..71fc780bfefb99d505226158063953e847e4a99c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
@@ -8,21 +8,21 @@
</tr>
</thead>
<tbody>
- {% for who_date_reported in page_data.items %}
+ {% for divi_date_reported in page_data.items %}
<tr>
<td class="text-right">
- {{ who_date_reported.get_name_for_weekday() }}
+ {{ divi_date_reported.get_name_for_weekday() }}
</td>
<td class="text-left">
- <a href="/who/date_reported/{{ who_date_reported.id }}">
- {{ who_date_reported }}
+ <a href="/who/date_reported/{{ divi_date_reported.id }}">
+ {{ divi_date_reported }}
</a>
</td>
<td class="text-right">
- {{ who_date_reported.week_of_year }}
+ {{ divi_date_reported.week_of_year }}
</td>
<td class="text-left">
- {{ who_date_reported.year }}
+ {{ divi_date_reported.year }}
</td>
</tr>
{% endfor %}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
index fb852908da57023a907d05d68bc08d75f8bd3bfa..ca967bdab4944dd98620e121fa660bf9fe80a9f4 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
index 2e6562a57a27c4cccce811027fea0fc595b738f3..a5a52426a8edf9de5852035f16b5fb314e19efbc 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
{% endblock %}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
index 3b6188546206e22f6a94ef7de8ed1d7649d513a2..02c1fbb81db04c289f2759490ff3e9db174087d3 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
@@ -3,8 +3,8 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -12,8 +12,8 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -29,8 +29,8 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
index fb852908da57023a907d05d68bc08d75f8bd3bfa..ca967bdab4944dd98620e121fa660bf9fe80a9f4 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
index dc0782434b92c4992f1d9620ad854811629cad6a..5f553699d104789ebff962b6040c20eb16527c09 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
@@ -3,8 +3,8 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <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) }}">
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new',
+ date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -14,8 +14,8 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new',
+ date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -31,8 +31,8 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new',
+ date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
index 6cade560341b221034de178f547b65c38538e911..f296b13745eb259a179f12d6ee1954bd1d07f8a5 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
index 3b6188546206e22f6a94ef7de8ed1d7649d513a2..02c1fbb81db04c289f2759490ff3e9db174087d3 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
@@ -3,8 +3,8 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -12,8 +12,8 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -29,8 +29,8 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
index c61e0d1972b4df5e5cc5ef3b37a7458fb522ffbf..3e5b23329ef96799b90df030454ceb51de106d67 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
index 7938fbcd1c4430f3657c078d2a323fa4e7d7cdaf..aba8dcc65084004bafdd19d488a755a2b74286e0 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
@@ -3,8 +3,8 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported',
+ date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -12,8 +12,8 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported',
+ date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -29,8 +29,8 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported',
+ date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
index 5dd91bb5f923b421ff7b1464797bd1182ccac7e0..abd0e2f0e3f2281daed68ccde61223b20a994e62 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
@@ -2,80 +2,80 @@
<thead class="table-secondary">
<tr>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_all') }}">
+ <a href="{{ url_for('who.url_divi_date_reported_all') }}">
date reported
</a>
</th>
<th scope="col"> who.
- <a href="{{ url_for('who.url_who_date_reported_deaths_new', date_reported_id=who_date_reported.id) }}">
+ <a href="{{ url_for('who.url_divi_date_reported_deaths_new', date_reported_id=divi_date_reported.id) }}">
deaths new
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_cases_new', date_reported_id=who_date_reported.id) }}">
+ <a href="{{ url_for('who.url_divi_date_reported_cases_new', date_reported_id=divi_date_reported.id) }}">
cases new
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_deaths_cumulative', date_reported_id=who_date_reported.id) }}">
+ <a href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id) }}">
deaths cumulative
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_cases_cumulative', date_reported_id=who_date_reported.id) }}">
+ <a href="{{ url_for('who.url_divi_date_reported_cases_cumulative', date_reported_id=divi_date_reported.id) }}">
cases cumulative
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_all') }}">
+ <a href="{{ url_for('who.url_divi_country_all') }}">
country code
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_all') }}">
+ <a href="{{ url_for('who.url_divi_country_all') }}">
country
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_region_all') }}">
+ <a href="{{ url_for('who.url_divi_region_all') }}">
region
</a>
</th>
</tr>
</thead>
<tbody>
- {% for who_global_data in page_data.items %}
+ {% for divi_global_data in page_data.items %}
<tr>
<th>
- <a href="{{ url_for('who.url_who_date_reported', date_reported_id=who_global_data.date_reported.id) }}">
- {{ who_global_data.date_reported }}
+ <a href="{{ url_for('who.url_divi_date_reported', date_reported_id=divi_global_data.date_reported.id) }}">
+ {{ divi_global_data.date_reported }}
</a>
</th>
<td>
- {{ who_global_data.deaths_new }}
+ {{ divi_global_data.deaths_new }}
</td>
<td>
- {{ who_global_data.cases_new }}
+ {{ divi_global_data.cases_new }}
</td>
<td>
- {{ who_global_data.deaths_cumulative }}
+ {{ divi_global_data.deaths_cumulative }}
</td>
<td>
- {{ who_global_data.cases_cumulative }}
+ {{ divi_global_data.cases_cumulative }}
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_global_data.country.id ) }}">
- {{ who_global_data.country.country_code }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id ) }}">
+ {{ divi_global_data.country.country_code }}
</a>
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_global_data.country.id) }}">
- {{ who_global_data.country.country }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}">
+ {{ divi_global_data.country.country }}
</a>
</td>
<th>
- <a href="{{ url_for('who.url_who_region', region_id=who_global_data.country.region.id) }}">
- {{ who_global_data.country.region.region }}
+ <a href="{{ url_for('who.url_divi_region', region_id=divi_global_data.country.region.id) }}">
+ {{ divi_global_data.country.region.region }}
</a>
</th>
</tr>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
index d12fed01d11e780fb0ef5fb7a5ffea531913d2c5..8dbdc54648f6570b88c512297ab33bacdb1ef30d 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_pagination.html' %}
+ {% include 'divi/fragments/fragment_divi_imported_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_table.html' %}
+ {% include 'divi/fragments/fragment_divi_imported_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_pagination.html' %}
+ {% include 'divi/fragments/fragment_divi_imported_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
index 43bb0444dd4b903d25ba2b6c07e7501283266e0e..9aea2eeb9d1575f36ec3b6db9d10637724ee3c0c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
index 51281f271f0c5ec2be13e31e5afc593922e060ff..5baf486a02b781df962e10800a017ca0ecdbe7ea 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
@@ -2,36 +2,36 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_update_star_schema_initial') }}"
+ href="{{ url_for( 'who.url_task_divi_update_star_schema_initial') }}"
role="button">WHO :: Task :: update :: star_schema :: initial</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_update_star_schema_incremental') }}"
+ href="{{ url_for( 'who.url_task_divi_update_star_schema_incremental') }}"
role="button">WHO :: Task :: update :: star_schema :: incremental</a>
</div>
</div>
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_download_only') }}"
+ href="{{ url_for( 'who.url_task_divi_download_only') }}"
role="button">WHO :: Task :: download :: only</a>
<a class="btn btn-info btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_import_only') }}"
+ href="{{ url_for( 'who.url_task_divi_import_only') }}"
role="button">WHO :: Task :: import :: only</a>
<a class="btn btn-warning btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_update_dimension_tables_only') }}"
+ href="{{ url_for( 'who.url_task_divi_update_dimension_tables_only') }}"
role="button">WHO :: Task :: update :: dimension-tables : only</a>
<a class="btn btn-danger btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_update_fact_table_incremental_only') }}"
+ href="{{ url_for( 'who.url_task_divi_update_fact_table_incremental_only') }}"
role="button">WHO :: Task :: update :: fact-table :: only :: incremental</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_update_fact_table_initial_only') }}"
+ href="{{ url_for( 'who.url_task_divi_update_fact_table_initial_only') }}"
role="button">WHO :: Task :: update :: fact-table :: only :: initial</a>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
index d0d56482bb784e9352439d0d1b38a76d3bfd4bd0..a0f6a956f97094fac37ab5f95b7eecf69e60cd8b 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
@@ -4,7 +4,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('who.url_who_imported', page=page_data.prev_num) }}">Previous</a>
+ href="{{ url_for('who.url_divi_imported', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -13,7 +13,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('who.url_who_imported', page=page_num) }}">{{ page_num }}</a>
+ href="{{ url_for('who.url_divi_imported', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -30,7 +30,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('who.url_who_imported', page=page_data.next_num) }}">Next</a>
+ href="{{ url_for('who.url_divi_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
index 941f320b750d00038bc84af70bef5e4c5db83d5f..55571bff64c582315e90f3cad09ce53e73523451 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
@@ -12,16 +12,16 @@
</tr>
</thead>
<tbody>
- {% for who_global_data_import in page_data.items %}
+ {% for divi_global_data_import in page_data.items %}
<tr>
- <td>{{ who_global_data_import.date_reported }}</td>
- <td>{{ who_global_data_import.country }}</td>
- <td>{{ who_global_data_import.country_code }}</td>
- <td>{{ who_global_data_import.who_region }}</td>
- <td>{{ who_global_data_import.new_cases }}</td>
- <td>{{ who_global_data_import.cumulative_cases }}</td>
- <td>{{ who_global_data_import.new_deaths }}</td>
- <td>{{ who_global_data_import.cumulative_deaths }}</td>
+ <td>{{ divi_global_data_import.date_reported }}</td>
+ <td>{{ divi_global_data_import.country }}</td>
+ <td>{{ divi_global_data_import.country_code }}</td>
+ <td>{{ divi_global_data_import.divi_region }}</td>
+ <td>{{ divi_global_data_import.new_cases }}</td>
+ <td>{{ divi_global_data_import.cumulative_cases }}</td>
+ <td>{{ divi_global_data_import.new_deaths }}</td>
+ <td>{{ divi_global_data_import.cumulative_deaths }}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
index 90049ac244f2bee17b01e80c0e4f15a1aa10aff9..9f75943a2460e82b990e54c9054f517cb7174b31 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
@@ -2,7 +2,7 @@
<thead class="table-secondary">
<tr>
<th scope="col">
- <a href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ <a href="{{ url_for( 'who.url_divi_date_reported_all') }}">
date reported
</a>
</th>
@@ -19,47 +19,47 @@
cases cumulative
</th>
<th scope="col">
- <a href="{{ url_for( 'who.url_who_country_all') }}">
+ <a href="{{ url_for( 'who.url_divi_country_all') }}">
country code
</a>
</th>
<th scope="col">
- <a href="{{ url_for( 'who.url_who_country_all') }}">
+ <a href="{{ url_for( 'who.url_divi_country_all') }}">
country
</a>
</th>
<th scope="col">
- <a href="{{ url_for( 'who.url_who_region_all') }}">
+ <a href="{{ url_for( 'who.url_divi_region_all') }}">
region
</a>
</th>
</tr>
</thead>
<tbody>
- {% for who_global_data in page_data.items %}
+ {% for divi_global_data in page_data.items %}
<tr>
<th>
- <a href="/who/date_reported/{{ who_global_data.date_reported.id }}">
- {{ who_global_data.date_reported }}
+ <a href="/who/date_reported/{{ divi_global_data.date_reported.id }}">
+ {{ divi_global_data.date_reported }}
</a>
</th>
- <td>{{ who_global_data.deaths_new }}</td>
- <td>{{ who_global_data.cases_new }}</td>
- <td>{{ who_global_data.deaths_cumulative }}</td>
- <td>{{ who_global_data.cases_cumulative }}</td>
+ <td>{{ divi_global_data.deaths_new }}</td>
+ <td>{{ divi_global_data.cases_new }}</td>
+ <td>{{ divi_global_data.deaths_cumulative }}</td>
+ <td>{{ divi_global_data.cases_cumulative }}</td>
<td>
- <a href="/who/country/{{ who_global_data.country.id }}">
- {{ who_global_data.country.country_code }}
+ <a href="/who/country/{{ divi_global_data.country.id }}">
+ {{ divi_global_data.country.country_code }}
</a>
</td>
<td>
- <a href="/who/country/{{ who_global_data.country.id }}">
- {{ who_global_data.country.country }}
+ <a href="/who/country/{{ divi_global_data.country.id }}">
+ {{ divi_global_data.country.country }}
</a>
</td>
<th>
- <a href="/who/region/{{ who_global_data.country.region.id }}">
- {{ who_global_data.country.region.region }}
+ <a href="/who/region/{{ divi_global_data.country.region.id }}">
+ {{ divi_global_data.country.region.region }}
</a>
</th>
</tr>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html
index 2c2e5a9df4da1ab5a5a18de69361cec947ad163c..efed2bfd9179091a9e14394fccfee6841d8cb4e3 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html
@@ -4,7 +4,7 @@
</a>
<ul class="dropdown-menu">
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_date_reported_all') }}">
WHO
</a>
</li>
@@ -12,7 +12,7 @@
<div class="dropdown-divider"></div>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_germany') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_germany') }}">
WHO Germany
</a>
</li>
@@ -20,17 +20,17 @@
<div class="dropdown-divider"></div>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_region_all') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_region_all') }}">
WHO Regions
</a>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_date_reported_all') }}">
WHO Date Reported
</a>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_country_all') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_country_all') }}">
WHO Countries
</a>
</li>
@@ -39,7 +39,7 @@
</li>
{% if current_user.is_authenticated %}
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_imported') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_imported') }}">
WHO imported
</a>
</li>
@@ -48,13 +48,13 @@
<div class="dropdown-divider"></div>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_info') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_info') }}">
WHO Info
</a>
</li>
{% if current_user.is_authenticated %}
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_tasks') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_tasks') }}">
WHO Tasks
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
index 032b51dc9f878a8676f2532346bc6777e51662e3..7d26db703eb73fd437d58a6677cce433ad350d7a 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
@@ -6,40 +6,40 @@
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_info') }}">WHO Info</a>
+ href="{{ url_for( 'who.url_divi_info') }}">WHO Info</a>
</li>
{% if current_user.is_authenticated %}
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_tasks') }}">WHO tasks</a>
+ href="{{ url_for( 'who.url_divi_tasks') }}">WHO tasks</a>
</li>
{% endif %}
{% if current_user.is_authenticated %}
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who_test.url_who_test_tests') }}">WHO Tests</a>
+ href="{{ url_for( 'divi_test.url_divi_test_tests') }}">WHO Tests</a>
</li>
{% endif %}
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_date_reported_all') }}">WHO Date Reported</a>
+ href="{{ url_for( 'who.url_divi_date_reported_all') }}">WHO Date Reported</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_germany') }}">WHO Germany</a>
+ href="{{ url_for( 'who.url_divi_germany') }}">WHO Germany</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_region_all') }}">WHO Regions</a>
+ href="{{ url_for( 'who.url_divi_region_all') }}">WHO Regions</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_country_all') }}">WHO Countries</a>
+ href="{{ url_for( 'who.url_divi_country_all') }}">WHO Countries</a>
</li>
{% if current_user.is_authenticated %}
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_imported') }}">WHO imported</a>
+ href="{{ url_for( 'who.url_divi_imported') }}">WHO imported</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
index 12960224fc8e1134a925f295a3b040d3e3bf3c5d..54bb8dc1109ab75359be94ffabd164d3443ba802 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/region/who_region_all_pagination.html' %}
+ {% include 'divi/region/divi_region_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/region/who_region_all_table.html' %}
+ {% include 'divi/region/divi_region_all_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/region/who_region_all_pagination.html' %}
+ {% include 'divi/region/divi_region_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
index 35f878b3fcfec2a0363cad44ab96a4819b44eb20..54554445dee597fe0c4068175e35eaac2155e8df 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
@@ -4,7 +4,7 @@
<!-- previous page -->
{% if page_data.has_prev %}
<li>
- <a href="{{ url_for('who.url_who_region_all', page=page_data.prev_num) }}">
+ <a href="{{ url_for('who.url_divi_region_all', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -14,7 +14,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li>
- <a href="{{ url_for('who.url_who_region_all', page=page_num) }}">
+ <a href="{{ url_for('who.url_divi_region_all', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -32,7 +32,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li>
- <a href="{{ url_for('who.url_who_region_all', page=page_data.next_num) }}">
+ <a href="{{ url_for('who.url_divi_region_all', page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
index a62785a58196e057fc16ce2937251a7126b4f2c4..496da52cd477d3fb69fcf2d5df0f785d904cdbcf 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
@@ -2,15 +2,15 @@
<table class="table table-hover table-striped table-dark">
<thead>
<tr>
- <th scope="col">who_region</th>
+ <th scope="col">divi_region</th>
</tr>
</thead>
<tbody>
- {% for who_region in page_data.items %}
+ {% for divi_region in page_data.items %}
<tr>
<td>
- <a href="/who/region/{{ who_region.id }}">
- {{ who_region.region }}
+ <a href="/who/region/{{ divi_region.id }}">
+ {{ divi_region.region }}
</a>
</td>
</tr>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
index e273103351b75ac5ba0d54a70ffb0efe954eb0c4..1847e5d5cbe26faeebf98ca3571096a6a6128674 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
@@ -2,24 +2,24 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/region/who_region_one_pagination.html' %}
+ {% include 'divi/region/divi_region_one_pagination.html' %}
</div>
</div>
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_all_table.html' %}
+ {% include 'divi/country/divi_country_all_table.html' %}
</div>
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/region/who_region_one_pagination.html' %}
+ {% include 'divi/region/divi_region_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
index ad18ea25e07c59a7a33f3afe2f8177ed4de7d4b8..fe39c12564322ce7e4b40edf2aba334a2d05667a 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
@@ -3,8 +3,8 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_region',
- region_id=who_region.id , page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_divi_region',
+ region_id=divi_region.id , page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -12,8 +12,8 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_region',
- region_id=who_region.id ,page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_divi_region',
+ region_id=divi_region.id ,page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -29,8 +29,8 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_region',
- region_id=who_region.id , page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_divi_region',
+ region_id=divi_region.id , page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>