diff --git a/src/covid19/blueprints/owid/owid_views.py b/src/covid19/blueprints/owid/owid_views.py index f35be8f3bab0a2f21653e1b72a07c662b341f999..8eceaf62aa676badf806578ee5bf1864bd904318 100644 --- a/src/covid19/blueprints/owid/owid_views.py +++ b/src/covid19/blueprints/owid/owid_views.py @@ -404,11 +404,11 @@ def url_owid_continent_one(continent_id: int, page: int = 1): @app_owid.route('/country/all') def url_owid_country_all(page: int = 1): page_info = ApplicationPage( - "Continents " + "Countries " 'OWID' ) try: - page_data = OwidContinent.get_all_as_page(page) + page_data = OwidCountry.get_all_as_page(page) except OperationalError: flash("No data in the database.") page_data = None @@ -423,9 +423,9 @@ def url_owid_country_all(page: int = 1): def url_owid_country_one(country_id: int, page: int = 1): owid_country_one = OwidCountry.get_by_id(country_id) page_info = ApplicationPage( - "continent: " + owid_country_one.location, + "country: " + owid_country_one.location, 'OWID', - "countries for OWID continent " + owid_country_one.region + " " + "data for OWID continent " + owid_country_one.region + " " ) try: page_data = OwidData.get_data_for_country(owid_country_one, page) diff --git a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html b/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html index 1497614be4db8d6ed7e28a174174e72ff13503bf..5f32b6b8d1630a4c47d58c5c2f03c046cdb0050d 100644 --- a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html +++ b/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html @@ -7,17 +7,17 @@ <div class="container"> <div class="row"> <div class="col"> - {% include 'owid/owid_imported/owid_imported_pagination.html' %} + {% include 'owid/imported/owid_imported_pagination.html' %} </div> </div> <div class="row"> <div class="col"> - {% include 'owid/owid_imported/owid_imported_table.html' %} + {% include 'owid/imported/owid_imported_table.html' %} </div> </div> <div class="row"> <div class="col"> - {% include 'owid/owid_imported/owid_imported_pagination.html' %} + {% include 'owid/imported/owid_imported_pagination.html' %} </div> </div> </div>