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 cea019207ed9001ebf17265bae6c7d48d0ad7d07..e3f2673a85a5538b73dfa82470beb46af9078eda 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 43b16146cef6e851abd26a76685ac7dbb2ffec48..e519221a990de2db8d5ee2ca980d839ef6adce27 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 08d0bf1de3efd660a54c146426e1a87de3d2e978..30a919656655ff8c0cb5e3a779d4c2b40dbda01a 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>