From 66601e8208f52da3e14dd928b1f4147432787390 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 17 Feb 2021 14:06:44 +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
---
.../admin/templates/admin/admin_info.html | 25 ++++-----
.../admin/templates/admin/admin_tasks.html | 51 +++++++++----------
.../admin/templates/admin/index.html | 44 ++++++++--------
3 files changed, 57 insertions(+), 63 deletions(-)
diff --git a/src/covid19/blueprints/admin/templates/admin/admin_info.html b/src/covid19/blueprints/admin/templates/admin/admin_info.html
index f17cb5f8..4c478fcd 100644
--- a/src/covid19/blueprints/admin/templates/admin/admin_info.html
+++ b/src/covid19/blueprints/admin/templates/admin/admin_info.html
@@ -1,19 +1,16 @@
{% extends 'application/page_layout.html' %}
-{% block navigation_breadcrumb %}
- <!-- TODO: implement navigation_breadcrumb in .html -->
-{% endblock %}
-
-{% block navigation_navtabs %}
- {% include 'admin/fragments/fragment_admin_navtabs.html' %}
-{% endblock %}
-
-{% block main_container %}
-
-{% endblock %}
-
-{% block footer_container %}
-
+{% block content %}
+ {{super()}}
+ {% include 'admin/fragments/fragment_admin_navtabs.html' %}
+
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ <h1>admin :: Info</h1>
+ </div>
+ </div>
+ </div>
{% endblock %}
diff --git a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
index f2092e1f..af6258ce 100644
--- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
+++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
@@ -1,32 +1,29 @@
{% extends 'application/page_layout.html' %}
-{% block navigation_breadcrumb %}
- <!-- TODO: implement navigation_breadcrumb in .html -->
-{% endblock %}
-
-{% block navigation_navtabs %}
- {% include 'admin/fragments/fragment_admin_navtabs.html' %}
-{% endblock %}
-
-{% block main_container %}
- <div class="row">
- <div class="col">
- <div class="btn-group-vertical" role="group" aria-label="Views">
- <a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_alive_message_start') }}"
- role="button">Admin :: alive message</a>
- <a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
- role="button">Admin :: database :: drop_create</a>
- <a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
- role="button">Admin :: database :: drop_create :: only</a>
- <a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_admin_database_import') }}"
- role="button">Admin :: database :: import</a>
- <a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
- role="button">Admin :: database :: dump</a>
+{% block content %}
+ {{super()}}
+ {% include 'admin/fragments/fragment_admin_navtabs.html' %}
+
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ <div class="btn-group-vertical" role="group" aria-label="Views">
+ <a class="btn btn-secondary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_alive_message_start') }}"
+ role="button">Admin :: alive message</a>
+ <a class="btn btn-primary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
+ role="button">Admin :: database :: drop_create</a>
+ <a class="btn btn-primary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
+ role="button">Admin :: database :: drop_create :: only</a>
+ <a class="btn btn-secondary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_admin_database_import') }}"
+ role="button">Admin :: database :: import</a>
+ <a class="btn btn-primary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
+ role="button">Admin :: database :: dump</a>
+ </div>
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/admin/templates/admin/index.html b/src/covid19/blueprints/admin/templates/admin/index.html
index 3ed5c8bc..6aa2a299 100644
--- a/src/covid19/blueprints/admin/templates/admin/index.html
+++ b/src/covid19/blueprints/admin/templates/admin/index.html
@@ -1,31 +1,31 @@
{% extends 'admin/master.html' %}
-{% block body %}
- <p>Hello world</p>
{% include 'admin/fragments/fragment_admin_navtabs.html' %}
- <div class="row">
- <div class="col">
- <h3>Admin :: Tasks</h3>
- <div class="btn-group-vertical" role="group" aria-label="Views">
- <a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_alive_message_start') }}"
- role="button">Admin :: alive message</a>
- <a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
- role="button">Admin :: database :: drop_create</a>
- <a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
- role="button">Admin :: database :: drop_create :: only</a>
- <a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_admin_database_import') }}"
- role="button">Admin :: database :: import</a>
- <a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
- role="button">Admin :: database :: dump</a>
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ <h3>Admin :: Tasks</h3>
+ <div class="btn-group-vertical" role="group" aria-label="Views">
+ <a class="btn btn-secondary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_alive_message_start') }}"
+ role="button">Admin :: alive message</a>
+ <a class="btn btn-primary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
+ role="button">Admin :: database :: drop_create</a>
+ <a class="btn btn-primary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
+ role="button">Admin :: database :: drop_create :: only</a>
+ <a class="btn btn-secondary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_admin_database_import') }}"
+ role="button">Admin :: database :: import</a>
+ <a class="btn btn-primary btn-lg btn-block text-left"
+ href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
+ role="button">Admin :: database :: dump</a>
+ </div>
</div>
</div>
</div>
-{% endblock %}
+
--
GitLab