diff --git a/src/covid19/blueprints/application/templates/application/page_layout.html b/src/covid19/blueprints/application/templates/application/page_layout.html index 8b4eab02194a706440ed3f9e20de82ad1d18467f..366d792a9e9957f66efff8542a913ba84bd044bc 100644 --- a/src/covid19/blueprints/application/templates/application/page_layout.html +++ b/src/covid19/blueprints/application/templates/application/page_layout.html @@ -1,25 +1,34 @@ {% extends "bootstrap/base.html" %} -{% block title %}{{page_info.title}}{% endblock %} - -{% block navbar %} -{% include 'application/fragments/fragment_navbar.html' %} -{% endblock %} - -{% block content %} - {{super()}} - {% include 'application/fragments/fragment_flashed_messages.html' %} - {% include 'application/fragments/fragment_navtabs.html' %} -{% endblock %} +{% block title %}{{page_info.title}}{% endblock %} {% block styles %} {{super()}} <link rel="stylesheet" href="{{ url_for('static', filename='styles.css') }}"> {% endblock %} - {% block scripts %} <script src="{{ url_for('static', filename='index.js')}} "></script> {{super()}} {% endblock %} +{% block html_attribs %} lang="en"{% endblock %} + + +{% block navbar %} +{% include 'application/fragments/fragment_navbar.html' %} +{% endblock %} + +{% block content %} + {{super()}} + <div class="container main-content app-main"> + <div class="row-cols-1"> + <h1 class="display-3">{{page_info.title}} | <small class="display-4">{{page_info.subtitle}}</small></h1> + </div> + <div class="row-cols-1"> + {% include 'application/fragments/fragment_flashed_messages.html' %} + </div> + <div class="row-cols-1"> + {% include 'application/fragments/fragment_navtabs.html' %} + </div> + </div> +{% endblock %} -{% block html_attribs %} lang="en"{% endblock %} \ No newline at end of file diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html index 99eec6b45d49cfbd6f5e3750fc54466502e109d3..388e9ca7eaa7a0d4fe04def21301047c2c259043 100644 --- a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html +++ b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html @@ -1,3 +1,5 @@ + <div class="container"> + <div class="row-cols-1"> <nav> <ul class="nav nav-tabs"> <li class="nav-item"> @@ -31,4 +33,6 @@ href="{{ url_for( 'ecdc.url_ecdc_data_imported') }}">ECDC imported</a> </li> </ul> - </nav> \ No newline at end of file + </nav> + </div> + </div> \ No newline at end of file diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html index 9e2c9298b3d3274a6d65d00282d6427c5687135e..b726e04cd337f768ae92b428cbc613c251546605 100644 --- a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html +++ b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html @@ -1,3 +1,5 @@ + <div class="container"> + <div class="row-cols-1"> <nav> <ul class="nav nav-tabs"> <li class="nav-item"> @@ -18,4 +20,6 @@ </a> </li> </ul> - </nav> \ No newline at end of file + </nav> + </div> + </div> \ No newline at end of file diff --git a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html index 69dead94004166a514baf92fb1c2ccc4bc3d22c1..bb9e5bad2f933eb1d350fc840d38f484b9c9e7fa 100644 --- a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html +++ b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html @@ -1,3 +1,5 @@ + <div class="container"> + <div class="row-cols-1"> <nav> <ul class="nav nav-tabs"> <li class="nav-item"> @@ -19,4 +21,6 @@ </a> </li> </ul> - </nav> \ No newline at end of file + </nav> + </div> + </div> \ No newline at end of file diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html index 2767011102895814ecd716cb047736035e172371..5ee4ad1a43ed91396740119c100cd6e53df519e2 100644 --- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html +++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html @@ -1,3 +1,5 @@ + <div class="container"> + <div class="row-cols-1"> <nav> <ul class="nav nav-tabs"> <li class="nav-item"> @@ -25,4 +27,6 @@ </a> </li> </ul> - </nav> \ No newline at end of file + </nav> + </div> + </div> \ No newline at end of file diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html index 67de355e1174baa1924f6a1b3d94b7ced2db36dd..af699352b390d691d8fc1e7cb533d62575b93d8b 100644 --- a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html +++ b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html @@ -1,4 +1,7 @@ - <br/> + + + <div class="container"> + <div class="row-cols-1"> <nav> <ul class="nav nav-tabs"> <li class="nav-item"> @@ -30,4 +33,6 @@ href="{{ url_for( 'who.url_who_imported') }}">WHO imported</a> </li> </ul> - </nav> \ No newline at end of file + </nav> + </div> + </div> \ No newline at end of file diff --git a/src/covid19/blueprints/who/templates/who/who_info.html b/src/covid19/blueprints/who/templates/who/who_info.html index e22598bf64df405ebccae90c0034f3f907a91658..fd93989d84af997470877ac23aede7a0f03f481e 100644 --- a/src/covid19/blueprints/who/templates/who/who_info.html +++ b/src/covid19/blueprints/who/templates/who/who_info.html @@ -4,20 +4,22 @@ {{super()}} {% include 'who/fragments/fragment_who_navtabs.html' %} - <div> - <h3>WHO Coronavirus Disease (COVID-19) Dashboard</h3> - <p> - <a href="https://covid19.who.int/">https://covid19.who.int</a> - </p> - </div> - <div> - <h3>WHO Coronavirus disease (COVID-19) pandemic</h3> - <p> - <a href="https://www.who.int/emergencies/diseases/novel-coronavirus-2019"> - https://www.who.int/emergencies/diseases/novel-coronavirus-2019 - </a> - </p> - </div> + <div class="container"> + <div class="row-cols-1"> + <h3>WHO Coronavirus Disease (COVID-19) Dashboard</h3> + <p> + <a href="https://covid19.who.int/">https://covid19.who.int</a> + </p> + </div> + <div class="row-cols-1"> + <h3>WHO Coronavirus disease (COVID-19) pandemic</h3> + <p> + <a href="https://www.who.int/emergencies/diseases/novel-coronavirus-2019"> + https://www.who.int/emergencies/diseases/novel-coronavirus-2019 + </a> + </p> + </div> + </div> {% endblock %}