diff --git a/templates/admin/admin_tasks.html b/templates/admin/admin_tasks.html
index 3d5bfb46a0c552ee7c89f1a3e89b8fd1f9fa6081..6d3853e80d2bd0f7cc671d5e8474372a234abc97 100644
--- a/templates/admin/admin_tasks.html
+++ b/templates/admin/admin_tasks.html
@@ -13,8 +13,8 @@
<div class="btn-group" role="group" aria-label="Views">
<a class="btn btn-secondary btn-lg" href="/admin/alive_message" role="button">Admin :: alive message</a>
<a class="btn btn-primary btn-lg" href="/admin/database/drop" role="button">Admin :: database :: drop_create</a>
- <a class="btn btn-primary btn-lg" href="/admin/database/dump" role="button">Admin :: database :: dump</a>
- <a class="btn btn-secondary btn-lg" href="/admin/database/import" role="button">Admin :: database :: import</a>
+ <a class="btn btn-secondary btn-lg" href="/admin/database/dump" role="button">Admin :: database :: dump</a>
+ <a class="btn btn-primary btn-lg" href="/admin/database/import" role="button">Admin :: database :: import</a>
</div>
</div>
{% endblock %}
diff --git a/templates/fragment_navtabs.html b/templates/fragment_navtabs.html
index b67bdd9a2baa772c7139ed57e3ef028dec779964..4e5494d195b45b2394115ae64c42eae9f2db8f00 100644
--- a/templates/fragment_navtabs.html
+++ b/templates/fragment_navtabs.html
@@ -16,7 +16,7 @@
<a class="nav-link" href="/nrw/info">NRW</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/admin">Admin</a>
+ <a class="nav-link" href="/admin/tasks">Admin</a>
</li>
</ul>
</nav>
\ No newline at end of file
diff --git a/templates/fragment_navtabs_admin.html b/templates/fragment_navtabs_admin.html
index 06e7a6c0bd57effd652d03b880b40461fe5ca7b4..76f376963ded20eef5f1d20d828dd6f39dcd4b24 100644
--- a/templates/fragment_navtabs_admin.html
+++ b/templates/fragment_navtabs_admin.html
@@ -1,3 +1,4 @@
+ <div class="container">
<nav>
<ul class="nav nav-tabs">
<li class="nav-item">
@@ -7,4 +8,5 @@
<a class="nav-link" href="/admin/info">admin Info</a>
</li>
</ul>
- </nav>
\ No newline at end of file
+ </nav>
+ </div>
\ No newline at end of file
diff --git a/templates/fragment_navtabs_nrw.html b/templates/fragment_navtabs_nrw.html
index 73c624ec1638602d95ccf5834a301a3e8be7f184..25d12809146bc1bf46d2c2c932e9298238614273 100644
--- a/templates/fragment_navtabs_nrw.html
+++ b/templates/fragment_navtabs_nrw.html
@@ -1,14 +1,11 @@
<nav>
<ul class="nav nav-tabs">
<li class="nav-item">
- <a class="nav-link active" href="/home">Home</a>
+ <a class="nav-link" href="/nrw/tasks">NRW tasks</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/nrw/info">NRW Info</a>
</li>
- <li class="nav-item">
- <a class="nav-link" href="/nrw/tasks">NRW tasks</a>
- </li>
<li class="nav-item">
<a class="nav-link" href="/nrw/imported">NRW imported</a>
</li>
diff --git a/templates/fragment_navtabs_rki.html b/templates/fragment_navtabs_rki.html
index b9e5d7dcad6808480e1a40e23464b49b3123de3d..79d7a8497ff0c6a5f742c6d2ea7edc6e747a529e 100644
--- a/templates/fragment_navtabs_rki.html
+++ b/templates/fragment_navtabs_rki.html
@@ -1,14 +1,11 @@
<nav>
<ul class="nav nav-tabs">
<li class="nav-item">
- <a class="nav-link active" href="/home">Home</a>
+ <a class="nav-link" href="/rki/tasks">RKI tasks</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/rki/info">RKI Info</a>
</li>
- <li class="nav-item">
- <a class="nav-link" href="/rki/tasks">RKI tasks</a>
- </li>
<li class="nav-item">
<a class="nav-link" href="/rki/imported">RKI imported</a>
</li>
diff --git a/templates/fragment_navtabs_who.html b/templates/fragment_navtabs_who.html
index fea44484280173fdd2f13c67802844d08cc1972b..52713272491630e8ca427cbdd8d891120c850275 100644
--- a/templates/fragment_navtabs_who.html
+++ b/templates/fragment_navtabs_who.html
@@ -5,10 +5,10 @@
<a class="nav-link" href="/who/tasks">WHO tasks</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/who/region/all">WHO Regions</a>
+ <a class="nav-link" href="/who/info">WHO Info</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/who/info">WHO Info</a>
+ <a class="nav-link" href="/who/region/all">WHO Regions</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/who/germany">WHO Germany</a>
diff --git a/templates/layout.html b/templates/layout.html
index 975d4f0c957b3cc7c900baa0f4f98cb9c58ebbf1..078d0a36ad665ec6b905485627fed82abb5f49ef 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -29,7 +29,7 @@
font-size: 150%;
}
.jumbotron {
- padding: 1rem 1rem;
+ padding: 1rem 1rem 1rem 1rem;
margin-bottom: 1rem;
}
.my-page-item-ellipsis-page-link {
@@ -37,15 +37,21 @@
overflow: hidden;
text-overflow: ellipsis;
}
+ header div.container.tw_padding,
+ main div.container.tw_padding,
+ section div.container.tw_padding,
+ .btn-group {
+ padding: 1rem 1rem 1rem 1rem;
+ }
</style>
</head>
<body>
<header>
- <div class="container">
+ <div class="container tw_padding">
{% include 'fragment_navbar.html' %}
</div>
- <div class="container">
+ <div class="container tw_padding">
{% block navigation_jumbotron %}
<div class="jumbotron">
<h1 class="display-4">{{ page_info.title }}</h1>
@@ -55,7 +61,7 @@
</div>
{% endblock %}
</div>
- <div class="container">
+ <div class="container tw_padding">
{% include 'fragment_navtabs.html' %}
</div>
<div class="container">
@@ -67,10 +73,9 @@
</header>
<main>
- <div class="container">
+ <div class="container tw_padding">
{% include 'fragment_flashed_messages.html' %}
- </div>
- <div class="container">
+ <p></p>
{% block main_container %}{% endblock %}
</div>
</main>
diff --git a/templates/page_home.html b/templates/page_home.html
index c545295a41d37538b5b8ee6a2b231a67dc6af2fb..1311c5825797c60080fb47a2f2e2ede3b0e72495 100644
--- a/templates/page_home.html
+++ b/templates/page_home.html
@@ -24,8 +24,8 @@
<div class="btn-group" role="group" aria-label="Views">
<a class="btn btn-secondary btn-lg" href="/admin/alive_message" role="button">Admin :: alive message</a>
<a class="btn btn-primary btn-lg" href="/admin/database/drop" role="button">Admin :: database :: drop_create</a>
- <a class="btn btn-primary btn-lg" href="/admin/database/dump" role="button">Admin :: database :: dump</a>
- <a class="btn btn-secondary btn-lg" href="/admin/database/import" role="button">Admin :: database :: import</a>
+ <a class="btn btn-secondary btn-lg" href="/admin/database/dump" role="button">Admin :: database :: dump</a>
+ <a class="btn btn-primary btn-lg" href="/admin/database/import" role="button">Admin :: database :: import</a>
</div>
</div>
{% endblock %}