From 8e345018418daa156adb042f3471ec31cbb703e0 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 17 Feb 2021 12:38:55 +0100
Subject: [PATCH] ### 0.0.17 Release * Fixed #123 split RkiBundeslaenderService
into two Services, one for bundeslaender and one for landkreise * Fixed #128
add fields from csv to RkiLandkreiseImport * Fixed #139 refactor
RkiBundeslaenderServiceDownload to new method scheme introduced 07.02.2021 *
Fixed #140 move WhoImport to RKI in: rk_service_import.py * Fixed #125
implement RkiLandkreise * Fixed #126 implement RkiBundeslaenderImport
### 0.0.18 Release
* Fixed #39 SQLalchemy instead of SQL: AllModelClasses.remove_all()
* Fixed #40 SQLalchemy instead of SQL: EcdcImport.get_date_rep()
* Fixed #41 SQLalchemy instead of SQL: EcdcImport.get_countries_of_continent()
* Fixed #107 SQLalchemy instead of SQL in: EcdcImport.get_countries_of_continent
* Fixed #109 SQLalchemy instead of SQL in: EcdcImport.get_date_rep
* Fixed #110 SQLalchemy instead of SQL in: EcdcImport.get_continent
---
.../templates/application/page_layout.html | 35 ++++++++++++-------
.../ecdc/fragments/fragment_ecdc_navtabs.html | 6 +++-
.../fragment_rki_bundeslaender_navtabs.html | 6 +++-
.../fragment_rki_landkreise_navtabs.html | 6 +++-
.../fragment_rki_vaccination_navtabs.html | 6 +++-
.../who/fragments/fragment_who_navtabs.html | 9 +++--
.../who/templates/who/who_info.html | 30 ++++++++--------
7 files changed, 65 insertions(+), 33 deletions(-)
diff --git a/src/covid19/blueprints/application/templates/application/page_layout.html b/src/covid19/blueprints/application/templates/application/page_layout.html
index 8b4eab02..366d792a 100644
--- a/src/covid19/blueprints/application/templates/application/page_layout.html
+++ b/src/covid19/blueprints/application/templates/application/page_layout.html
@@ -1,25 +1,34 @@
{% extends "bootstrap/base.html" %}
-{% block title %}{{page_info.title}}{% endblock %}
-
-{% block navbar %}
-{% include 'application/fragments/fragment_navbar.html' %}
-{% endblock %}
-
-{% block content %}
- {{super()}}
- {% include 'application/fragments/fragment_flashed_messages.html' %}
- {% include 'application/fragments/fragment_navtabs.html' %}
-{% endblock %}
+{% block title %}{{page_info.title}}{% endblock %}
{% block styles %}
{{super()}}
<link rel="stylesheet"
href="{{ url_for('static', filename='styles.css') }}">
{% endblock %}
-
{% block scripts %}
<script src="{{ url_for('static', filename='index.js')}} "></script>
{{super()}}
{% endblock %}
+{% block html_attribs %} lang="en"{% endblock %}
+
+
+{% block navbar %}
+{% include 'application/fragments/fragment_navbar.html' %}
+{% endblock %}
+
+{% block content %}
+ {{super()}}
+ <div class="container main-content app-main">
+ <div class="row-cols-1">
+ <h1 class="display-3">{{page_info.title}} | <small class="display-4">{{page_info.subtitle}}</small></h1>
+ </div>
+ <div class="row-cols-1">
+ {% include 'application/fragments/fragment_flashed_messages.html' %}
+ </div>
+ <div class="row-cols-1">
+ {% include 'application/fragments/fragment_navtabs.html' %}
+ </div>
+ </div>
+{% endblock %}
-{% block html_attribs %} lang="en"{% endblock %}
\ No newline at end of file
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html
index 99eec6b4..388e9ca7 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html
@@ -1,3 +1,5 @@
+ <div class="container">
+ <div class="row-cols-1">
<nav>
<ul class="nav nav-tabs">
<li class="nav-item">
@@ -31,4 +33,6 @@
href="{{ url_for( 'ecdc.url_ecdc_data_imported') }}">ECDC imported</a>
</li>
</ul>
- </nav>
\ No newline at end of file
+ </nav>
+ </div>
+ </div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html
index 9e2c9298..b726e04c 100644
--- a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html
+++ b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html
@@ -1,3 +1,5 @@
+ <div class="container">
+ <div class="row-cols-1">
<nav>
<ul class="nav nav-tabs">
<li class="nav-item">
@@ -18,4 +20,6 @@
</a>
</li>
</ul>
- </nav>
\ No newline at end of file
+ </nav>
+ </div>
+ </div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html
index 69dead94..bb9e5bad 100644
--- a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html
+++ b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html
@@ -1,3 +1,5 @@
+ <div class="container">
+ <div class="row-cols-1">
<nav>
<ul class="nav nav-tabs">
<li class="nav-item">
@@ -19,4 +21,6 @@
</a>
</li>
</ul>
- </nav>
\ No newline at end of file
+ </nav>
+ </div>
+ </div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html
index 27670111..5ee4ad1a 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html
@@ -1,3 +1,5 @@
+ <div class="container">
+ <div class="row-cols-1">
<nav>
<ul class="nav nav-tabs">
<li class="nav-item">
@@ -25,4 +27,6 @@
</a>
</li>
</ul>
- </nav>
\ No newline at end of file
+ </nav>
+ </div>
+ </div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html
index 67de355e..af699352 100644
--- a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html
+++ b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html
@@ -1,4 +1,7 @@
- <br/>
+
+
+ <div class="container">
+ <div class="row-cols-1">
<nav>
<ul class="nav nav-tabs">
<li class="nav-item">
@@ -30,4 +33,6 @@
href="{{ url_for( 'who.url_who_imported') }}">WHO imported</a>
</li>
</ul>
- </nav>
\ No newline at end of file
+ </nav>
+ </div>
+ </div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/who/templates/who/who_info.html b/src/covid19/blueprints/who/templates/who/who_info.html
index e22598bf..fd93989d 100644
--- a/src/covid19/blueprints/who/templates/who/who_info.html
+++ b/src/covid19/blueprints/who/templates/who/who_info.html
@@ -4,20 +4,22 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- <div>
- <h3>WHO Coronavirus Disease (COVID-19) Dashboard</h3>
- <p>
- <a href="https://covid19.who.int/">https://covid19.who.int</a>
- </p>
- </div>
- <div>
- <h3>WHO Coronavirus disease (COVID-19) pandemic</h3>
- <p>
- <a href="https://www.who.int/emergencies/diseases/novel-coronavirus-2019">
- https://www.who.int/emergencies/diseases/novel-coronavirus-2019
- </a>
- </p>
- </div>
+ <div class="container">
+ <div class="row-cols-1">
+ <h3>WHO Coronavirus Disease (COVID-19) Dashboard</h3>
+ <p>
+ <a href="https://covid19.who.int/">https://covid19.who.int</a>
+ </p>
+ </div>
+ <div class="row-cols-1">
+ <h3>WHO Coronavirus disease (COVID-19) pandemic</h3>
+ <p>
+ <a href="https://www.who.int/emergencies/diseases/novel-coronavirus-2019">
+ https://www.who.int/emergencies/diseases/novel-coronavirus-2019
+ </a>
+ </p>
+ </div>
+ </div>
{% endblock %}
--
GitLab