From 3e3ef90d691cdc72e8144e0c659159f7365de893 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 13 Feb 2021 20:41:08 +0100
Subject: [PATCH] * 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
---
.../fragment_admin_navbar_dropdown.html | 32 ++++++++++++++-----
.../fragments/fragment_admin_navtabs.html | 7 ++--
.../fragments/fragment_navtabs.html | 14 ++++----
3 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html
index cea01920..e3f2673a 100644
--- a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html
+++ b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html
@@ -4,16 +4,32 @@
Admin
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <!-- TODO: change URL to for_url() -->
- <a class="dropdown-item" href="/admin/tasks">Admin</a>
+ <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_tasks') }}">
+ Admin
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/admin/tasks">admin tasks</a>
- <a class="dropdown-item" href="/admin/info">admin info</a>
+ <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_tasks') }}">
+ admin tasks
+ </a>
+ <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_info') }}">
+ admin info
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/admin/alive_message">Task: Admin :: alive message</a>
- <a class="dropdown-item" href="/admin/database/drop">Task: Admin :: database :: drop_create</a>
- <a class="dropdown-item" href="/admin/database/dump">Task: Admin :: database :: dump</a>
+ <a class="dropdown-item" href="{{ url_for( 'admin.url_alive_message_start') }}">
+ Task: Admin :: alive message
+ </a>
+ <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_drop') }}">
+ Task: Admin :: database :: drop_create and import
+ </a>
+ <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_dropcreate_only') }}">
+ Task: Admin :: database :: drop_create only
+ </a>
+ <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_dump') }}">
+ Task: Admin :: database :: dump
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/admin/database/import">Task: Admin :: database :: import (TBD)</a>
+ <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_import') }}">
+ Task: Admin :: database :: import (TBD)
+ </a>
</div>
</li>
\ No newline at end of file
diff --git a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html
index 43b16146..e519221a 100644
--- a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html
+++ b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html
@@ -1,12 +1,13 @@
<nav>
- <!-- TODO: change URL to for_url() -->
<ul class="nav nav-tabs">
<li class="nav-item">
- <a class="nav-link" href="/admin/info">admin Info</a>
+ <a class="nav-link"
+ href="{{ url_for( 'admin.url_admin_info') }}">admin Info</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/admin/tasks">admin tasks</a>
+ <a class="nav-link"
+ href="{{ url_for( 'admin.url_admin_tasks') }}">admin tasks</a>
</li>
</ul>
</nav>
\ No newline at end of file
diff --git a/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html b/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html
index 08d0bf1d..30a91965 100644
--- a/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html
+++ b/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html
@@ -2,43 +2,43 @@
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link active"
- href="/home">
+ href="{{ url_for( 'url_home') }}">
Home
</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/who/tasks">
+ href="{{ url_for( 'who.url_who_tasks') }}">
WHO
</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/ecdc/tasks">
+ href="{{ url_for( 'ecdc.url_ecdc_tasks') }}">
ECDC
</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/rki/vaccination/tasks">
+ href="{{ url_for( 'rki_vaccination.url_vaccination_tasks') }}">
RKI Vaccination
</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/rki/bundeslaender/tasks">
+ href="{{ url_for('rki_bundeslaender.url_rki_tasks') }}">
RKI Bundeslaender
</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/rki/landkreise/tasks">
+ href="{{ url_for( 'rki_landkreise.url_rki_landkreise_tasks') }}">
RKI Landkreise
</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/admin/tasks">
+ href="{{ url_for( 'admin.url_admin_tasks') }}">
Admin
</a>
</li>
--
GitLab