From b3467a172219a020ce54a66894caa26271f585eb Mon Sep 17 00:00:00 2001
From: graham-dds <graham.beckley-ctr@friends.dds.mil>
Date: Fri, 4 Oct 2019 10:18:50 -0400
Subject: [PATCH] app provisioning Step 3 changes

- rearrange markup in the template
- include text from translations
---
 templates/applications/new/step_3.html | 37 ++++++++++++++++++--------
 translations.yaml                      |  1 +
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/templates/applications/new/step_3.html b/templates/applications/new/step_3.html
index 6b2dbde3..7c1d6b6b 100644
--- a/templates/applications/new/step_3.html
+++ b/templates/applications/new/step_3.html
@@ -10,17 +10,32 @@
 {% endblock %}
 
 {% block application_content %}
+  {% include "fragments/flash.html" %}
+  <div class="panel__content">
+    <p>
+      {{ ('portfolios.applications.new.step_3_description' | translate) }}
+    </p>
+    <hr class="panel__break">
+    
     {{ MemberManagementTemplate(
-    application, 
-    members, 
-    new_member_form,
-    "applications.update_new_application_step_3",
-    user_can(permissions.CREATE_APPLICATION_MEMBER)) }}
-
-    <span class="action-group">
-      <a class="usa-button" href="{{ url_for('applications.settings', application_id=application_id) }}">  
-        Return to Application Settings
-      </a>
-    </span>
+      application, 
+      members, 
+      new_member_form,
+      "applications.update_new_application_step_3",
+      user_can(permissions.CREATE_APPLICATION_MEMBER)) }}
+      
+  
+      <span class="action-group">
+        <a class="usa-button" href="{{ url_for('applications.settings', application_id=application_id) }}">  
+          Return to Application Settings
+        </a>
+        <a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_2', application_id=application.id) }}">
+          Previous
+        </a>
+        <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
+          Cancel
+        </a>
+      </span>
+  </div>
 {% endblock %}
 
diff --git a/translations.yaml b/translations.yaml
index e55ce7e1..227cb942 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -340,6 +340,7 @@ portfolios:
       step_2_description: "Production, Staging, Testing, and Development environments are included by default. However, you can add, edit, and delete environments based on the needs of your Project."
       step_2_button_text: "Save and Add Members"
       step_3_header: Invite Members to {application_name}
+      step_3_description: "To proceed, you will need each member's email address and DOD ID. Within this section, you will also assign application-level permissions and environment-level roles for each member."
       step_3_button_text: Save Application
     create_new_env: Create a new environment.
     create_new_env_info: Creating an environment gives you access to the Cloud Service Provider. This environment will function within the constraints of the task order, and any costs will be billed against the portfolio.