From 09ce3510aa5b20e926e805bd7dbbbc407443330c Mon Sep 17 00:00:00 2001
From: Andrew Croce <andrew+dds@promptworks.com>
Date: Tue, 7 Aug 2018 12:06:50 -0400
Subject: [PATCH] Fix form markup

---
 templates/requests_new.html | 48 +++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/templates/requests_new.html b/templates/requests_new.html
index 559c2355..23c4491b 100644
--- a/templates/requests_new.html
+++ b/templates/requests_new.html
@@ -6,39 +6,41 @@
 
   {% include 'requests/menu.html' %}
 
-  <div class="panel">
+  {% block form_action %}
+    {% if request_id %}
+      <form method='POST' action="{{ url_for('requests.requests_form_update', screen=current, request_id=request_id) }}" autocomplete="off">
+    {% else %}
+      <form method='POST' action="{{ url_for('requests.requests_form_update', screen=current) }}" autocomplete="off">
+    {% endif %}
+  {% endblock %}
 
-    <div class="panel__heading">
-      <h1>New Request</h1>
-      <div class="subtitle">{% block subtitle %}{% endblock %}</div>
-    </div>
+    <div class="panel">
 
-    <div class="panel__content">
-      {% block form_action %}
-        {% if request_id %}
-          <form method='POST' action="{{ url_for('requests.requests_form_update', screen=current, request_id=request_id) }}" autocomplete="off">
-        {% else %}
-          <form method='POST' action="{{ url_for('requests.requests_form_update', screen=current) }}" autocomplete="off">
-        {% endif %}
-      {% endblock %}
+      <div class="panel__heading">
+        <h1>New Request</h1>
+        <div class="subtitle">{% block subtitle %}{% endblock %}</div>
+      </div>
 
-      {{ f.csrf_token }}
-      {% block form %}
-      form goes here
-      {% endblock %}
+      <div class="panel__content">
+
+        {{ f.csrf_token }}
+        {% block form %}
+        form goes here
+        {% endblock %}
+
+      </div>
 
     </div>
 
-  </div>
-
     {% block next %}
 
-    <div class='action-group'>
-      <input type='submit' class='usa-button usa-button-primary' value='Save & Continue' />
-    </div>
+      <div class='action-group'>
+        <input type='submit' class='usa-button usa-button-primary' value='Save & Continue' />
+      </div>
 
     {% endblock %}
-</form>
+
+  </form>
 
 </div>