From b32d7e1f97bb207c43f427ab50a43ee0cd0695f8 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Tue, 10 Sep 2019 10:13:55 -0400
Subject: [PATCH] Reorder form and update text

---
 .../new_member_modal_content.html             | 134 +++++++-----------
 1 file changed, 51 insertions(+), 83 deletions(-)

diff --git a/templates/fragments/applications/new_member_modal_content.html b/templates/fragments/applications/new_member_modal_content.html
index 92f34dcf..d25c66a3 100644
--- a/templates/fragments/applications/new_member_modal_content.html
+++ b/templates/fragments/applications/new_member_modal_content.html
@@ -34,90 +34,58 @@
   </div>
 {% endmacro %}
 {% macro MemberStepTwo(new_member_form, application) %}
-  <div class="modal__form">
-    <div class="modal__form--header">
-      <h1>{{ "portfolios.applications.members.new.assign_roles" | translate }}</h1>
-      <a class='icon-link'>
-        {{ Icon('info') }}
-        {{ "portfolios.applications.members.new.learn_more" | translate }}
-      </a>
-      <div class="environment-roles-new">
-        <div class="form-row">
-          <div class="form-col form-col--quarter">
-            <span class="environment-roles-new__head">
-              {{ "common.resource_names.environments" | translate }}:
-            </span>
-          </div>
-          <div class="form-col form-col--three-quarters">
-            <span class="environment-roles-new__head">
-              {{ "common.choose_role" | translate }}:
-            </span>
-          </div>
-        </div>
-        {% for environment_data in new_member_form.environment_roles %}
-          <optionsinput inline-template
-            v-bind:initial-value="'{{ environment_data.role.data | string }}'"
-            v-bind:name="'{{ environment_data.name | string }}'"
-            v-bind:optional="true"
-          >
-            <div class="usa-input">
-              <fieldset data-ally-disabled="true" class="usa-input__choices">
-                <div class="form-row">
-                  <div class="form-col form-col--quarter">
-                    <legend>
-                      <div v-bind:class='["usa-input__title-inline", {"environment-name--gray": value === "None" }]'>
-                        {{ environment_data.environment_name.data }}
-                      </div>
-                    </legend>
+  <div class="modal__form--header">
+    <h1>{{ Icon('avatar') }} Set Permissions and Roles</h1>
+    <hr>
+  </div>
+
+  <h4>Project Permissions</h4>
+  {{ CheckboxInput(new_member_form.permission_sets.perms_team_mgmt, classes="input__inline-fields") }}
+  {{ CheckboxInput(new_member_form.permission_sets.perms_env_mgmt, classes="input__inline-fields") }}
+  {{ CheckboxInput(new_member_form.permission_sets.perms_del_env, classes="input__inline-fields") }}
+
+  <div class="environment-roles-new">
+    <h4>Environment Access</h4>
+    <hr>
+    {% for environment_data in new_member_form.environment_roles %}
+      <optionsinput inline-template
+        v-bind:initial-value="'{{ environment_data.role.data | string }}'"
+        v-bind:name="'{{ environment_data.name | string }}'"
+        v-bind:optional="true"
+      >
+        <div class="usa-input">
+          <fieldset data-ally-disabled="true" class="usa-input__choices">
+            <div class="form-row">
+              <div class="form-col form-col--two-thirds">
+                <legend>
+                  <div v-bind:class='["usa-input__title-inline", {"environment-name--gray": value === "None" }]'>
+                    {{ environment_data.environment_name.data }}
                   </div>
-                  <div class="form-col form-col--three-quarters">
-                    {{ environment_data.role(**{"v-model": "value"}) }}
-                  </div>
-                </div>
-              </fieldset>
+                </legend>
+              </div>
+              <div class="form-col form-col--third">
+                {{ environment_data.role(**{"v-model": "value"}) }}
+              </div>
             </div>
-          </optionsinput>
-          {{ environment_data.environment_id() }}
-        {% endfor %}
-      </div>
-      <h1>{{ "portfolios.applications.members.new.manage_perms" | translate({"application_name": application.name}) }}</h1>
-      {{ CheckboxInput(new_member_form.permission_sets.perms_team_mgmt, classes="input__inline-fields") }}
-      {% call CheckboxInput(new_member_form.permission_sets.perms_env_mgmt, classes="input__inline-fields") %}
-        {% set field=new_member_form.permission_sets.perms_del_env %}
-        <nestedcheckboxinput
-          name='{{ field.name }}'
-          inline-template
-          key='{{ field.name }}'
-          v-bind:is-parent-checked="isChecked"
-          >
-          <div class="usa-input input__inline-fields input__inline-fields--indented">
-            <fieldset data-ally-disabled="true" class="usa-input__choices usa-input__choices--inline">
-              <legend>
-                <input
-                  id="permission_sets-perms_del_env"
-                  name="permission_sets-perms_del_env"
-                  type="checkbox"
-                  v-model="isChecked"
-                  v-bind:disabled="!$parent.isChecked">
-                {{ field.label | safe }}
-              </legend>
-            </fieldset>
-          </div>
-        </checkboxinput>
-      {% endcall %}
-    </div>
-    <div class='action-group'>
-      <input
-        type="submit"
-        class='action-group__action usa-button'
-        form="add-app-mem"
-        value='Invite member'>
-      <a class='action-group__action icon-link icon-link--default' v-on:click="closeModal('{{ new_port_mem }}')">{{ "common.cancel" | translate }}</a>
-      <input
-          type='button'
-          v-on:click="previous()"
-          class='action-group__action usa-button action-group__action--left'
-          value='Previous step'>
-    </div>
+          </fieldset>
+        </div>
+      </optionsinput>
+      {{ environment_data.environment_id() }}
+      <hr>
+    {% endfor %}
+  </div>
+
+  <div class='action-group'>
+    <input
+      type="submit"
+      class='action-group__action usa-button'
+      form="add-app-mem"
+      value='Add Member'>
+    <a class='action-group__action icon-link icon-link--default' v-on:click="closeModal('{{ new_port_mem }}')">{{ "common.cancel" | translate }}</a>
+    <input
+        type='button'
+        v-on:click="previous()"
+        class='action-group__action usa-button action-group__action--left'
+        value='Previous'>
   </div>
 {% endmacro %}