From 55e377baf629877a33e426f95caeaac73f372b47 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 24 Mar 2020 15:30:43 +0000
Subject: [PATCH] Rename and delete form templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`report-a-problem’ becomes `form` because it’s not just being used for
problems.

'ask-a-question' gets deleted because it’s not being used.
---
 app/main/views/feedback.py                    |  2 +-
 .../support/ask-question-give-feedback.html   | 32 -------------------
 .../{report-problem.html => form.html}        |  0
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 app/templates/views/support/ask-question-give-feedback.html
 rename app/templates/views/support/{report-problem.html => form.html} (100%)

diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py
index f0eab1908..843d3f802 100644
--- a/app/main/views/feedback.py
+++ b/app/main/views/feedback.py
@@ -144,7 +144,7 @@ def feedback(ticket_type):
         form.feedback.data = get_prefilled_message()
 
     return render_template(
-        'views/support/{}.html'.format(PROBLEM_TICKET_TYPE),
+        'views/support/form.html',
         form=form,
         is_problem=(ticket_type == PROBLEM_TICKET_TYPE),
     )
diff --git a/app/templates/views/support/ask-question-give-feedback.html b/app/templates/views/support/ask-question-give-feedback.html
deleted file mode 100644
index 77e9ec8f9..000000000
--- a/app/templates/views/support/ask-question-give-feedback.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
-{% from "components/page-footer.html" import sticky_page_footer %}
-{% from "components/page-header.html" import page_header %}
-{% from "components/form.html" import form_wrapper %}
-
-{% block per_page_title %}
-  Ask a question or give feedback
-{% endblock %}
-
-{% block maincolumn_content %}
-
-    {{ page_header(
-      'Ask a question or give feedback',
-      back_link=url_for('.support')
-    ) }}
-    <div class="govuk-grid-row">
-      <div class="govuk-grid-column-two-thirds">
-        {% call form_wrapper() %}
-            {{ textbox(form.feedback, width='1-1', hint='', rows=10, autosize=True) }}
-            {% if not current_user.is_authenticated %}
-              {{ textbox(form.name, width='1-1') }}
-              {{ textbox(form.email_address, width='1-1') }}
-            {% else %}
-              <p>We’ll reply to {{ current_user.email_address }}</p>
-            {% endif %}
-            {{ sticky_page_footer('Send') }}
-        {% endcall %}
-      </div>
-    </div>
-
-{% endblock %}
diff --git a/app/templates/views/support/report-problem.html b/app/templates/views/support/form.html
similarity index 100%
rename from app/templates/views/support/report-problem.html
rename to app/templates/views/support/form.html