diff --git a/src/covid19/blueprints/admin/templates/admin/navigation/admin_navbar_dropdown.html b/src/covid19/blueprints/admin/templates/admin/navigation/admin_navbar_dropdown.html index ba50068962a7ee0c60216ea0a1d213a4be9a8fa8..fd893d1afc7d01fb51647da64b9ee9e1ac633059 100644 --- a/src/covid19/blueprints/admin/templates/admin/navigation/admin_navbar_dropdown.html +++ b/src/covid19/blueprints/admin/templates/admin/navigation/admin_navbar_dropdown.html @@ -1,9 +1,9 @@ <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownAdmin" role="button" + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Admin </a> - <div class="dropdown-menu" aria-labelledby="navbarDropdownAdmin"> + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_tasks') }}"> Admin </a> diff --git a/src/covid19/blueprints/application/templates/application/page_layout.html b/src/covid19/blueprints/application/templates/application/page_layout.html index 79c786279765d0c5646b8feac2ea545ce5a7f941..61c45d80fb01d662a2569db288a8968235337af9 100644 --- a/src/covid19/blueprints/application/templates/application/page_layout.html +++ b/src/covid19/blueprints/application/templates/application/page_layout.html @@ -3,8 +3,7 @@ {% block title %}{{page_info.title}}{% endblock %} {% block styles %} {{super()}} -<link rel="stylesheet" - href="{{ url_for('static', filename='styles.css') }}"> +<link rel="stylesheet" href="{{ url_for('static', filename='styles.css') }}"> {% endblock %} {% block scripts %} <script src="{{ url_for('static', filename='index.js')}} "></script> diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html b/src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html index 304b399cffbe798290054e5972f04ed4b61dfb0d..6718469ec1edcf851a329ed44e6de5ad952b5afc 100644 --- a/src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html +++ b/src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html @@ -1,9 +1,9 @@ <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownEcdc" + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> ECDC </a> - <div class="dropdown-menu" aria-labelledby="navbarDropdownEcdc"> + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_date_reported_all') }}">ECDC</a> <div class="dropdown-divider"></div> diff --git a/src/covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html b/src/covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html index eef84a17bdefe9ab786c2c125d1fd83044c9d46b..3ac42e88bde8a6297161af99ff6638cd6e5e3bc8 100644 --- a/src/covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html +++ b/src/covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html @@ -1,9 +1,9 @@ <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownOwid" + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> OWID </a> - <div class="dropdown-menu" aria-labelledby="navbarDropdownOwid"> + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" href="{{ url_for( 'owid.url_owid_date_reported_all') }}"> OWID Date Reported diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/navigation/rki_bundeslaender_navbar_dropdown.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/navigation/rki_bundeslaender_navbar_dropdown.html index dc574594e9385faa136853efb48964d7713fecd8..d72dd4643344418e0bd398404dabb9a9b7415fd3 100644 --- a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/navigation/rki_bundeslaender_navbar_dropdown.html +++ b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/navigation/rki_bundeslaender_navbar_dropdown.html @@ -1,9 +1,9 @@ <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownRkiBundeslaender" role="button" + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> RKI Bundeslaender </a> - <div class="dropdown-menu" aria-labelledby="navbarDropdownRkiBundeslaender"> + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_info') }}"> RKI Bundeslaender Info diff --git a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/navigation/rki_landkreise_navbar_dropdown.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/navigation/rki_landkreise_navbar_dropdown.html index 8a41647018b504cad34188a29ece4af7998bbbef..ef56d593f61cbb3e765fd33df305784ec353b8cb 100644 --- a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/navigation/rki_landkreise_navbar_dropdown.html +++ b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/navigation/rki_landkreise_navbar_dropdown.html @@ -1,9 +1,9 @@ <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownRkiLandkreise" role="button" + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> RKI Landkreise </a> - <div class="dropdown-menu" aria-labelledby="navbarDropdownRkiLandkreise"> + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" href="{{ url_for( 'rki_landkreise.url_rki_landkreise_info') }}"> RKI Landkreise diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html index d86f2ea2caad1b7f33155b6394e26879d8d381f8..b85894a63fc9aa3c2d10e8ac2ddab14f8b0f4d57 100644 --- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html +++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html @@ -1,9 +1,9 @@ <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownRkiVaccination" role="button" + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> RKI Vaccination </a> - <div class="dropdown-menu" aria-labelledby="navbarDropdownRkiVaccination"> + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_info') }}"> RKI Vaccination diff --git a/src/covid19/blueprints/user/templates/user/navigation/user_navbar_dropdown.html b/src/covid19/blueprints/user/templates/user/navigation/user_navbar_dropdown.html index 11bca063a7dc3ffc461cfcf687ba6e35e4951057..253fc7829e174078cfb77fb7ef02e2d85843ca46 100644 --- a/src/covid19/blueprints/user/templates/user/navigation/user_navbar_dropdown.html +++ b/src/covid19/blueprints/user/templates/user/navigation/user_navbar_dropdown.html @@ -1,9 +1,9 @@ <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownUser" + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> User </a> - <div class="dropdown-menu" aria-labelledby="navbarDropdownUser"> + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" href="{{ url_for( 'user.url_user_info') }}"> User diff --git a/src/covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html b/src/covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html index a3426bfc386457c5c50470d43d958249093b421a..76ad54629a5a91bc632a8e118ea3dbb124bd850f 100644 --- a/src/covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html +++ b/src/covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html @@ -1,9 +1,9 @@ <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownWho" + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> WHO </a> - <div class="dropdown-menu" aria-labelledby="navbarDropdownWho"> + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" href="{{ url_for( 'who.url_who_date_reported_all') }}"> WHO diff --git a/src/covid19/package.json b/src/covid19/package.json index 6853d3ff78d0f596f1ec43740cc606e62ef30ee8..614939bf775062ed01ecd51ebe7cee19c08542c3 100644 --- a/src/covid19/package.json +++ b/src/covid19/package.json @@ -31,11 +31,11 @@ }, "private": true, "dependencies": { - "@fortawesome/fontawesome-free": "^5.15.2", - "bootstrap": "^4.6.0", - "bootswatch": "^4.6.0", - "jquery": "^3.5.1", - "popper.js": "^1.16.1" + "@fortawesome/fontawesome-free": "5.15.2", + "bootstrap": "4.6.0", + "bootswatch": "4.6.0", + "jquery": "3.5.1", + "popper.js": "1.16.1" }, "devDependencies": { "browser-sync": "^2.26.14",