diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html index 0d1900745..606b8bffc 100644 --- a/app/templates/components/folder-path.html +++ b/app/templates/components/folder-path.html @@ -6,7 +6,7 @@ link_current_item=False, 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 %} {% if loop.last and not link_current_item %} {% if folder.template_type or not folder.id %} diff --git a/app/templates/components/page-header.html b/app/templates/components/page-header.html index 6d2320ced..a0d7c666f 100644 --- a/app/templates/components/page-header.html +++ b/app/templates/components/page-header.html @@ -2,13 +2,14 @@ {% macro page_header( h1, - back_link=None + back_link=None, + size='large' ) %} {% if back_link %} {{ govukBackLink({ "href": back_link }) }} {% endif %} -

{{ h1 }}

+

{{ h1 }}

{% endmacro %} diff --git a/app/templates/views/dashboard/all-template-statistics.html b/app/templates/views/dashboard/all-template-statistics.html index 073244aa4..993d03f44 100644 --- a/app/templates/views/dashboard/all-template-statistics.html +++ b/app/templates/views/dashboard/all-template-statistics.html @@ -1,3 +1,4 @@ +{% from "components/page-header.html" import page_header %} {% from "components/message-count-label.html" import message_count_label %} {% from "components/pill.html" import pill %} {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading, spark_bar_field %} @@ -10,7 +11,7 @@ {% block maincolumn_content %} -

Templates used

+ {{ page_header("Templates used") }}
{{ pill( diff --git a/app/templates/views/dashboard/monthly.html b/app/templates/views/dashboard/monthly.html index 7b804c982..aeb519288 100644 --- a/app/templates/views/dashboard/monthly.html +++ b/app/templates/views/dashboard/monthly.html @@ -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/pill.html" import pill %} {% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading, row_heading %} @@ -12,9 +13,7 @@ {% block maincolumn_content %} -

- Messages sent -

+ {{ page_header('Messages sent') }}
{{ pill( items=years, diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html index 9c40a27c7..80ef2a15a 100644 --- a/app/templates/views/notifications.html +++ b/app/templates/views/notifications.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/ajax-block.html" import ajax_block %} {% 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/textbox.html" import textbox %} {% from "components/form.html" import form_wrapper %} @@ -23,9 +24,7 @@ {% block maincolumn_content %} -

- {{ page_title }} -

+ {{ page_header(page_title) }} {% if not message_type == "letter" %} {{ ajax_block( diff --git a/app/templates/views/organisations/organisation/index.html b/app/templates/views/organisations/organisation/index.html index 7ce3c3dc1..4caa5ca0b 100644 --- a/app/templates/views/organisations/organisation/index.html +++ b/app/templates/views/organisations/organisation/index.html @@ -1,3 +1,4 @@ +{% from "components/page-header.html" import page_header %} {% from "components/big-number.html" import big_number %} {% from "components/live-search.html" import live_search %} {% from "components/message-count-label.html" import message_count_label %} @@ -10,9 +11,7 @@ {% block maincolumn_content %} -

- Usage -

+ {{ page_header('Usage', size='medium') }}
{{ pill(years, selected_year, big_number_args={'smallest': True}) }} diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 505d6f527..4b220b6c2 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -4,6 +4,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/live-search.html" import live_search %} {% from "components/form.html" import form_wrapper %} +{% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% extends "withnav_template.html" %} @@ -18,9 +19,7 @@ {% if (not current_service.all_templates) and (not current_service.all_template_folders) %} -

- {{ page_title }} -

+ {{ page_header(page_title, size='medium') }}

{% if current_user.has_permissions('manage_templates') %}