diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
index bb56aeb5c2fe459cd49616361803c58042255ac4..c35a754d6b5f0ff19f37e42cb02fdfd8dcf58260 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'owid/fragments/fragment_owid_navtabs.html' %}
<div class="container">
<div class="row">
@@ -12,7 +12,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('owid.url_owid_date_reported_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -20,7 +20,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('owid.url_owid_date_reported_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -36,7 +36,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('owid.url_owid_date_reported_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
@@ -55,21 +55,21 @@
</tr>
</thead>
<tbody>
- {% for who_date_reported in page_data.items %}
+ {% for owid_date_reported in page_data.items %}
<tr>
<td class="text-right">
- {{ who_date_reported.get_name_for_weekday() }}
+ {{ owid_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="/owid/date_reported/{{ owid_date_reported.id }}">
+ {{ owid_date_reported }}
</a>
</td>
<td class="text-right">
- {{ who_date_reported.week_of_year }}
+ {{ owid_date_reported.week_of_year }}
</td>
<td class="text-left">
- {{ who_date_reported.year }}
+ {{ owid_date_reported.year }}
</td>
</tr>
{% endfor %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
index ea42e88b6298cf8335ea9ff5b3dbf01c37b5b93b..ff168761bd4e874e0452361d24a4b5cc6e09f6ca 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'owid/fragments/fragment_owid_navtabs.html' %}
<div class="container">
<div class="row">
@@ -12,8 +12,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('owid.url_owid_date_reported',
+ date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -21,8 +21,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('owid.url_owid_date_reported',
+ date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -38,8 +38,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('owid.url_owid_date_reported',
+ date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
@@ -48,7 +48,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
index 0297141edba20919b9cde314b40c4f2c6ad3c0a8..7337b92a6e9dc527e9a953d8c27e13e4b32c5cb3 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'owid/fragments/fragment_owid_navtabs.html' %}
<div class="container">
<div class="row">
@@ -12,8 +12,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('owid.url_owid_date_reported_deaths_cumulative',
+ date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -21,8 +21,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('owid.url_owid_date_reported_deaths_cumulative',
+ date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -38,8 +38,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('owid.url_owid_date_reported_deaths_cumulative',
+ date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
@@ -48,9 +48,10 @@
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
</div>
</div>
+ </div>
{% endblock %}
{% block footer_container %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
index aa43b732c9b49f1e5ebe28b33f23c7f7c1405f7b..22eea5265f350227a932b44a793683af493a6e4b 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'owid/fragments/fragment_owid_navtabs.html' %}
<div class="container">
<div class="row">
@@ -12,8 +12,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('owid.url_owiddate_reported_cases_new',
+ date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -23,8 +23,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('owid.url_owiddate_reported_cases_new',
+ date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -40,8 +40,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('owid.url_owiddate_reported_cases_new',
+ date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
@@ -50,7 +50,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
index 31b7bb3fa004e0f1c9c3b1c5731d28c21718b6ac..7337b92a6e9dc527e9a953d8c27e13e4b32c5cb3 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'owid/fragments/fragment_owid_navtabs.html' %}
<div class="container">
<div class="row">
@@ -12,8 +12,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('owid.url_owid_date_reported_deaths_cumulative',
+ date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -21,8 +21,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('owid.url_owid_date_reported_deaths_cumulative',
+ date_reported_id=owid_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -38,8 +38,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('owid.url_owid_date_reported_deaths_cumulative',
+ date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
@@ -48,7 +48,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
index fad9a3615d07d5245c494ace822b006e3528223e..cf5bce323dfcc54c939639a4d29ef308931bba8b 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'owid/fragments/fragment_owid_navtabs.html' %}
<div class="container">
<div class="row">
@@ -12,8 +12,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_new',
- date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_new',
+ date_reported_id=owid_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -21,8 +21,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_new',
- date_reported_id=who_date_reported.id, page=page_num) }}">
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_new',
+ date_reported_id=owid_date_reported.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -42,8 +42,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_new',
- date_reported_id=who_date_reported.id, page=page_data.next_num) }}">
+ <a class="page-link" href="{{ url_for('owid.url_owid_date_reported_deaths_new',
+ date_reported_id=owid_date_reported.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -54,7 +54,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'owid/fragments/fragment_owid_table_global_data_date_reported.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_imported_pagination.html b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_imported_pagination.html
index d0d56482bb784e9352439d0d1b38a76d3bfd4bd0..6ea4116ee8ed43e46f20120cd54a8eb170653614 100644
--- a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_imported_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_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('owid.url_owid_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('owid.url_owid_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('owid.url_owid_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_imported_table.html b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_imported_table.html
index 941f320b750d00038bc84af70bef5e4c5db83d5f..32e255f3b7e12d5d332ad8d60dff7285519af16d 100644
--- a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_imported_table.html
+++ b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_imported_table.html
@@ -12,16 +12,16 @@
</tr>
</thead>
<tbody>
- {% for who_global_data_import in page_data.items %}
+ {% for owid_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>{{ owid_import.date_reported }}</td>
+ <td>{{ owid_import.country }}</td>
+ <td>{{ owid_import.country_code }}</td>
+ <td>{{ owid_import.who_region }}</td>
+ <td>{{ owid_import.new_cases }}</td>
+ <td>{{ owid_import.cumulative_cases }}</td>
+ <td>{{ owid_import.new_deaths }}</td>
+ <td>{{ owid_import.cumulative_deaths }}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navbar_dropdown.html b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navbar_dropdown.html
index 3f148443e700dc2a92cfb8b1f61ec30604a8cd08..3ac42e88bde8a6297161af99ff6638cd6e5e3bc8 100644
--- a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navbar_dropdown.html
+++ b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navbar_dropdown.html
@@ -1,45 +1,26 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- WHO
+ OWID
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <!-- TODO: change URL to for_url() -->
<a class="dropdown-item"
- href="{{ url_for( 'who.url_who_date_reported_all') }}">
- WHO
+ href="{{ url_for( 'owid.url_owid_date_reported_all') }}">
+ OWID Date Reported
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item"
- href="{{ url_for( 'who.url_who_germany') }}">
- WHO Germany
+ href="{{ url_for( 'owid.url_owid_imported') }}">
+ OWID imported
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item"
- href="{{ url_for( 'who.url_who_region_all') }}">
- WHO Regions
+ href="{{ url_for( 'owid.url_owid_info') }}">
+ OWID Info
</a>
<a class="dropdown-item"
- href="{{ url_for( 'who.url_who_date_reported_all') }}">
- WHO Date Reported
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'who.url_who_country_all') }}">
- WHO Countries
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'who.url_who_imported') }}">
- WHO imported
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'who.url_who_info') }}">
- WHO Info
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'who.url_who_tasks') }}">
- WHO Tasks
+ href="{{ url_for( 'owid.url_owid_tasks') }}">
+ OWID Tasks
</a>
</div>
</li>
\ No newline at end of file
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navtabs.html b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navtabs.html
index af699352b390d691d8fc1e7cb533d62575b93d8b..6f212cde2772524a8f0d01f8769356d43401f94c 100644
--- a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navtabs.html
+++ b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navtabs.html
@@ -6,31 +6,19 @@
<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( 'owid.url_owid_info') }}">OWID Info</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_tasks') }}">WHO tasks</a>
+ href="{{ url_for( 'owid.url_owid_tasks') }}">OWID tasks</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_date_reported_all') }}">WHO Date Reported</a>
+ href="{{ url_for( 'owid.url_owid_date_reported_all') }}">OWID Date Reported</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_germany') }}">WHO Germany</a>
- </li>
- <li class="nav-item">
- <a class="nav-link"
- href="{{ url_for( 'who.url_who_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>
- </li>
- <li class="nav-item">
- <a class="nav-link"
- href="{{ url_for( 'who.url_who_imported') }}">WHO imported</a>
+ href="{{ url_for( 'owid.url_owid_imported') }}">OWID imported</a>
</li>
</ul>
</nav>
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data.html b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data.html
index 90049ac244f2bee17b01e80c0e4f15a1aa10aff9..35a6df67de7246b50c1ac9fb8151adf39152ed03 100644
--- a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data.html
+++ b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_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( 'owid.url_owid_date_reported_all') }}">
date reported
</a>
</th>
@@ -18,28 +18,13 @@
<th scope="col">
cases cumulative
</th>
- <th scope="col">
- <a href="{{ url_for( 'who.url_who_country_all') }}">
- country code
- </a>
- </th>
- <th scope="col">
- <a href="{{ url_for( 'who.url_who_country_all') }}">
- country
- </a>
- </th>
- <th scope="col">
- <a href="{{ url_for( 'who.url_who_region_all') }}">
- region
- </a>
- </th>
</tr>
</thead>
<tbody>
{% for who_global_data in page_data.items %}
<tr>
<th>
- <a href="/who/date_reported/{{ who_global_data.date_reported.id }}">
+ <a href="/owid/date_reported/{{ who_global_data.date_reported.id }}">
{{ who_global_data.date_reported }}
</a>
</th>
@@ -47,21 +32,6 @@
<td>{{ who_global_data.cases_new }}</td>
<td>{{ who_global_data.deaths_cumulative }}</td>
<td>{{ who_global_data.cases_cumulative }}</td>
- <td>
- <a href="/who/country/{{ who_global_data.country.id }}">
- {{ who_global_data.country.country_code }}
- </a>
- </td>
- <td>
- <a href="/who/country/{{ who_global_data.country.id }}">
- {{ who_global_data.country.country }}
- </a>
- </td>
- <th>
- <a href="/who/region/{{ who_global_data.country.region.id }}">
- {{ who_global_data.country.region.region }}
- </a>
- </th>
</tr>
{% endfor %}
</tbody>
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data_date_reported.html b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data_date_reported.html
index 2ae6a13ea410513317fe7ddfb5bfb327e48d633c..c598e14985b162292777825888186349565b2b6e 100644
--- a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data_date_reported.html
+++ b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data_date_reported.html
@@ -3,82 +3,52 @@
<tr>
<!-- TODO: change URL to for_url() -->
<th scope="col">
- <a href="/who/date_reported/all">
+ <a href="/owid/date_reported/all">
date reported
</a>
</th>
<th scope="col">
- <a href="/who/date_reported/{{ who_date_reported.id }}/deaths_new">
+ <a href="/owid/date_reported/{{ owid_date_reported.id }}/deaths_new">
deaths new
</a>
</th>
<th scope="col">
- <a href="/who/date_reported/{{ who_date_reported.id }}/cases_new">
+ <a href="/owid/date_reported/{{ owid_date_reported.id }}/cases_new">
cases new
</a>
</th>
<th scope="col">
- <a href="/who/date_reported/{{ who_date_reported.id }}/deaths_cumulative">
+ <a href="/owid/date_reported/{{ owid_date_reported.id }}/deaths_cumulative">
deaths cumulative
</a>
</th>
<th scope="col">
- <a href="/who/date_reported/{{ who_date_reported.id }}/cases_cumulative">
+ <a href="/owid/date_reported/{{ owid_date_reported.id }}/cases_cumulative">
cases cumulative
</a>
</th>
- <th scope="col">
- <a href="/who/country/all">
- country code
- </a>
- </th>
- <th scope="col">
- <a href="/who/country/all">
- country
- </a>
- </th>
- <th scope="col">
- <a href="/who/region/all">
- region
- </a>
- </th>
</tr>
</thead>
<tbody>
- {% for who_global_data in page_data.items %}
+ {% for owid_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="/owid/date_reported/{{ owid_data.date_reported.id }}">
+ {{ owid_data.date_reported }}
</a>
</th>
<td>
- {{ who_global_data.deaths_new }}
+ {{ owid_data.deaths_new }}
</td>
<td>
- {{ who_global_data.cases_new }}
+ {{ owid_data.cases_new }}
</td>
<td>
- {{ who_global_data.deaths_cumulative }}
+ {{ owid_data.deaths_cumulative }}
</td>
<td>
- {{ who_global_data.cases_cumulative }}
+ {{ owid_data.cases_cumulative }}
</td>
- <td>
- <a href="/who/country/{{ who_global_data.country.id }}">
- {{ who_global_data.country.country_code }}
- </a>
- </td>
- <td>
- <a href="/who/country/{{ who_global_data.country.id }}">
- {{ who_global_data.country.country }}
- </a>
- </td>
- <th>
- <a href="/who/region/{{ who_global_data.country.region.id }}">
- {{ who_global_data.country.region.region }}
- </a>
- </th>
</tr>
{% endfor %}
</tbody>
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_imported.html b/src/covid19/blueprints/owid/templates/owid/owid_imported.html
index 63b038b3a2f3c271406c45a4543cdc65a0efdba4..2eca96c8e9171f5afc0ff244c6953302577c4774 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_imported.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_imported.html
@@ -2,17 +2,17 @@
{% block content %}
{{super()}}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'owid/fragments/fragment_owid_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_pagination.html' %}
+ {% include 'owid/fragments/fragment_owid_imported_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_table.html' %}
+ {% include 'owid/fragments/fragment_owid_imported_table.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_info.html b/src/covid19/blueprints/owid/templates/owid/owid_info.html
index 20a5c92a4dddf932af5c9dcd30dd491aa80aec59..ccce5d9c1720a5369b5c3054dee473e7a476cf8d 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_info.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_info.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'owid/fragments/fragment_owid_navtabs.html' %}
<div class="container">
<div class="row">
@@ -10,13 +10,15 @@
<div class="card">
<div class="card-body">
<div class="card-title">
- Dashboard
+ Our World in Data
</div>
<div class="card-text">
- WHO Coronavirus Disease (COVID-19)
+ Coronavirus Pandemic (COVID-19)
</div>
<div class="card-text">
- <a class="btn btn-primary" href="https://covid19.who.int/">https://covid19.who.int</a>
+ <a class="btn btn-primary" href="https://ourworldindata.org/coronavirus">
+ https://ourworldindata.org/coronavirus
+ </a>
</div>
</div>
</div>
@@ -25,14 +27,14 @@
<div class="card">
<div class="card-body">
<div class="card-title">
- Pandemic
+ n.n
</div>
<div class="card-text">
- WHO Coronavirus Disease (COVID-19)
+ n.n
</div>
<div class="card-text">
- <a class="btn btn-primary" href="https://www.who.int/emergencies/diseases/novel-coronavirus-2019">
- novel-coronavirus-2019
+ <a class="btn btn-primary" href="https://ourworldindata.org/coronavirus">
+ n.n
</a>
</div>
</div>
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
index 29df8f89515f968bfe4417e96fed890d69d125b3..7e286b9ef3374e453bf713f479816768b3202a9f 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
+ {% include 'owid/fragments/fragment_owid_navtabs.html' %}
<div class="container">
<div class="row">