From c407b9824f824260398b5a693415c0fd00d28677 Mon Sep 17 00:00:00 2001
From: Luis Cielak <luis+dds@promptworks.com>
Date: Mon, 9 Jul 2018 14:34:03 -0400
Subject: [PATCH] Reorganized form fields and updated some texts

---
 atst/forms/financial.py             |  4 ++--
 templates/requests/screen-1.html.to | 24 +++++++++++++++---------
 templates/requests/screen-5.html.to |  5 +++++
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/atst/forms/financial.py b/atst/forms/financial.py
index 34b7a8fc..5654495b 100644
--- a/atst/forms/financial.py
+++ b/atst/forms/financial.py
@@ -12,11 +12,11 @@ class FinancialForm(Form):
     )
 
     uii_ids = NewlineListField(
-        "Please enter the Unique Item Identifier (UII)s related to your application(s) if you already have them."
+        "Unique Item Identifier (UII)s related to your application(s) if you already have them."
     )
 
     pe_id = NewlineListField(
-        "Please provide the Program Element (PE) Numbers related to your request"
+        "Program Element (PE) Numbers related to your request"
     )
 
     fname_co = StringField("Contracting Officer First Name", validators=[Required()])
diff --git a/templates/requests/screen-1.html.to b/templates/requests/screen-1.html.to
index 4d16ee9c..e82ad01f 100644
--- a/templates/requests/screen-1.html.to
+++ b/templates/requests/screen-1.html.to
@@ -10,6 +10,7 @@
 
 
 <!-- DETAILS OF USE -->
+<!-- Overall Request Details -->
 
 <h3 id="overall-request-details">Overall Request Details</h3>
 <p>Please help us understand the size and scope of your resource request.</p>
@@ -38,14 +39,6 @@
   </div>
 {% end %}
 
-{{ f.supported_organizations.label }}
-{{ f.supported_organizations(placeholder="Add tags associated with DoD components or other entities") }}
-{% for e in f.supported_organizations.errors %}
-  <div class="usa-input-error-message">
-    {{ e }}
-  </div>
-{% end %}
-
 {{ f.app_description.label }}
 {{ f.app_description(placeholder="Example: My organization is supporting the migration of XYZ system to the cloud due to XX policy memo. I am planning to use a sandbox environment to do testing.") }}
 {% for e in f.app_description.errors %}
@@ -54,8 +47,19 @@
   </div>
 {% end %}
 
+{{ f.supported_organizations.label }}
+{{ f.supported_organizations(placeholder="Add tags associated with DoD components or other entities") }}
+{% for e in f.supported_organizations.errors %}
+  <div class="usa-input-error-message">
+    {{ e }}
+  </div>
+{% end %}
+
+
+<!-- Cloud Resources -->
+
 <h3 id="cloud-resources">Cloud Resources</h3>
-<p>Please tell us about your expected cloud resource usage as best as you can. Please refer to the <a href="">Cloud Service Provider</a> as necessary.</p>
+<p>Please tell us about your expected cloud resource usage as best as you can. Refer to the <a href="">Cloud Service Provider</a> as necessary.</p>
 
 {{ f.total_cores.label }}
 {{ f.total_cores(placeholder="Expected total cores", min="1", max="32") }}
@@ -98,6 +102,8 @@
 {% end %}
 
 
+<!-- Support Staff -->
+
 <h3 id="support-staff">Support Staff</h3>
 <p>We want to learn more about the people helping you with the cloud.</p>
 
diff --git a/templates/requests/screen-5.html.to b/templates/requests/screen-5.html.to
index 813cac4f..0a87e206 100644
--- a/templates/requests/screen-5.html.to
+++ b/templates/requests/screen-5.html.to
@@ -36,6 +36,8 @@
 {% end %}
 
 
+<!-- KO Information -->
+
 <h3>Contracting Officer (KO) Information</h3>
 
 {{ f.fname_co.label }}
@@ -70,6 +72,9 @@
   </div>
 {% end %}
 
+
+<!-- COR Information -->
+
 <h3>Contracting Officer Representative (COR) Information</h3>
 
 {{ f.fname_cor.label }}