diff --git a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html index 30e4dae03f5eba76d9f92ae56e70128d02304d87..0b4202bf6d3f37fb57cc81f3e0f4fd4db9598607 100644 --- a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html +++ b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html @@ -1,85 +1,91 @@ {% extends 'application/page_layout.html' %} {% block content %} - {{super()}} - {% include 'rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html' %} +{{super()}} +{% include 'rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html' %} - <div class="container"> - <div class="row"> - <div class="col"> - {% if page_data.pages > 1 %} - <!-- previous page --> - <ul class="pagination"> - {% if page_data.has_prev %} - <li class="page-item"> - <a class="page-link" - href="{{ url_for('rki_landkreise.url_rki_landkreise_imported', page=page_data.prev_num) }}">Previous</a> - </li> - {% endif %} - <!-- all page numbers --> - {% for page_num in page_data.iter_pages() %} - {% if page_num %} - {% if page_num != page_data.page %} - <li class="page-item"> - <a class="page-link" - href="{{ url_for('rki_landkreise.url_rki_landkreise_imported', page=page_num) }}">{{ page_num }}</a> - </li> - {% else %} - <li class="page-item active"> - <a class="page-link" - href="#">{{ page_num }}</a> - </li> - {% endif %} - {% else %} - <li class="page-item"> - <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span> - </li> - {% endif %} - {% endfor %} - <!-- next page --> - {% if page_data.has_next %} - <li class="page-item"> - <a class="page-link" - href="{{ url_for('rki_landkreise.url_rki_landkreise_imported', page=page_data.next_num) }}">Next</a> - </li> - {% endif %} - </ul> +<div class="container"> + <div class="row"> + <div class="col"> + {% if page_data.pages > 1 %} + <!-- previous page --> + <ul class="pagination"> + {% if page_data.has_prev %} + <li class="page-item"> + <a class="page-link" + href="{{ url_for('rki_landkreise.url_rki_landkreise_imported', page=page_data.prev_num) }}"> + Previous + </a> + </li> {% endif %} - </div> + <!-- all page numbers --> + {% for page_num in page_data.iter_pages() %} + {% if page_num %} + {% if page_num != page_data.page %} + <li class="page-item"> + <a class="page-link" + href="{{ url_for('rki_landkreise.url_rki_landkreise_imported', page=page_num) }}"> + {{ page_num }} + </a> + </li> + {% else %} + <li class="page-item active"> + <a class="page-link" + href="#">{{ page_num }}</a> + </li> + {% endif %} + {% else %} + <li class="page-item"> + <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span> + </li> + {% endif %} + {% endfor %} + <!-- next page --> + {% if page_data.has_next %} + <li class="page-item"> + <a class="page-link" + href="{{ url_for('rki_landkreise.url_rki_landkreise_imported', page=page_data.next_num) }}"> + Next + </a> + </li> + {% endif %} + </ul> + {% endif %} </div> - <div class="row"> - <div class="col"> - <table class="table table-hover table-striped"> - <thead> - <tr> - <th scope="col">date_reported</th> - <th scope="col">country_code</th> - <th scope="col">country</th> - <th scope="col">who_region</th> - <th scope="col">new_cases</th> - <th scope="col">cumulative_cases</th> - <th scope="col">new_deaths</th> - <th scope="col">cumulative_deaths</th> - </tr> - </thead> - <tbody> - {% for who_global_data_import in page_data.items %} - <tr> - <td>{{ who_global_data_import.date_reported }}</td> - <td>{{ who_global_data_import.country_code }}</td> - <td>{{ who_global_data_import.country }}</td> - <td>{{ who_global_data_import.who_region }}</td> - <td>{{ who_global_data_import.new_cases }}</td> - <td>{{ who_global_data_import.cumulative_cases }}</td> - <td>{{ who_global_data_import.new_deaths }}</td> - <td>{{ who_global_data_import.cumulative_deaths }}</td> - </tr> - {% endfor %} - </tbody> - </table> - </div> + </div> + <div class="row"> + <div class="col"> + <table class="table table-hover table-striped"> + <thead> + <tr> + <th scope="col">date_reported</th> + <th scope="col">country_code</th> + <th scope="col">country</th> + <th scope="col">who_region</th> + <th scope="col">new_cases</th> + <th scope="col">cumulative_cases</th> + <th scope="col">new_deaths</th> + <th scope="col">cumulative_deaths</th> + </tr> + </thead> + <tbody> + {% for who_global_data_import in page_data.items %} + <tr> + <td>{{ who_global_data_import.date_reported }}</td> + <td>{{ who_global_data_import.country_code }}</td> + <td>{{ who_global_data_import.country }}</td> + <td>{{ who_global_data_import.who_region }}</td> + <td>{{ who_global_data_import.new_cases }}</td> + <td>{{ who_global_data_import.cumulative_cases }}</td> + <td>{{ who_global_data_import.new_deaths }}</td> + <td>{{ who_global_data_import.cumulative_deaths }}</td> + </tr> + {% endfor %} + </tbody> + </table> </div> </div> +</div> {% endblock %} diff --git a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html index d161fbb87ca89e7fdd091ea736f9368b963e8adc..fa4e012a5d6c3ce06b97fb6bd7034681e3386701 100644 --- a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html +++ b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html @@ -25,10 +25,12 @@ </div> <div class="row"> <div class="col"> - <h3>COVID-19 Dashboard by the Center for Systems Science and Engineering (CSSE) at Johns Hopkins University (JHU)</h3> + <h3>COVID-19 Dashboard by the Center for Systems Science and Engineering (CSSE) + at Johns Hopkins University (JHU)</h3> <p> <a href="https://gisanddata.maps.arcgis.com/apps/opsdashboard/index.html#/bda7594740fd40299423467b48e9ecf6"> - COVID-19 Dashboard by the Center for Systems Science and Engineering (CSSE) at Johns Hopkins University (JHU) + COVID-19 Dashboard by the Center for Systems Science and Engineering (CSSE) + at Johns Hopkins University (JHU) </a> </p> </div>