From 6b15b41d560dda7a0fa972f4706c346a1f702ef9 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 8 Aug 2019 10:00:20 -0400
Subject: [PATCH] Formatting and styling of form

---
 templates/ccpo/add_user.html     | 28 +++++++++++++---------------
 templates/ccpo/confirm_user.html | 17 ++++++-----------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/templates/ccpo/add_user.html b/templates/ccpo/add_user.html
index 5647e144..505ab20b 100644
--- a/templates/ccpo/add_user.html
+++ b/templates/ccpo/add_user.html
@@ -3,25 +3,23 @@
 {% from "components/text_input.html" import TextInput %}
 
 {% block content %}
-  {% set ccpo_user_form = "add-ccpo-user-form" %}
-
-  <form id="{{ ccpo_user_form }}" action="{{ url_for('atst.submit_add_new_ccpo_user') }}" method="POST">
+  <form id="add-ccpo-user-form" action="{{ url_for('atst.submit_add_new_ccpo_user') }}" method="POST">
     {{ form.csrf_token }}
-    <div class="modal__form--header">
-      <h1>Add new CCPO user</h1>
-    </div>
+    <h1>Add new CCPO user</h1>
     <div class='form-row'>
-      <div class='form-col'>
+      <div class='form-col form-col--two-thirds'>
         {{ TextInput(form.dod_id, validation='dodId') }}
       </div>
-    </div>
-    <div class='action-group'>
-      <input
-          type='submit'
-          v-bind:disabled="invalid"
-          class='action-group__action usa-button'
-          value='Next'>
-      <a class='action-group__action icon-link icon-link--default' href="{{ url_for('atst.ccpo_users') }}">{{ "common.cancel" | translate }}</a>
+      <div class="form-col form-col--third">
+        <div class='action-group'>
+          <input
+              type='submit'
+              v-bind:disabled="invalid"
+              class='action-group__action usa-button'
+              value='Next'>
+          <a class='action-group__action icon-link icon-link--default' href="{{ url_for('atst.ccpo_users') }}">{{ "common.cancel" | translate }}</a>
+        </div>
+      </div>
     </div>
   </form>
 {% endblock %}
diff --git a/templates/ccpo/confirm_user.html b/templates/ccpo/confirm_user.html
index d9cb610f..2012fc0f 100644
--- a/templates/ccpo/confirm_user.html
+++ b/templates/ccpo/confirm_user.html
@@ -5,11 +5,8 @@
 
 {% block content %}
   {% if new_user %}
-    {% set ccpo_user_form = "add-ccpo-user-form" %}
-
     {% call Alert('Confirm new CCPO user') %}
-
-      <form id="{{ ccpo_user_form }}" action="{{ url_for('atst.confirm_new_ccpo_user') }}" method="POST">
+      <form id="add-ccpo-user-form" action="{{ url_for('atst.confirm_new_ccpo_user') }}" method="POST">
         {{ form.csrf_token }}
         <input type="hidden" name="dod_id" value="{{ form.dod_id.data }}">
         <div>
@@ -35,13 +32,11 @@
     {% endcall %}
   {% else %}
     {% call Alert('User not found') %}
-      <div>
-        To add someone as a CCPO user, they must already have an ATAT account.
-        <div class='action-group'>
-          <a class='action-group__action icon-link icon-link--default' href="{{ url_for('atst.ccpo_users') }}">
-            Return to list of CCPO users
-          </a>
-        </div>
+      To add someone as a CCPO user, they must already have an ATAT account.
+      <div class='action-group'>
+        <a class='action-group__action icon-link icon-link--default' href="{{ url_for('atst.ccpo_users') }}">
+          Return to list of CCPO users
+        </a>
       </div>
     {% endcall %}
   {% endif %}