From eb74989ef11142a5e64da8e99581b862c809d0e7 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 13 Apr 2021 20:07:07 +0200
Subject: [PATCH] working on 0.0.29 Release: Fixed #201 UML: blueprint user
---
.../admin/navigation/admin_navbar_dropdown.html | 4 ++--
.../application/templates/application/page_layout.html | 3 +--
.../ecdc/navigation/ecdc_navbar_dropdown.html | 4 ++--
.../owid/navigation/owid_navbar_dropdown.html | 4 ++--
.../navigation/rki_bundeslaender_navbar_dropdown.html | 4 ++--
.../navigation/rki_landkreise_navbar_dropdown.html | 4 ++--
.../navigation/rki_vaccination_navbar_dropdown.html | 4 ++--
.../user/navigation/user_navbar_dropdown.html | 4 ++--
.../templates/who/navigation/who_navbar_dropdown.html | 4 ++--
src/covid19/package.json | 10 +++++-----
10 files changed, 22 insertions(+), 23 deletions(-)
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 ba500689..fd893d1a 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 79c78627..61c45d80 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 304b399c..6718469e 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 eef84a17..3ac42e88 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 dc574594..d72dd464 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 8a416470..ef56d593 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 d86f2ea2..b85894a6 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 11bca063..253fc782 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 a3426bfc..76ad5462 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 6853d3ff..614939bf 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",
--
GitLab