From a9300132f8f26aeb1caaaefac08e530938bb7d5d Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 20 Sep 2019 11:52:51 -0400
Subject: [PATCH] Move modal out of the table and fix button styling

---
 styles/sections/_task_order.scss     |  4 ++++
 templates/applications/settings.html | 28 ++++++++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index e4a42843..9e0f26a8 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -274,6 +274,10 @@
 .task-order__modal-cancel_buttons {
   display: flex;
   justify-content: center;
+
+  button {
+    margin-top: 0;
+  }
 }
 
 .clin-card {
diff --git a/templates/applications/settings.html b/templates/applications/settings.html
index d2937b89..96d38c85 100644
--- a/templates/applications/settings.html
+++ b/templates/applications/settings.html
@@ -138,6 +138,22 @@
               </form>
             </base-form>
           {% endcall %}
+
+          {% if user_can(permissions.DELETE_APPLICATION_MEMBER) and member.role_status == 'pending' %}
+            {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %}
+            {% call Modal(name=revoke_invite_modal, dismissable=True) %}
+              <div class="task-order__modal-cancel">
+                <form method="post" action="{{ url_for('applications.revoke_invite', application_id=application.id, application_role_id=member.role_id) }}">
+                  {{ member.form.csrf_token }}
+                  <h1>Do you want to revoke the invite for {{ member.user_name }}</h1>
+                  <div class="task-order__modal-cancel_buttons">
+                    <button class="usa-button usa-button-primary" type="submit">Yes, revoke it</button>
+                    <button type='button' v-on:click='closeModal("{{revoke_invite_modal}}")' class="usa-button usa-button-primary">No, do not revoke it</button>
+                  </div>
+                </form>
+              </div>
+            {% endcall %}
+          {% endif %}
         {% endfor %}
         <table>
           <thead>
@@ -177,18 +193,6 @@
                 <td>
                   {% if user_can(permissions.DELETE_APPLICATION_MEMBER) and member.role_status == 'pending' %}
                     {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %}
-                    {% call Modal(name=revoke_invite_modal, dismissable=True) %}
-                      <div class="task-order__modal-cancel">
-                        <form method="post" action="{{ url_for('applications.revoke_invite', application_id=application.id, application_role_id=member.role_id) }}">
-                          {{ member.form.csrf_token }}
-                          <h1>Do you want to revoke the invite for {{ member.user_name }}</h1>
-                          <div class="task-order__modal-cancel_buttons">
-                            <button class="usa-button usa-button-primary" type="submit">Yes, revoke it</button>
-                            <button type='button' v-on:click='closeModal("{{revoke_invite_modal}}")' class="usa-button usa-button-primary">No, do not revoke it</button>
-                          </div>
-                        </form>
-                      </div>
-                    {% endcall %}
                     <a href="#">Resend Invite</a><br>
                     <a v-on:click='openModal("{{ revoke_invite_modal }}")'>Revoke Invite</a>
                   {% endif %}