diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py index e2b4316fb..f0eab1908 100644 --- a/app/main/views/feedback.py +++ b/app/main/views/feedback.py @@ -52,7 +52,7 @@ def support(): else: return redirect(url_for( '.feedback', - ticket_type=QUESTION_TICKET_TYPE, + ticket_type=PROBLEM_TICKET_TYPE, )) return render_template('views/support/index.html', form=form) @@ -144,9 +144,9 @@ def feedback(ticket_type): form.feedback.data = get_prefilled_message() return render_template( - 'views/support/{}.html'.format(ticket_type), + 'views/support/{}.html'.format(PROBLEM_TICKET_TYPE), form=form, - ticket_type=ticket_type, + is_problem=(ticket_type == PROBLEM_TICKET_TYPE), ) diff --git a/app/templates/views/support/report-problem.html b/app/templates/views/support/report-problem.html index e2e9b4660..342d5cd5d 100644 --- a/app/templates/views/support/report-problem.html +++ b/app/templates/views/support/report-problem.html @@ -5,24 +5,28 @@ {% from "components/page-header.html" import page_header %} {% from "components/form.html" import form_wrapper %} +{% set page_title = 'Report a problem' if is_problem else 'Ask a question or give feedback' %} + {% block per_page_title %} - Report a problem + {{ page_title }} {% endblock %} {% block maincolumn_content %} {{ page_header( - 'Report a problem', + page_title, back_link=url_for('.support') ) }}
-
-

- Check our system status - page to see if there are any known issues with GOV.UK Notify. -

-
+ {% if is_problem %} +
+

+ Check our system status + page to see if there are any known issues with GOV.UK Notify. +

+
+ {% endif %} {% call form_wrapper() %} {{ textbox(form.feedback, width='1-1', hint='', rows=10, autosize=True) }} {% if not current_user.is_authenticated %} diff --git a/tests/app/main/views/test_feedback.py b/tests/app/main/views/test_feedback.py index 0a2cd3a58..b7250be42 100644 --- a/tests/app/main/views/test_feedback.py +++ b/tests/app/main/views/test_feedback.py @@ -96,7 +96,7 @@ def test_get_support_as_someone_in_the_public_sector( _follow_redirects=True, ) assert normalize_spaces(page.select('h1')) == ( - 'Ask a question or give feedback' + 'Report a problem' ) assert page.select_one('form textarea[name=feedback]') assert page.select_one('form input[name=name]')