From 7c78e59624a13f4c45b31569f84610de85c1d134 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Sun, 19 Jan 2020 07:09:25 -0500
Subject: [PATCH] Update copy on new portfolio form. Style cancel link as a
 button.

---
 atst/forms/portfolio.py              | 1 +
 templates/portfolios/new/step_1.html | 9 ++++-----
 translations.yaml                    | 6 ++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/atst/forms/portfolio.py b/atst/forms/portfolio.py
index 069659bb..591cc080 100644
--- a/atst/forms/portfolio.py
+++ b/atst/forms/portfolio.py
@@ -28,6 +28,7 @@ class PortfolioForm(BaseForm):
 
 class PortfolioCreationForm(PortfolioForm):
     defense_component = SelectMultipleField(
+        translate("forms.portfolio.defense_component.title"),
         choices=SERVICE_BRANCHES,
         widget=ListWidget(prefix_label=False),
         option_widget=CheckboxInput(),
diff --git a/templates/portfolios/new/step_1.html b/templates/portfolios/new/step_1.html
index 4a499821..d3d34a10 100644
--- a/templates/portfolios/new/step_1.html
+++ b/templates/portfolios/new/step_1.html
@@ -12,9 +12,9 @@
   {% include "fragments/flash.html" %}
   <div class='portfolio-header__name'>
     <p>{{ "portfolios.header" | translate }}</p>
-    <h1>{{ "New Portfolio" }}</h1>
+    <h1>{{ "portfolios.new.title" | translate }}</h1>
   </div>
-  {{ StickyCTA(text="Create New Portfolio") }}
+  {{ StickyCTA(text="portfolios.new.cta_step_1"|translate, context=("portfolios.new.sticky_header_context"|translate({"step": "1"}) )) }}
   <base-form inline-template>
     <div class="row">
       <form id="portfolio-create" class="col" action="{{ url_for('portfolios.create_portfolio') }}" method="POST">
@@ -39,9 +39,9 @@
         </div>
         <div class='action-group-footer'>
         {% block next_button %}
-          {{ SaveButton(text=('common.save' | translate), form="portfolio-create", element="input") }}
+          {{ SaveButton(text=('portfolios.new.save' | translate), form="portfolio-create", element="input") }}
         {% endblock %}
-        <a href="{{ url_for('atst.home') }}">
+        <a class="usa-button usa-button-secondary" href="{{ url_for('atst.home') }}">
           Cancel
         </a>
       </form>
@@ -49,4 +49,3 @@
   </base-form>
 </main>
 {% endblock %}
-
diff --git a/translations.yaml b/translations.yaml
index 5b54d702..7153c77a 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -260,6 +260,7 @@ forms:
         marine_corps: Marine Corps
         navy: Navy
         other: Other
+      title: Select DoD component(s) funding your Portfolio
       validation_message: You must select at least one defense component.
       help_text: |
         <p>
@@ -450,6 +451,11 @@ portfolios:
         'False': ""
         'True': Delete Application
   header: PORTFOLIO
+  new:
+    title: New Portfolio
+    cta_step_1: Name and Describe Portfolio
+    sticky_header_context: 'Step {step} of 1'
+    save: Save Portfolio
   members:
     archive_button: Delete member
   reports: