From 42c7800fecfd6b3964f0db14d3330b783f0bcc84 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 17 Feb 2021 12:00:04 +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 | 5 +++--
.../blueprints/who/templates/who/who_info.html | 17 ++---------------
.../blueprints/who/templates/who/who_tasks.html | 12 +++---------
3 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/src/covid19/blueprints/application/templates/application/page_layout.html b/src/covid19/blueprints/application/templates/application/page_layout.html
index 007d0e59..1be8e3ab 100644
--- a/src/covid19/blueprints/application/templates/application/page_layout.html
+++ b/src/covid19/blueprints/application/templates/application/page_layout.html
@@ -8,16 +8,17 @@
{% block content %}
{{super()}}
{% include 'application/fragments/fragment_flashed_messages.html' %}
+ {% include 'application/fragments/fragment_navtabs.html' %}
{% endblock %}
{% block styles %}
{{super()}}
<link rel="stylesheet"
- href="{{url_for('.static', filename='styles.css')}}">
+ href="{{url_for('.static', filename='/styles.css')}}">
{% endblock %}
{% block scripts %}
-<script src="{{url_for('.static', filename='index.js')}}"></script>
+<script src="{{url_for('.static', filename='/index.js')}}"></script>
{{super()}}
{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/who_info.html b/src/covid19/blueprints/who/templates/who/who_info.html
index babbccdb..40e04a62 100644
--- a/src/covid19/blueprints/who/templates/who/who_info.html
+++ b/src/covid19/blueprints/who/templates/who/who_info.html
@@ -1,17 +1,8 @@
{% extends 'application/page_layout.html' %}
-{% block navigation_breadcrumb %}
- <!-- TODO: implement navigation_breadcrumb in .html -->
-
-{% endblock %}
-
-
-{% block navigation_navtabs %}
+{% block content %}
+ {{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
-{% endblock %}
-
-
-{% block main_container %}
<div>
<h3>WHO Coronavirus Disease (COVID-19) Dashboard</h3>
<p>
@@ -29,9 +20,5 @@
{% endblock %}
-{% block footer_container %}
-
-{% endblock %}
-
diff --git a/src/covid19/blueprints/who/templates/who/who_tasks.html b/src/covid19/blueprints/who/templates/who/who_tasks.html
index 073506a0..b81c5e7f 100644
--- a/src/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/src/covid19/blueprints/who/templates/who/who_tasks.html
@@ -1,14 +1,8 @@
{% extends 'application/page_layout.html' %}
-{% block navigation_breadcrumb %}
- <!-- TODO: implement navigation_breadcrumb in .html -->
-{% endblock %}
-
-{% block navigation_navtabs %}
- {% include 'who/fragments/fragment_who_navtabs.html' %}
-{% endblock %}
-
-{% block main_container %}
+{% block content %}
+ {{super()}}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
<div class="row">
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
--
GitLab