From 9a5a960e57201d52b8f27798180c7f2656408d10 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Mon, 18 Nov 2024 14:00:52 -0800 Subject: [PATCH 01/18] contact content --- app/main/views/index.py | 8 +++++ app/main/views/sub_navigation_dictionaries.py | 4 +++ app/templates/views/about/contact.html | 35 +++++++++++++++++++ tests/app/test_navigation.py | 1 + 4 files changed, 48 insertions(+) create mode 100644 app/templates/views/about/contact.html diff --git a/app/main/views/index.py b/app/main/views/index.py index 974e29211..5e7bff008 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -295,6 +295,14 @@ def about_notify(): ) +@main.route("/about/contact") +def contact(): + return render_template( + "views/about/contact.html", + navigation_links=about_notify_nav(), + ) + + @main.route("/using-notify/guidance/create-and-send-messages") @user_is_logged_in def create_and_send_messages(): diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index b9fb7f8ae..56505ca6e 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -113,4 +113,8 @@ def about_notify_nav(): "name": "About notify", "link": "main.about_notify", }, + { + "name": "Contact", + "link": "main.contact", + }, ] diff --git a/app/templates/views/about/contact.html b/app/templates/views/about/contact.html new file mode 100644 index 000000000..8b4a00250 --- /dev/null +++ b/app/templates/views/about/contact.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} + +{% set page_title = "Contact" %} + +{% block per_page_title %} +{{page_title}} +{% endblock %} + +{% block content_column_content %} + +
+

{{page_title}}

+

Notify is designed to be easy to use.

+ +

If you have technical issues or questions, we are available at notify-support@gsa.gov.

+

You can expect a response within one business day.

+
+
+
+

For partnership inquiries see, Join Notify or contact us at
tts-notify@gsa.gov.

