From 02a4f9284087f8461930e2f577dbc3052690e828 Mon Sep 17 00:00:00 2001
From: graham-dds <graham.beckley-ctr@friends.dds.mil>
Date: Fri, 27 Sep 2019 11:57:28 -0400
Subject: [PATCH] Clean up templates

- Make sure heading includes app name
- Remove "back to applications" link
- Add "submit" link button to step 3
---
 templates/applications/new/step_1.html            | 10 ++++++----
 templates/applications/new/step_2.html            |  9 ++++++---
 templates/portfolios/applications/new/step_3.html | 13 +++++++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/templates/applications/new/step_1.html b/templates/applications/new/step_1.html
index e5d95922..4c2e0fa3 100644
--- a/templates/applications/new/step_1.html
+++ b/templates/applications/new/step_1.html
@@ -12,13 +12,15 @@
     {% set action = url_for('applications.create_new_application_step_1', portfolio_id=portfolio.id, application_id=application_id) %}
   {% endif %}
 
-
+{% block portfolio_header %}
+  {% include "portfolios/header.html" %}
+  {{ StickyCTA(text="Name and Describe New Application") }}
+{% endblock %}
+  
 {% block application_content %}
 
   {% include "fragments/flash.html" %}
 
-  <div class='subheading'>{{ 'portfolios.applications.settings_heading' | translate }}</div>
-
   <application-name-and-description inline-template v-bind:initial-data='{{ form.data|tojson }}'>
     <form method="POST" action="{{ action }}" v-on:submit="handleSubmit">
       <div class="panel">
@@ -42,7 +44,7 @@
 
         <span class="action-group">
           {% block next_button %}
-            {{ SaveButton(text=('portfolios.applications.next_button_text' | translate)) }}
+            {{ SaveButton(text=('portfolios.applications.new.step_1_button_text' | translate)) }}
           {% endblock %}
         </span>
     </form>
diff --git a/templates/applications/new/step_2.html b/templates/applications/new/step_2.html
index a737c349..fa0954e7 100644
--- a/templates/applications/new/step_2.html
+++ b/templates/applications/new/step_2.html
@@ -7,14 +7,17 @@
 
 {% set secondary_breadcrumb = 'portfolios.applications.new_application_title' | translate %}
 
+{% block portfolio_header %}
+  {{ StickyCTA(text=application.name) }}
+{% endblock %}
+
 {% block application_content %}
 
   {% set modalName = "newApplicationConfirmation" %}
   {% include "fragments/flash.html" %}
 
-  <div class='subheading'>{{ 'portfolios.applications.settings_heading' | translate }}</div>
   <application-environments inline-template v-bind:initial-data='{{ form.data|tojson }}'>
-    <form method="POST" action="{{ url_for('applications.view_new_application_step_2', portfolio_id=portfolio.id, application_id=application_id) }}" v-on:submit="handleSubmit">
+    <form method="POST" action="{{ url_for('applications.update_new_application_step_2', portfolio_id=portfolio.id, application_id=application.id) }}" v-on:submit="handleSubmit">
       <div class="panel">
         <div class="panel__content">
           {{ form.csrf_token }}
@@ -63,7 +66,7 @@
 
       <span class="action-group">
         {% block next_button %}
-          {{ SaveButton(text=('portfolios.applications.create_button_text' | translate)) }}
+          {{ SaveButton(text=('portfolios.applications.new.step_2_button_text' | translate)) }}
         {% endblock %}
       </span>
     </form>
diff --git a/templates/portfolios/applications/new/step_3.html b/templates/portfolios/applications/new/step_3.html
index 6d255831..ac55d077 100644
--- a/templates/portfolios/applications/new/step_3.html
+++ b/templates/portfolios/applications/new/step_3.html
@@ -1,8 +1,14 @@
+
 {% extends "portfolios/applications/base.html" %}
 
 {% from "portfolios/applications/fragments/members.html" import MemberManagementTemplate %}
 {% set secondary_breadcrumb = 'portfolios.applications.new_application_title' | translate %}
 
+{% block portfolio_header %}
+  {% include "portfolios/header.html" %}
+  {{ StickyCTA(text=application.name) }}
+{% endblock %}
+
 {% block application_content %}
     {{ MemberManagementTemplate(
     application, 
@@ -10,4 +16,11 @@
     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>
 {% endblock %}
+