diff --git a/requirements/dev.in b/requirements/dev.in
index 7cf2246f45af4263eced0c12cb5cae320f24ca83..99f1abe051cce7575ce1cdb0fd6e01dd3564f0d4 100644
--- a/requirements/dev.in
+++ b/requirements/dev.in
@@ -3,7 +3,7 @@
Flask>=1.1.2
Flask-SQLAlchemy>=2.5.1
Flask-Cors>=3.0.10
-Flask-BS4>=5.0.0.1
+Flask-BS4==4.5.3.0
Flask-Admin>=1.5.7
SQLAlchemy>=1.4.5
celery[redis]>=5.0.5
diff --git a/setup.py b/setup.py
index 69fcc35f68479ae6af95fe8d29762fe696b75940..4ed1aa6040bf06da304f5fa38e5d77799997392b 100644
--- a/setup.py
+++ b/setup.py
@@ -137,7 +137,7 @@ requires_test = [
]
requires_docs = [
- "alabaster==0.7.12",
+ "alabaster==0.7.12",
"babel==2.9.0",
"certifi==2020.12.5",
"cffi==1.14.5",
@@ -225,7 +225,7 @@ requires_dev = [
"filelock==3.0.12",
"flask-admin==1.5.7",
"flask-babel==2.0.0",
- "flask-bs4==5.0.0.1",
+ "flask-bs4==4.5.3.0",
"flask-cors==3.0.10",
"flask-db==0.3.1",
"flask-fixtures==0.3.8",
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 fd893d1afc7d01fb51647da64b9ee9e1ac633059..15be18b62921bf6e768ad2d6d5518a148c02345c 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,38 +1,61 @@
- <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">
- Admin
+ <li class="dropdown">
+ <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
+ Admin<i class="glyphicon glyphicon-chevron-down small"></i>
</a>
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_tasks') }}">
- Admin
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_tasks') }}">
- admin tasks
- </a>
- <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_info') }}">
- admin info
- </a>
- <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_index') }}">
- flask admin
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item" href="{{ url_for( 'app_admin.url_alive_message_start') }}">
- Task: Admin :: alive message
- </a>
- <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_drop') }}">
- Task: Admin :: database :: drop_create and import
- </a>
- <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}">
- Task: Admin :: database :: drop_create only
- </a>
- <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dump') }}">
- Task: Admin :: database :: dump
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dump_reimport') }}">
- Task: Admin :: database :: dump :: reimport
- </a>
- </div>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_tasks') }}">
+ Admin
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_tasks') }}">
+ admin tasks
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_info') }}">
+ admin info
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_index') }}">
+ flask admin
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_alive_message_start') }}">
+ Task: Admin :: alive message
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_drop') }}">
+ Task: Admin :: database :: drop_create and import
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}">
+ Task: Admin :: database :: drop_create only
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dump') }}">
+ Task: Admin :: database :: dump
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dump_reimport') }}">
+ Task: Admin :: database :: dump :: reimport
+ </a>
+ </li>
+ </ul>
</li>
\ No newline at end of file
diff --git a/src/covid19/blueprints/application/templates/application/navigation/navbar.html b/src/covid19/blueprints/application/templates/application/navigation/navbar.html
index c5f152afeef370a3383f45e7dfe5d47b5607d7e8..d8332fac08cfbe30c64c606e4a27ca61c55f0f30 100644
--- a/src/covid19/blueprints/application/templates/application/navigation/navbar.html
+++ b/src/covid19/blueprints/application/templates/application/navigation/navbar.html
@@ -1,13 +1,13 @@
-
- <nav class="navbar navbar navbar-dark bg-dark navbar-expand-lg container-fluid">
- <span class="container">
- <a class="navbar-brand" href="{{ url_for( 'url_home') }}">Covid19 Data</a>
- <button class="navbar-toggler" type="button"
- data-toggle="collapse" data-target="#navbarSupportedContent"
- aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+ <div class="container">
+ <nav class="navbar navbar-expand-lg navbar-dark bg-dark mb-2" role="navigation">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#admin-navbar-collapse"
+ aria-controls="admin-navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
- <div class="collapse navbar-collapse" id="navbarSupportedContent">
+ <!-- navbar content -->
+ <div class="collapse navbar-collapse" id="admin-navbar-collapse">
+ <a class="navbar-brand" href="{{ url_for( 'url_home') }}">Covid19 | Data</a>
<ul class="navbar-nav mr-auto">
<li class="nav-item">
@@ -32,5 +32,5 @@
</ul>
</div>
- </span>
- </nav>
\ No newline at end of file
+ </nav>
+ </div>
\ No newline at end of file
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 6718469ec1edcf851a329ed44e6de5ad952b5afc..df37584a01592b9b5baa489db0c4c2bbf84e5c18 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,36 +1,65 @@
- <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">
- ECDC
+ <li class="dropdown">
+ <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
+ ECDC<i class="glyphicon glyphicon-chevron-down small"></i>
</a>
- <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>
- <a class="dropdown-item"
- href="{{ url_for( 'ecdc.url_ecdc_country_germany') }}">ECDC Germany</a>
- <a class="dropdown-item"
- href="{{ url_for( 'ecdc.url_ecdc_date_reported_all') }}">ECDC date_reported</a>
- <a class="dropdown-item"
- href="{{ url_for( 'ecdc.url_ecdc_continent_all') }}">ECDC continent</a>
- <a class="dropdown-item"
- href="{{ url_for( 'ecdc.url_ecdc_country_all') }}">ECDC country</a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'ecdc.url_ecdc_data_imported') }}">ECDC imported</a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'ecdc.url_ecdc_task_update_star_schema_initial') }}">
- Task: ECDC :: update :: initial
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'ecdc.url_ecdc_task_update_starschema_incremental') }}">
- Task: ECDC :: update :: incremental
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'ecdc.url_ecdc_info') }}">ECDC Info</a>
- <a class="dropdown-item"
- href="{{ url_for( 'ecdc.url_ecdc_tasks') }}">ECDC Tasks</a>
- </div>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_date_reported_all') }}">
+ ECDC
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_country_germany') }}">
+ ECDC Germany
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_date_reported_all') }}">
+ ECDC date_reported
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_continent_all') }}">
+ ECDC continent
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_country_all') }}">
+ ECDC country
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_data_imported') }}">
+ ECDC imported
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_task_update_star_schema_initial') }}">
+ Task: ECDC :: update :: initial
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_task_update_starschema_incremental') }}">
+ Task: ECDC :: update :: incremental
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_info') }}">ECDC Info</a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'ecdc.url_ecdc_tasks') }}">ECDC Tasks</a>
+ </li>
+ </ul>
</li>
\ No newline at end of file
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 3ac42e88bde8a6297161af99ff6638cd6e5e3bc8..ab804bf74112bb9aec05eb0ce6734d6f90645ba9 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,26 +1,33 @@
- <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">
- OWID
+ <li class="dropdown">
+ <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
+ OWID<i class="glyphicon glyphicon-chevron-down small"></i>
</a>
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <a class="dropdown-item"
- 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( 'owid.url_owid_imported') }}">
- OWID imported
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'owid.url_owid_info') }}">
- OWID Info
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'owid.url_owid_tasks') }}">
- OWID Tasks
- </a>
- </div>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'owid.url_owid_date_reported_all') }}">
+ OWID Date Reported
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'owid.url_owid_imported') }}">
+ OWID imported
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'owid.url_owid_info') }}">
+ OWID Info
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'owid.url_owid_tasks') }}">
+ OWID Tasks
+ </a>
+ </li>
+ </ul>
</li>
\ No newline at end of file
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 d72dd4643344418e0bd398404dabb9a9b7415fd3..ea81327f4c942724cfd532e823aea7f12047a411 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,22 +1,28 @@
- <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">
- RKI Bundeslaender
+ <li class="dropdown">
+ <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
+ RKI Bundeslaender<i class="glyphicon glyphicon-chevron-down small"></i>
</a>
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <a class="dropdown-item"
- href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_info') }}">
- RKI Bundeslaender Info
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_imported') }}">
- RKI Bundeslaender imported
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_tasks') }}">
- RKI Bundeslaender Tasks
- </a>
- </div>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="dropdown-item" href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_info') }}">
+ RKI Bundeslaender Info
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_imported') }}">
+ RKI Bundeslaender imported
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_tasks') }}">
+ RKI Bundeslaender Tasks
+ </a>
+ </li>
+ </ul>
</li>
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 ef56d593f61cbb3e765fd33df305784ec353b8cb..6d8725e9efd68de24b02c9e7eca99ad3d33762a1 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,22 +1,31 @@
- <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">
- RKI Landkreise
+ <li class="dropdown">
+ <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
+ RKI Landkreise<i class="glyphicon glyphicon-chevron-down small"></i>
</a>
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <a class="dropdown-item"
- href="{{ url_for( 'rki_landkreise.url_rki_landkreise_info') }}">
- RKI Landkreise
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_landkreise.url_rki_landkreise_imported') }}">
- RKI Landkreise imported
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_landkreise.url_rki_landkreise_tasks') }}">
- RKI Landkreise Tasks
- </a>
- </div>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_landkreise.url_rki_landkreise_info') }}">
+ RKI Landkreise
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_landkreise.url_rki_landkreise_imported') }}">
+ RKI Landkreise imported
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_landkreise.url_rki_landkreise_tasks') }}">
+ RKI Landkreise Tasks
+ </a>
+ </li>
+ </ul>
</li>
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 b85894a63fc9aa3c2d10e8ac2ddab14f8b0f4d57..dd38e5fce33bad9b6c520ff0d893ca87e94dcaf7 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,62 +1,79 @@
- <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">
- RKI Vaccination
+ <li class="dropdown">
+ <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
+ RKI Vaccination<i class="glyphicon glyphicon-chevron-down small"></i>
</a>
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_info') }}">
- RKI Vaccination
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_tasks') }}">
- RKI Vaccination tasks
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_info') }}">
- RKI Vaccination Info
- </a>
- <div class="dropdown-divider"></div>
-
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_task_download_only') }}">
- RKI Vaccination :: TASK:: url_vaccination_task_download_only
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_task_import_only') }}">
- RKI Vaccination :: TASK:: url_vaccination_task_download_only
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_dimensiontables_only') }}">
- RKI Vaccination :: TASK:: url_vaccination_task_update_dimensiontables_only
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_facttable_incremental_only') }}">
- RKI Vaccination :: TASK:: url_vaccination_task_update_facttable_incremental_only
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_facttable_initial_only') }}">
- RKI Vaccination :: TASK:: url_vaccination_task_update_facttable_initial_only
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_starschema_initial') }}">
- RKI Vaccination :: TASK:: url_vaccination_task_update_starschema_initial
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_starschema_incremental') }}">
- RKI Vaccination :: TASK:: url_vaccination_task_update_starschema_incremental
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_data') }}">
- RKI Vaccination :: Data (Timeline Germany)
- </a>
- <!-- Tasks -->
- <a class="dropdown-item"
- href="{{ url_for( 'rki_vaccination.url_vaccination_imported') }}">
- RKI Vaccination :: imported (Timeline Germany)
- </a>
- </div>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_info') }}">
+ RKI Vaccination
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_tasks') }}">
+ RKI Vaccination tasks
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_info') }}">
+ RKI Vaccination Info
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_task_download_only') }}">
+ RKI Vaccination :: TASK:: url_vaccination_task_download_only
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_task_import_only') }}">
+ RKI Vaccination :: TASK:: url_vaccination_task_download_only
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_dimensiontables_only') }}">
+ RKI Vaccination :: TASK:: url_vaccination_task_update_dimensiontables_only
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_facttable_incremental_only') }}">
+ RKI Vaccination :: TASK:: url_vaccination_task_update_facttable_incremental_only
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_facttable_initial_only') }}">
+ RKI Vaccination :: TASK:: url_vaccination_task_update_facttable_initial_only
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_starschema_initial') }}">
+ RKI Vaccination :: TASK:: url_vaccination_task_update_starschema_initial
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_starschema_incremental') }}">
+ RKI Vaccination :: TASK:: url_vaccination_task_update_starschema_incremental
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_data') }}">
+ RKI Vaccination :: Data (Timeline Germany)
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'rki_vaccination.url_vaccination_imported') }}">
+ RKI Vaccination :: imported (Timeline Germany)
+ </a>
+ </li>
+ </ul>
</li>
\ No newline at end of file
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 253fc7829e174078cfb77fb7ef02e2d85843ca46..76acada2c960ae41f3b7345470ecca2645ddfe7a 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,21 +1,28 @@
- <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">
- User
+ <li class="dropdown">
+ <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
+ User<i class="glyphicon glyphicon-chevron-down small"></i>
</a>
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <a class="dropdown-item"
- href="{{ url_for( 'user.url_user_info') }}">
- User
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'user.url_user_info') }}">
- User Info
- </a>
- <a class="dropdown-item"
- href="{{ url_for( 'user.url_user_tasks') }}">
- User Tasks
- </a>
- </div>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="dropdown-item"
+ href="{{ url_for( 'user.url_user_info') }}">
+ User
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item"
+ href="{{ url_for( 'user.url_user_info') }}">
+ User Info
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item"
+ href="{{ url_for( 'user.url_user_tasks') }}">
+ User Tasks
+ </a>
+ </li>
+ </ul>
</li>
\ No newline at end of file
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 76ad54629a5a91bc632a8e118ea3dbb124bd850f..9d653f964a418c9ab41f79edb6b2d41ae813ce45 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,44 +1,59 @@
- <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
+ <li class="dropdown">
+ <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
+ WHO<i class="glyphicon glyphicon-chevron-down small"></i>
</a>
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <a class="dropdown-item"
- href="{{ url_for( 'who.url_who_date_reported_all') }}">
- WHO
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'who.url_who_germany') }}">
- WHO Germany
- </a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="{{ url_for( 'who.url_who_region_all') }}">
- WHO Regions
- </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
- </a>
- </div>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ WHO
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'who.url_who_germany') }}">
+ WHO Germany
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'who.url_who_region_all') }}">
+ WHO Regions
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ WHO Date Reported
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'who.url_who_country_all') }}">
+ WHO Countries
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'who.url_who_imported') }}">
+ WHO imported
+ </a>
+ </li>
+ <li>
+ <div class="dropdown-divider"></div>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'who.url_who_info') }}">
+ WHO Info
+ </a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ url_for( 'who.url_who_tasks') }}">
+ WHO Tasks
+ </a>
+ </li>
+ </ul>
</li>
\ No newline at end of file