+
+
+
+
+{% endblock %} diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py index 15be17081..8185afe82 100644 --- a/tests/app/test_navigation.py +++ b/tests/app/test_navigation.py @@ -61,6 +61,7 @@ EXCLUDED_ENDPOINTS = tuple( "conversation_reply", "conversation_reply_with_template", "conversation_updates", + "contact", "copy_template", "count_content_length", "create_and_send_messages", From 3a6295b7a2765d29b54f85b7a03178bd2570f8cf Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 19 Nov 2024 18:06:23 -0800 Subject: [PATCH 02/18] update contact --- app/templates/views/about/contact.html | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app/templates/views/about/contact.html b/app/templates/views/about/contact.html index 8b4a00250..046732576 100644 --- a/app/templates/views/about/contact.html +++ b/app/templates/views/about/contact.html @@ -11,23 +11,16 @@

{{page_title}}

Notify is designed to be easy to use.

-
    -
  • For information on personalization and data preparation, see Using Notify. -
    • -
  • For help interpreting delivery reports, see Delivery Status.
    • -
  • For details on pricing and what counts as a message part, see Tracking - Messages. -
    • -

If you have technical issues or questions, we are available at notify-support@gsa.gov.

You can expect a response within one business day.

+ aria-label="For partnership inquiries">
-

For partnership inquiries see, Join Notify or contact us at
tts-notify@gsa.gov.

+

For partnership inquiries see, Join Notify or contact us at
tts-notify@gsa.gov.

From 9483c099db28a81a5dbd5ac26132ad3669541b72 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 20 Nov 2024 11:11:12 -0800 Subject: [PATCH 03/18] update content --- app/templates/views/about/contact.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/templates/views/about/contact.html b/app/templates/views/about/contact.html index 046732576..96c3a0895 100644 --- a/app/templates/views/about/contact.html +++ b/app/templates/views/about/contact.html @@ -10,17 +10,17 @@

{{page_title}}

-

Notify is designed to be easy to use.

-

If you have technical issues or questions, we are available at notify-support@gsa.gov.

+

Is your organization interested in using Notify.gov? Find more information at Join + Notify or contact us at tts-notify@gsa.gov.

You can expect a response within one business day.

-

For partnership inquiries see, Join Notify or contact us at
tts-notify@gsa.gov.

+

If you are a current Notify.gov partner and have technical issues or questions, we are available at notify-support@gsa.gov

From 35958769f48a191e49e62ec5dcf47722df4d1e16 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Fri, 22 Nov 2024 16:45:25 -0500 Subject: [PATCH 04/18] Send Message A11Y Audit - Adjust headers in Send Message flow --- app/assets/sass/uswds/_uswds-theme-custom-styles.scss | 6 ++++++ app/main/views/send.py | 2 +- app/templates/components/folder-path.html | 2 +- app/templates/components/live-search.html | 2 +- app/templates/components/service_nav.html | 2 +- app/templates/views/dashboard/dashboard.html | 4 ++-- .../views/dashboard/write-first-messages.html | 10 ++++++---- app/templates/views/notifications/preview.html | 4 ++-- app/templates/views/templates/choose.html | 3 ++- app/templates/views/templates/template.html | 4 ++-- tests/app/main/views/test_send.py | 2 +- 11 files changed, 25 insertions(+), 16 deletions(-) diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index cec48e82b..75712180d 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -265,6 +265,7 @@ td.table-empty-message { margin-bottom: units(2); .usa-form-group { @include u-width("mobile-lg"); + margin-top: units(2); } input#search { width: 100%; @@ -397,6 +398,11 @@ td.table-empty-message { background-image: url(../img/material-icons/description.svg); } } + .get-started { + border: 1px solid color("gray-90"); + padding: units(2); + margin-bottom: units(4); + } } .dashboard-table { diff --git a/app/main/views/send.py b/app/main/views/send.py index 3d83d10f3..a6601840d 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -739,7 +739,7 @@ def all_placeholders_in_session(placeholders): def get_send_test_page_title(template_type, entering_recipient, name=None): if entering_recipient: - return "Send ‘{}’".format(name) + return "Select recipients" return "Personalize this message" diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html index b6615a2da..eb5bc2731 100644 --- a/app/templates/components/folder-path.html +++ b/app/templates/components/folder-path.html @@ -4,7 +4,7 @@ template_type, current_user, link_current_item=False, - root_element='h1' + root_element='h2' ) %} <{{ root_element }} class="font-body-lg folder-heading margin-bottom-0"{% if root_element == 'h1' %} id="page-header"{% endif %}> {% for folder in folders %} diff --git a/app/templates/components/live-search.html b/app/templates/components/live-search.html index 9df46fd1a..58683e957 100644 --- a/app/templates/components/live-search.html +++ b/app/templates/components/live-search.html @@ -17,7 +17,7 @@ {% endif %} {% if show %} -
+
{{ form.search(param_extensions=param_extensions) }}
diff --git a/app/templates/components/service_nav.html b/app/templates/components/service_nav.html index 4bd6aafb9..5670b3b48 100644 --- a/app/templates/components/service_nav.html +++ b/app/templates/components/service_nav.html @@ -6,7 +6,7 @@ {{ current_service.organization_name }} {% endif %} {% endif %} -
+
{{ current_service.name }} {% if not current_service.active %} Suspended diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index f4430e566..04abe1afc 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -13,7 +13,7 @@ -
+

Dashboard

{% if current_user.has_permissions('manage_templates') and not current_service.all_templates %} @@ -22,7 +22,7 @@ {{ ajax_block(partials, updates_url, 'upcoming') }} -

{{ current_service.name }} Dashboard

+

{{ current_service.name }} Dashboard

{{ ajax_block(partials, updates_url, 'inbox') }} diff --git a/app/templates/views/dashboard/write-first-messages.html b/app/templates/views/dashboard/write-first-messages.html index 2d2e30e75..50dc23fec 100644 --- a/app/templates/views/dashboard/write-first-messages.html +++ b/app/templates/views/dashboard/write-first-messages.html @@ -1,4 +1,6 @@ -

Get started

- - Create your first template - +
+

Get started

+ + Create your first template + +
diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html index 5c702a386..d0be74aed 100644 --- a/app/templates/views/notifications/preview.html +++ b/app/templates/views/notifications/preview.html @@ -10,7 +10,7 @@ {% elif help %} {{ "Example text message" }} {% else %} - {{ "Preview" }} + {{ "Preview for sending" }} {% endif %} {% endblock %} @@ -50,7 +50,7 @@ {% endcall %}
{% else %} - {{ page_header("Example text message" if help else "Preview") }} + {{ page_header("Example text message" if help else "Preview for sending") }} {% endif %} {% if not help %} diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 964ab10dc..149b414f7 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -34,8 +34,9 @@ {% else %}
+

Select or create a template

-
+

Every message starts with a template. To send, choose or create a template. diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index d7dbf94ae..d9f163621 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -32,8 +32,8 @@ {% else %}

-

- Review your message +

+ Confirm your template

{{ folder_path( folders=current_service.get_template_path(template._template), diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 1d8e696f8..1a262ebb2 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -1253,7 +1253,7 @@ def test_send_one_off_has_correct_page_title( step_index=0, _follow_redirects=True, ) - assert page.h1.text.strip() == "Send ‘Two week reminder’" + assert page.h1.text.strip() == "Select recipients" assert len(page.select(".banner-tour")) == 0 From 90c7386b63e30303a9aedd9443e885760853553e Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Fri, 22 Nov 2024 16:53:07 -0500 Subject: [PATCH 05/18] Header fix --- app/templates/views/templates/choose.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 149b414f7..eb07ccd3c 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -34,7 +34,7 @@ {% else %}
-

Select or create a template

+

Select or create a template

From b98e3d87e2d83d5d7ca146c8bb6397cad371f602 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Mon, 2 Dec 2024 09:59:58 -0500 Subject: [PATCH 06/18] Fixing tests --- tests/app/main/views/test_send.py | 2 +- tests/app/main/views/test_template_folders.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 1a262ebb2..806474c49 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -2712,7 +2712,7 @@ def test_preview_notification_shows_preview( template_id=fake_uuid, _expected_status=200, ) - assert page.h1.text.strip() == "Preview" + assert page.h1.text.strip() == "Preview for sending" assert (page.find_all("a", {"class": "usa-back-link"})[0]["href"]) == url_for( "main.check_notification", service_id=service_one["id"], diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index 0bf2fcb08..a261f252e 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -347,11 +347,11 @@ def test_should_show_templates_folder_page( ) assert normalize_spaces(page.select_one("title").text) == expected_title_tag - assert normalize_spaces(page.select_one("h1").text) == expected_page_title + assert normalize_spaces(page.select_one("h2").text) == expected_page_title - assert len(page.select("h1 a")) == len(expected_parent_link_args) + assert len(page.select("h2 a")) == len(expected_parent_link_args) - for index, parent_link in enumerate(page.select("h1 a")): + for index, parent_link in enumerate(page.select("h2 a")): assert parent_link["href"] == url_for( "main.choose_template", service_id=SERVICE_ONE_ID, From 6218d3eadda2f901a99208f2d3b354ab3c7de823 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Mon, 2 Dec 2024 10:53:06 -0500 Subject: [PATCH 07/18] Adjusting tests --- app/models/service.py | 2 +- app/templates/views/templates/choose.html | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/models/service.py b/app/models/service.py index e9bcf8a7d..53c1c83d8 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -456,7 +456,7 @@ class Service(JSONModel, SortByNameMixin): if folder_id is None: return { "id": None, - "name": "Templates", + "name": "Select or create a template", "parent_id": None, } return self._get_by_id(self.all_template_folders, folder_id) diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index eb07ccd3c..24b3dd2da 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -36,13 +36,9 @@

Select or create a template

-
-
-

- Every message starts with a template. To send, choose or create a template. -

-
-
+

+ Every message starts with a template. To send, choose or create a template. +

{{ folder_path( folders=template_folder_path, service_id=current_service.id, From 994a314f310505bcf84faa0158d96523828ea428 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Mon, 2 Dec 2024 12:09:43 -0500 Subject: [PATCH 08/18] Trying to decouple this h1 from the templates folder structure --- app/models/service.py | 2 +- app/templates/views/templates/choose.html | 2 +- tests/app/main/views/test_template_folders.py | 40 +++++++++---------- tests/app/main/views/test_templates.py | 16 ++++---- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/models/service.py b/app/models/service.py index 53c1c83d8..e9bcf8a7d 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -456,7 +456,7 @@ class Service(JSONModel, SortByNameMixin): if folder_id is None: return { "id": None, - "name": "Select or create a template", + "name": "Templates", "parent_id": None, } return self._get_by_id(self.all_template_folders, folder_id) diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 24b3dd2da..d8fb191ec 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -8,7 +8,7 @@ {% extends "withnav_template.html" %} -{% set page_title = 'Templates' %} +{% set page_title = 'Select or create a template' %} {% block service_page_title %} {{ page_title_folder_path(template_folder_path) }} diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index a261f252e..f439cae18 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -53,7 +53,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): ), [ ( - "Templates – service one – Notify.gov", + "Select or create a template – service one – Notify.gov", "Templates", [], {}, @@ -92,7 +92,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "Templates – service one – Notify.gov", + "Select or create a template – service one – Notify.gov", "Templates", [], {"template_type": "all"}, @@ -131,7 +131,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "Templates – service one – Notify.gov", + "Select or create a template – service one – Notify.gov", "Templates", [], {"template_type": "sms"}, @@ -159,7 +159,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one – Templates – service one – Notify.gov", + "folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one", [{"template_type": "all"}], {"template_folder_id": PARENT_FOLDER_ID}, @@ -182,7 +182,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one – Templates – service one – Notify.gov", + "folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one", [{"template_type": "sms"}], {"template_type": "sms", "template_folder_id": PARENT_FOLDER_ID}, @@ -199,7 +199,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one – Templates – service one – Notify.gov", + "folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one", [{"template_type": "email"}], {"template_type": "email", "template_folder_id": PARENT_FOLDER_ID}, @@ -210,7 +210,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "There are no email templates in this folder", ), ( - "folder_one_one – folder_one – Templates – service one – Notify.gov", + "folder_one_one – folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one folder_one_one", [ {"template_type": "all"}, @@ -229,7 +229,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one_one_one – folder_one_one – folder_one – Templates – service one – Notify.gov", + "folder_one_one_one – folder_one_one – folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one folder_one_one folder_one_one_one", [ {"template_type": "all"}, @@ -250,7 +250,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one_one_one – folder_one_one – folder_one – Templates – service one – Notify.gov", + "folder_one_one_one – folder_one_one – folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one folder_one_one folder_one_one_one", [ {"template_type": "email"}, @@ -268,8 +268,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "There are no email templates in this folder", ), ( - "folder_two – Templates – service one – Notify.gov", - "Templates folder_two", + "folder_two – Select or create a template – service one – Notify.gov", + "Select or create a template folder_two", [{"template_type": "all"}], {"template_folder_id": FOLDER_TWO_ID}, ["Email", "Text message"], @@ -279,8 +279,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "This folder is empty", ), ( - "folder_two – Templates – service one – Notify.gov", - "Templates folder_two", + "folder_two – Select or create a template – service one – Notify.gov", + "Select or create a template folder_two", [{"template_type": "sms"}], {"template_folder_id": FOLDER_TWO_ID, "template_type": "sms"}, ["All", "Email"], @@ -290,8 +290,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "This folder is empty", ), ( - "folder_two – Templates – service one – Notify.gov", - "Templates folder_two", + "folder_two – Select or create a template – service one – Notify.gov", + "Select or create a template folder_two", [{"template_type": "all"}], {"template_folder_id": FOLDER_TWO_ID, "template_type": "all"}, ["Email", "Text message"], @@ -529,7 +529,7 @@ def test_get_manage_folder_page( _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Templates – service one – Notify.gov" + "folder_two – Select or create a template – service one – Notify.gov" ) assert page.select_one("input[name=name]")["value"] == "folder_two" delete_link = page.find("a", string="Delete this folder") @@ -571,7 +571,7 @@ def test_get_manage_folder_viewing_permissions_for_users( _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Templates – service one – Notify.gov" + "folder_two – Select or create a template – service one – Notify.gov" ) form_labels = page.select("legend.usa-legend") assert ( @@ -634,7 +634,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_when_no_man _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Templates – service one – Notify.gov" + "folder_two – Select or create a template – service one – Notify.gov" ) form_labels = page.select("legend[class=form-label]") assert len(form_labels) == 0 @@ -671,7 +671,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_for_service _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Templates – service one – Notify.gov" + "folder_two – Select or create a template – service one – Notify.gov" ) form_labels = page.select("legend[class=form-label]") assert len(form_labels) == 0 @@ -1160,7 +1160,7 @@ def test_should_show_radios_and_buttons_for_move_destination_if_correct_permissi FOLDER_TWO_ID, ] assert [x.text.strip() for x in radio_div.select("label")] == [ - "Templates", + "Select or create a template", "folder_one", "folder_one_one", "folder_one_two", diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 6e2ff227d..7676d0f17 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -69,7 +69,7 @@ def test_should_show_empty_page_when_no_templates( service_id=service_one["id"], ) - assert normalize_spaces(page.select_one("h1").text) == ("Templates") + assert normalize_spaces(page.select_one("h1").text) == ("Select or create a template") assert normalize_spaces(page.select_one("main p").text) == (expected_message) assert page.select_one("#add_new_folder_form") assert page.select_one("#add_new_template_form") @@ -87,7 +87,7 @@ def test_should_show_add_template_form_if_service_has_folder_permission( service_id=service_one["id"], ) - assert normalize_spaces(page.select_one("h1").text) == ("Templates") + assert normalize_spaces(page.select_one("h1").text) == ("Select or create a template") assert normalize_spaces(page.select_one("main p").text) == ( "Every message starts with a template. You can change it later. " "You need a template before you can send messages." @@ -110,7 +110,7 @@ def test_should_show_add_template_form_if_service_has_folder_permission( [ ( create_active_user_view_permissions(), - "Templates", + "Select or create a template", {}, ["Email", "Text message"], [ @@ -122,21 +122,21 @@ def test_should_show_add_template_form_if_service_has_folder_permission( ), ( create_active_user_view_permissions(), - "Templates", + "Select or create a template", {"template_type": "sms"}, ["All", "Email"], ["sms_template_one", "sms_template_two"], ), ( create_active_user_view_permissions(), - "Templates", + "Select or create a template", {"template_type": "email"}, ["All", "Text message"], ["email_template_one", "email_template_two"], ), ( create_active_caseworking_user(), - "Templates", + "Select or create a template", {}, ["Email", "Text message"], [ @@ -148,7 +148,7 @@ def test_should_show_add_template_form_if_service_has_folder_permission( ), ( create_active_caseworking_user(), - "Templates", + "Select or create a template", {"template_type": "email"}, ["All", "Text message"], ["email_template_one", "email_template_two"], @@ -583,7 +583,7 @@ def test_should_be_able_to_view_a_template_with_links( assert normalize_spaces(page.select_one("h1").text) == ("Review your message") assert normalize_spaces(page.select_one("title").text) == ( - "Two week reminder – Templates – service one – Notify.gov" + "Two week reminder – Select or create a template – service one – Notify.gov" ) assert [ From 66c377c39d2f5b3cafb6f202bcdbdcdabfdc4892 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Mon, 2 Dec 2024 14:22:45 -0800 Subject: [PATCH 09/18] changed page title and h1 on choose.html --- app/templates/components/folder-path.html | 8 ++++---- app/templates/views/templates/choose.html | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html index eb5bc2731..7ead0c568 100644 --- a/app/templates/components/folder-path.html +++ b/app/templates/components/folder-path.html @@ -3,10 +3,10 @@ service_id, template_type, current_user, - link_current_item=False, - root_element='h2' + link_current_item=False ) %} - <{{ root_element }} class="font-body-lg folder-heading margin-bottom-0"{% if root_element == 'h1' %} id="page-header"{% endif %}> + + {% endmacro %} diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index d8fb191ec..428ea7c8f 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -1,4 +1,4 @@ -{% from "components/folder-path.html" import folder_path, page_title_folder_path %} +{% from "components/folder-path.html" import folder_path %} {% from "components/pill.html" import pill %} {% from "components/live-search.html" import live_search %} {% from "components/form.html" import form_wrapper %} @@ -11,7 +11,7 @@ {% set page_title = 'Select or create a template' %} {% block service_page_title %} - {{ page_title_folder_path(template_folder_path) }} + {{page_title}} {% endblock %} {% block maincolumn_content %} @@ -34,17 +34,18 @@ {% else %}
-

Select or create a template

+

{{page_title}}

Every message starts with a template. To send, choose or create a template.

- {{ folder_path( + {# you don't need this unless you're trying to add the parent breadcrumb title to the first page of the flow #} +
{% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
From 4946bed5ccb55d2fcd16786780d8c7abd22d6b2f Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 3 Dec 2024 13:05:55 -0800 Subject: [PATCH 10/18] fixed title testing --- app/templates/base.html | 4 +--- app/templates/views/templates/choose.html | 4 +--- app/templates/withnav_template.html | 9 ++------- tests/app/main/views/test_template_folders.py | 13 +++++++------ 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/app/templates/base.html b/app/templates/base.html index b2b6639e9..0348832bd 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -6,9 +6,7 @@ - {% block pageTitle %} - {% block per_page_title %}{% endblock %} – Notify.gov - {% endblock %} + {% block pageTitle %}{% block per_page_title %}{% endblock %} – Notify.gov{% endblock %} {% include "components/head.html" %} diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 428ea7c8f..5813a361f 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -10,9 +10,7 @@ {% set page_title = 'Select or create a template' %} -{% block service_page_title %} - {{page_title}} -{% endblock %} +{% block service_page_title %}{{page_title}}{% endblock %} {% block maincolumn_content %} diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index eb6a42244..d7a249562 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -1,12 +1,7 @@ {% extends "base.html" %} -{% block per_page_title %} - {% if current_org.name %} - {% block org_page_title %}{% endblock %} – {{ current_org.name }} - {% else %} - {% block service_page_title %}{% endblock %} – {{ current_service.name }} - {% endif %} -{% endblock %} +{% block per_page_title %}{% if current_org.name %}{% block org_page_title %}{% endblock %} – {{ current_org.name }}{% + else %}{% block service_page_title %}{% endblock %} – {{ current_service.name }}{% endif %}{% endblock %} {% block main %}
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index f439cae18..574bf62e6 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -41,8 +41,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): @pytest.mark.parametrize( ( - "expected_title_tag", "expected_page_title", + "expected_title_tag", "expected_parent_link_args", "extra_args", "expected_nav_links", @@ -54,7 +54,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): [ ( "Select or create a template – service one – Notify.gov", - "Templates", + "Select or create a template", [], {}, ["Email", "Text message"], @@ -93,7 +93,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): ), ( "Select or create a template – service one – Notify.gov", - "Templates", + "Select or create a template", [], {"template_type": "all"}, ["Email", "Text message"], @@ -132,7 +132,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): ), ( "Select or create a template – service one – Notify.gov", - "Templates", + "Select or create a template", [], {"template_type": "sms"}, ["All", "Email"], @@ -346,8 +346,9 @@ def test_should_show_templates_folder_page( **extra_args, ) - assert normalize_spaces(page.select_one("title").text) == expected_title_tag - assert normalize_spaces(page.select_one("h2").text) == expected_page_title + + assert normalize_spaces(page.select_one("title").text) == expected_page_title + assert normalize_spaces(page.select_one("h1").text) == expected_title_tag assert len(page.select("h2 a")) == len(expected_parent_link_args) From 9ef89666b0f92aff199be62f4fed58aa614de2a7 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 3 Dec 2024 17:00:18 -0800 Subject: [PATCH 11/18] fixed testing --- app/templates/components/folder-path.html | 8 +-- app/templates/views/templates/choose.html | 8 +-- .../templates/manage-template-folder.html | 6 +-- app/templates/views/templates/template.html | 10 ++-- tests/app/main/views/test_template_folders.py | 51 ++++++++++--------- 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html index 7ead0c568..05a577a89 100644 --- a/app/templates/components/folder-path.html +++ b/app/templates/components/folder-path.html @@ -3,10 +3,10 @@ service_id, template_type, current_user, - link_current_item=False + link_current_item=False, + root_element='nav' ) %} - - + {% endmacro %} diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 5813a361f..9c58c59cf 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -37,13 +37,15 @@

Every message starts with a template. To send, choose or create a template.

- {# you don't need this unless you're trying to add the parent breadcrumb title to the first page of the flow #} - + ) }}
{% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
diff --git a/app/templates/views/templates/manage-template-folder.html b/app/templates/views/templates/manage-template-folder.html index 528631f2e..42a3cbf7c 100644 --- a/app/templates/views/templates/manage-template-folder.html +++ b/app/templates/views/templates/manage-template-folder.html @@ -3,9 +3,9 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} -{% block service_page_title %} - {{ page_title_folder_path(template_folder_path) }} -{% endblock %} +{% set page_title = 'Select or create a template' %} + +{% block service_page_title %}{{page_title}}{% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index d9f163621..708902221 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -1,13 +1,13 @@ {% extends "withnav_template.html" %} {% from "components/banner.html" import banner_wrapper %} -{% from "components/folder-path.html" import folder_path, page_title_folder_path %} +{% from "components/folder-path.html" import folder_path %} {% from "components/page-footer.html" import page_footer %} {% from "components/copy-to-clipboard.html" import copy_to_clipboard %} {% from "components/components/button/macro.njk" import usaButton %} -{% block service_page_title %} - {{ page_title_folder_path(current_service.get_template_path(template._template)) }} -{% endblock %} +{% set page_title = 'Confirm your template' %} + +{% block service_page_title %}{{page_title}}{% endblock %} {% block maincolumn_content %} @@ -33,7 +33,7 @@

- Confirm your template + {{page_title}}

{{ folder_path( folders=current_service.get_template_path(template._template), diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index 574bf62e6..8c5f632ee 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -159,8 +159,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one – Select or create a template – service one – Notify.gov", - "Templates folder_one", + "Select or create a template – service one – Notify.gov", + "Select or create a template", [{"template_type": "all"}], {"template_folder_id": PARENT_FOLDER_ID}, ["Email", "Text message"], @@ -182,8 +182,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one – Select or create a template – service one – Notify.gov", - "Templates folder_one", + "Select or create a template – service one – Notify.gov", + "Select or create a template", [{"template_type": "sms"}], {"template_type": "sms", "template_folder_id": PARENT_FOLDER_ID}, ["All", "Email"], @@ -199,8 +199,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one – Select or create a template – service one – Notify.gov", - "Templates folder_one", + "Select or create a template – service one – Notify.gov", + "Select or create a template", [{"template_type": "email"}], {"template_type": "email", "template_folder_id": PARENT_FOLDER_ID}, ["All", "Text message"], @@ -210,8 +210,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "There are no email templates in this folder", ), ( - "folder_one_one – folder_one – Select or create a template – service one – Notify.gov", - "Templates folder_one folder_one_one", + "Select or create a template – service one – Notify.gov", + "Select or create a template", [ {"template_type": "all"}, {"template_type": "all", "template_folder_id": PARENT_FOLDER_ID}, @@ -229,8 +229,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one_one_one – folder_one_one – folder_one – Select or create a template – service one – Notify.gov", - "Templates folder_one folder_one_one folder_one_one_one", + "Select or create a template – service one – Notify.gov", + "Select or create a template", [ {"template_type": "all"}, {"template_type": "all", "template_folder_id": PARENT_FOLDER_ID}, @@ -250,8 +250,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one_one_one – folder_one_one – folder_one – Select or create a template – service one – Notify.gov", - "Templates folder_one folder_one_one folder_one_one_one", + "Select or create a template – service one – Notify.gov", + "Select or create a template", [ {"template_type": "email"}, {"template_type": "email", "template_folder_id": PARENT_FOLDER_ID}, @@ -268,8 +268,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "There are no email templates in this folder", ), ( - "folder_two – Select or create a template – service one – Notify.gov", - "Select or create a template folder_two", + "Select or create a template – service one – Notify.gov", + "Select or create a template", [{"template_type": "all"}], {"template_folder_id": FOLDER_TWO_ID}, ["Email", "Text message"], @@ -279,8 +279,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "This folder is empty", ), ( - "folder_two – Select or create a template – service one – Notify.gov", - "Select or create a template folder_two", + "Select or create a template – service one – Notify.gov", + "Select or create a template", [{"template_type": "sms"}], {"template_folder_id": FOLDER_TWO_ID, "template_type": "sms"}, ["All", "Email"], @@ -290,8 +290,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "This folder is empty", ), ( - "folder_two – Select or create a template – service one – Notify.gov", - "Select or create a template folder_two", + "Select or create a template – service one – Notify.gov", + "Select or create a template", [{"template_type": "all"}], {"template_folder_id": FOLDER_TWO_ID, "template_type": "all"}, ["Email", "Text message"], @@ -350,9 +350,10 @@ def test_should_show_templates_folder_page( assert normalize_spaces(page.select_one("title").text) == expected_page_title assert normalize_spaces(page.select_one("h1").text) == expected_title_tag - assert len(page.select("h2 a")) == len(expected_parent_link_args) + # remove this line if you don't want the breadcrumb on the first page + assert len(page.select("nav#breadcrumb-template-folders a")) == len(expected_parent_link_args) - for index, parent_link in enumerate(page.select("h2 a")): + for index, parent_link in enumerate(page.select("nav#breadcrumb-template-folders a")): assert parent_link["href"] == url_for( "main.choose_template", service_id=SERVICE_ONE_ID, @@ -530,7 +531,7 @@ def test_get_manage_folder_page( _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Select or create a template – service one – Notify.gov" + "Select or create a template – service one – Notify.gov" ) assert page.select_one("input[name=name]")["value"] == "folder_two" delete_link = page.find("a", string="Delete this folder") @@ -572,7 +573,7 @@ def test_get_manage_folder_viewing_permissions_for_users( _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Select or create a template – service one – Notify.gov" + "Select or create a template – service one – Notify.gov" ) form_labels = page.select("legend.usa-legend") assert ( @@ -635,7 +636,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_when_no_man _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Select or create a template – service one – Notify.gov" + "Select or create a template – service one – Notify.gov" ) form_labels = page.select("legend[class=form-label]") assert len(form_labels) == 0 @@ -672,7 +673,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_for_service _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Select or create a template – service one – Notify.gov" + "Select or create a template – service one – Notify.gov" ) form_labels = page.select("legend[class=form-label]") assert len(form_labels) == 0 @@ -1161,7 +1162,7 @@ def test_should_show_radios_and_buttons_for_move_destination_if_correct_permissi FOLDER_TWO_ID, ] assert [x.text.strip() for x in radio_div.select("label")] == [ - "Select or create a template", + "Templates", "folder_one", "folder_one_one", "folder_one_two", From 8468b4d5e01673a37bb14fd899a804a5c976b1d4 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 3 Dec 2024 17:05:18 -0800 Subject: [PATCH 12/18] fixed testing --- tests/app/main/views/test_template_folders.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index 8c5f632ee..bb31c8f41 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -346,7 +346,6 @@ def test_should_show_templates_folder_page( **extra_args, ) - assert normalize_spaces(page.select_one("title").text) == expected_page_title assert normalize_spaces(page.select_one("h1").text) == expected_title_tag From 02bffa8c12f58018ebdf0369f199fdb4dbd8fb66 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 3 Dec 2024 17:15:52 -0800 Subject: [PATCH 13/18] fixed testing --- tests/app/main/views/test_accept_invite.py | 2 +- tests/app/main/views/test_templates.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py index 59c4651c6..ef5e56fda 100644 --- a/tests/app/main/views/test_accept_invite.py +++ b/tests/app/main/views/test_accept_invite.py @@ -269,7 +269,7 @@ def test_invite_goes_in_session( ("user", "landing_page_title"), [ (create_active_user_with_permissions(), "Dashboard"), - (create_active_caseworking_user(), "Templates"), + (create_active_caseworking_user(), "Select or create a template"), ], ) def test_accepting_invite_removes_invite_from_session( diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 7676d0f17..68ec6f219 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -581,9 +581,9 @@ def test_should_be_able_to_view_a_template_with_links( _test_page_title=False, ) - assert normalize_spaces(page.select_one("h1").text) == ("Review your message") + assert normalize_spaces(page.select_one("h1").text) == ("Confirm your template") assert normalize_spaces(page.select_one("title").text) == ( - "Two week reminder – Select or create a template – service one – Notify.gov" + "Confirm your template – service one – Notify.gov" ) assert [ From b75d7dcd1260fed74256b3eeda7eda0ed10f0688 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Wed, 4 Dec 2024 10:17:29 -0500 Subject: [PATCH 14/18] style changes --- app/templates/views/templates/template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index d9f163621..4c98f4079 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -32,7 +32,7 @@ {% else %}
-

+

Confirm your template

{{ folder_path( From d684168a9083f8039f15cdcf81ec7dc1e866e10a Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Wed, 4 Dec 2024 11:46:21 -0500 Subject: [PATCH 15/18] Style, clean up, a11y updates --- .../sass/uswds/_uswds-theme-custom-styles.scss | 14 ++++++++++++++ app/templates/components/folder-path.html | 2 +- app/templates/components/service_nav.html | 4 ++-- app/templates/views/templates/choose.html | 3 --- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index 1a1ddc02b..38ae4059f 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -231,6 +231,13 @@ td.table-empty-message { background-position: 0; } +.folder-heading-template { + background: url(../img/material-icons/wysiwyg.svg) no-repeat; + padding-left: units(4); + display: inline-block; + background-position: 0; +} + .usa-checkbox .usa-checkbox__label { + a.template-list-folder { margin-left: units(4); @@ -918,3 +925,10 @@ li.linked-card:hover svg, margin-left: calc(24px + 4px); margin-top: 4px; } + +// Send message flow + +#breadcrumb-template-folders, #nav-service-nav span { + font-size: units(3); + font-weight: bold; +} diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html index 05a577a89..976253ee3 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='nav' ) %} - <{{ root_element }} id="breadcrumb-template-folders" class="navigation-service usa-breadcrumb padding-top-0"> + <{{ root_element }} id="breadcrumb-template-folders" class="navigation-service usa-breadcrumb padding-top-0 padding-bottom-05" aria-label="Template folder path"> {% 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/service_nav.html b/app/templates/components/service_nav.html index 5670b3b48..68d30ce80 100644 --- a/app/templates/components/service_nav.html +++ b/app/templates/components/service_nav.html @@ -6,12 +6,12 @@ {{ current_service.organization_name }} {% endif %} {% endif %} -
+ {{ current_service.name }} {% if not current_service.active %} Suspended {% endif %} -
+ Switch service
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 9c58c59cf..281374c37 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -37,9 +37,6 @@

Every message starts with a template. To send, choose or create a template.

- {# you don't need folder_path unless you're trying to add the parent breadcrumb title to the first - page of the flow, if that's the case, you'll want to delete line 353 within the test_template_folders.py - file. assert len(page.select("nav#breadcrumb-template-folders a")) == len(expected_parent_link_args)#} {{ folder_path( folders=template_folder_path, service_id=current_service.id, From cf45313ad893523582cc66a6e177ee904e065d65 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 4 Dec 2024 14:10:59 -0800 Subject: [PATCH 16/18] added youtube video to about page --- app/__init__.py | 4 ++++ app/templates/views/about/about.html | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 4d89cd59e..369d9db3d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -141,6 +141,10 @@ def _csp(config): logo_domain = config["LOGO_CDN_DOMAIN"] return { "default-src": ["'self'", asset_domain], + "frame-src": [ + "https://www.youtube.com", + "https://www.youtube-nocookie.com", + ], "frame-ancestors": "'none'", "form-action": "'self'", "script-src": [ diff --git a/app/templates/views/about/about.html b/app/templates/views/about/about.html index 17180cef7..f699f9b19 100644 --- a/app/templates/views/about/about.html +++ b/app/templates/views/about/about.html @@ -23,8 +23,7 @@

Notify.gov is an easy-to-use, web-based platform. It requires no technical expertise or system integration — users can create an account and get started within minutes. We take the security and privacy of messaging data seriously by minimizing data retention and using modern encryption methods.

- -

Product Highlights

+

Product Highlights

{% set product_highlights = [ { "svg_src": "#send", From b49f579ece152a8dc0b648841b177928512a6b91 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 4 Dec 2024 14:29:49 -0800 Subject: [PATCH 17/18] updated contact route --- app/main/views/index.py | 2 +- app/templates/views/{about => }/contact.html | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) rename app/templates/views/{about => }/contact.html (85%) diff --git a/app/main/views/index.py b/app/main/views/index.py index 06f07d38c..8abb616db 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -281,7 +281,7 @@ def guidance_index(): @main.route("/contact") def contact(): return render_template( - "views/about/contact.html", + "views/contact.html", ) diff --git a/app/templates/views/about/contact.html b/app/templates/views/contact.html similarity index 85% rename from app/templates/views/about/contact.html rename to app/templates/views/contact.html index 96c3a0895..a2cd4f9c7 100644 --- a/app/templates/views/about/contact.html +++ b/app/templates/views/contact.html @@ -2,12 +2,9 @@ {% set page_title = "Contact" %} -{% block per_page_title %} -{{page_title}} -{% endblock %} +{% block per_page_title %}{{page_title}}{% endblock %} {% block content_column_content %} -

{{page_title}}

Is your organization interested in using Notify.gov? Find more information at Join From 0f7d09ac74a714fc0616987298722a383190e64a Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 4 Dec 2024 14:32:17 -0800 Subject: [PATCH 18/18] fixed flake8 --- app/main/views/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index 8abb616db..4478f225c 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -282,7 +282,7 @@ def guidance_index(): def contact(): return render_template( "views/contact.html", -) + ) @main.route("/about")