Update h1 on pill pages to work with new pill

Pill pages are:
- /notifications
- /template-usage
- /monthly
- /organisations/<organisation_id>
- /templates

Includes changes to:
- the folder-path component
- the page-header component

...all their h1s have the same id.
This commit is contained in:
Tom Byers
2020-09-03 16:12:25 +01:00
parent 48902a2bac
commit c6711a113c
7 changed files with 14 additions and 16 deletions

View File

@@ -6,7 +6,7 @@
link_current_item=False, link_current_item=False,
root_element='h1' root_element='h1'
) %} ) %}
<{{ root_element }} class="heading-medium folder-heading"> <{{ root_element }} class="heading-medium folder-heading"{% if root_element == 'h1' %} id="page-header"{% endif %}>
{% for folder in folders %} {% for folder in folders %}
{% if loop.last and not link_current_item %} {% if loop.last and not link_current_item %}
{% if folder.template_type or not folder.id %} {% if folder.template_type or not folder.id %}

View File

@@ -2,13 +2,14 @@
{% macro page_header( {% macro page_header(
h1, h1,
back_link=None back_link=None,
size='large'
) %} ) %}
{% if back_link %} {% if back_link %}
{{ govukBackLink({ "href": back_link }) }} {{ govukBackLink({ "href": back_link }) }}
{% endif %} {% endif %}
<h1 class="heading-large" id="page-header">{{ h1 }}</h1> <h1 class="heading-{{ size }}" id="page-header">{{ h1 }}</h1>
{% endmacro %} {% endmacro %}

View File

@@ -1,3 +1,4 @@
{% from "components/page-header.html" import page_header %}
{% from "components/message-count-label.html" import message_count_label %} {% from "components/message-count-label.html" import message_count_label %}
{% from "components/pill.html" import pill %} {% from "components/pill.html" import pill %}
{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading, spark_bar_field %} {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading, spark_bar_field %}
@@ -10,7 +11,7 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="heading-large">Templates used</h1> {{ page_header("Templates used") }}
<div class="bottom-gutter-3-2"> <div class="bottom-gutter-3-2">
{{ pill( {{ pill(

View File

@@ -1,3 +1,4 @@
{% from "components/page-header.html" import page_header %}
{% from "components/big-number.html" import big_number_with_status, big_number %} {% from "components/big-number.html" import big_number_with_status, big_number %}
{% from "components/pill.html" import pill %} {% from "components/pill.html" import pill %}
{% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading, row_heading %} {% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading, row_heading %}
@@ -12,9 +13,7 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="heading-large"> {{ page_header('Messages sent') }}
Messages sent
</h1>
<div class="bottom-gutter"> <div class="bottom-gutter">
{{ pill( {{ pill(
items=years, items=years,

View File

@@ -1,6 +1,7 @@
{% extends "withnav_template.html" %} {% extends "withnav_template.html" %}
{% from "components/ajax-block.html" import ajax_block %} {% from "components/ajax-block.html" import ajax_block %}
{% from "components/message-count-label.html" import message_count_label, recipient_count_label %} {% from "components/message-count-label.html" import message_count_label, recipient_count_label %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %} {% from "components/page-footer.html" import page_footer %}
{% from "components/textbox.html" import textbox %} {% from "components/textbox.html" import textbox %}
{% from "components/form.html" import form_wrapper %} {% from "components/form.html" import form_wrapper %}
@@ -23,9 +24,7 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="heading-large"> {{ page_header(page_title) }}
{{ page_title }}
</h1>
{% if not message_type == "letter" %} {% if not message_type == "letter" %}
{{ ajax_block( {{ ajax_block(

View File

@@ -1,3 +1,4 @@
{% from "components/page-header.html" import page_header %}
{% from "components/big-number.html" import big_number %} {% from "components/big-number.html" import big_number %}
{% from "components/live-search.html" import live_search %} {% from "components/live-search.html" import live_search %}
{% from "components/message-count-label.html" import message_count_label %} {% from "components/message-count-label.html" import message_count_label %}
@@ -10,9 +11,7 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="heading-medium"> {{ page_header('Usage', size='medium') }}
Usage
</h1>
<div class="bottom-gutter"> <div class="bottom-gutter">
{{ pill(years, selected_year, big_number_args={'smallest': True}) }} {{ pill(years, selected_year, big_number_args={'smallest': True}) }}

View File

@@ -4,6 +4,7 @@
{% from "components/textbox.html" import textbox %} {% from "components/textbox.html" import textbox %}
{% from "components/live-search.html" import live_search %} {% from "components/live-search.html" import live_search %}
{% from "components/form.html" import form_wrapper %} {% from "components/form.html" import form_wrapper %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %} {% from "components/page-footer.html" import page_footer %}
{% extends "withnav_template.html" %} {% extends "withnav_template.html" %}
@@ -18,9 +19,7 @@
{% if (not current_service.all_templates) and (not current_service.all_template_folders) %} {% if (not current_service.all_templates) and (not current_service.all_template_folders) %}
<h1 class="heading-medium"> {{ page_header(page_title, size='medium') }}
{{ page_title }}
</h1>
<p class="govuk-body"> <p class="govuk-body">
{% if current_user.has_permissions('manage_templates') %} {% if current_user.has_permissions('manage_templates') %}