Merge branch 'staging' into grid-styling

templates/applications/fragments/environments.html

@@ -84,7 +84,7 @@
                               {{ TextInput(edit_form.name, validation='requiredField', optional=False) }}
                               {{
                                 SaveButton(
-                                  text=("common.save" | translate)
+                                  text=("common.save_changes" | translate)
                                 )
                               }}
                             </form>

templates/applications/fragments/member_form_fields.html

@@ -21,7 +21,7 @@
               {{ sub_form.environment_name.data }}
             </div>
             <div class="usa-input__help">
-              {{ role }}
+              {{ "portfolios.applications.members.roles.{}".format(role) | translate }}
             </div>
           </div>
           <div class="form-col form-col--third">
@@ -124,6 +124,6 @@
     {{ TextInput(member_form.email, validation='email', optional=False) }}
     {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}}
     {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }}
-    <a href="#">How do I find the DoD ID?</a>
+    <a href="#">{{ "forms.new_member.dod_help" | translate }}</a>
   </div>
 {% endmacro %}

templates/applications/fragments/members.html

@@ -46,7 +46,7 @@
               {{ member_form.SubmitStep(
                 name=modal_name,
                 form=member_fields.PermsFields(form=member.form, member_role_id=member.role_id),
-                submit_text="Update",
+                submit_text="common.save_changes"|translate,
                 previous=False,
                 modal=modal_name,
               ) }}
@@ -179,7 +179,7 @@
           member_form.SubmitStep(
             name=new_member_modal_name,
             form=member_fields.PermsFields(form=new_member_form, new=True),
-            submit_text="portfolios.applications.members.form.add_member"|translate,
+            submit_text="common.save_changes"|translate,
             modal=new_member_modal_name,
           )
         ],

templates/applications/new/step_3.html

@@ -27,13 +27,13 @@
 
   <span class="action-group-footer">
     <a class="usa-button" href="{{ url_for('applications.settings', application_id=application_id) }}">
-      Return to Application Settings
+      {{ "portfolios.applications.new.step_3_button_text" | translate }}
     </a>
     <a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_2', application_id=application.id) }}">
-      Previous
+      {{ "common.previous" | translate }}
     </a>
     <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
-      Cancel
+      {{ "common.cancel" | translate }}
     </a>
   </span>
 

templates/components/clin_fields.html

@@ -118,7 +118,7 @@
         {{ CLINDollarAmount("obligated", funding_validation=True) }}
         {% endif %}
 
-        <div class="h5 clin-card__title">Percent Obligated</div>
+        <div class="h5 clin-card__title">{{ "task_orders.form.step_3.percent_obligated" | translate }}</div>
         <p id="percent-obligated" v-text='percentObligated'></p>
 
         <hr>

templates/error.html

@@ -17,15 +17,6 @@
         {%- endif %}
       </p>
     </div>
-    <div class="panel__body">
-      <hr>
-      <p>
-        {{ "common.lorem" | translate }}
-      </p>
-      <p>
-        <a href="#">More lorem</a>
-      </p>
-    </div>
 </main>
 
 {% endblock %}

templates/portfolios/fragments/member_form_fields.html

@@ -32,6 +32,6 @@
     {{ TextInput(member_form.email, validation='email', optional=False) }}
     {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}}
     {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }}
-    <a href="#">How do I find the DoD ID?</a>
+    <a href="#">{{ "forms.new_member.dod_help" | translate }}</a>
   </div>
 {% endmacro %}

templates/portfolios/new/step_1.html

@@ -15,8 +15,7 @@
       <p>{{ "portfolios.header" | translate }}</p>
       <h1>{{ "New Portfolio" }}</h1>
     </div>
-  </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">
@@ -41,9 +40,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>
@@ -51,4 +50,3 @@
   </base-form>
 </main>
 {% endblock %}
-

templates/portfolios/reports/portfolio_summary.html

@@ -5,15 +5,15 @@
 <section class="row">
   <div class='col col--grow summary-item'>
     <h5 class="summary-item__header">
-      <span class="summary-item__header-text">Total Portfolio Value</span>
-      {{Tooltip(("common.lorem" | translate), title="", classes="summary-item__header-icon")}}
+      <span class="summary-item__header-text">{{ "portfolios.reports.total_value.header" | translate }}</span>
+      {{Tooltip(("portfolios.reports.total_value.tooltip" | translate), title="", classes="summary-item__header-icon")}}
     </h5>
     <p class="summary-item__value">{{ total_portfolio_value | dollars }}</p>
   </div>
   <div class='col col--grow summary-item'>
     <h5 class="summary-item__header">
-      <span class="summary-item__header-text">Funding Duration</span>
-      {{Tooltip(("common.lorem" | translate), title="", classes="summary-item__header-icon")}}
+      <span class="summary-item__header-text">{{ "portfolios.reports.duration.header" | translate }}</span>
+      {{Tooltip(("portfolios.reports.duration.tooltip" | translate), title="", classes="summary-item__header-icon")}}
     </h5>
     {% set earliest_pop_start_date, latest_pop_end_date = portfolio.funding_duration %}
     {% if earliest_pop_start_date and latest_pop_end_date  %}
@@ -28,8 +28,8 @@
   </div>
   <div class='col col--grow summary-item'>
     <h5 class="summary-item__header">
-      <span class="summary-item__header-text">Days Remaining</span>
-      {{Tooltip(("common.lorem" | translate), title="", classes="summary-item__header-icon")}}
+      <span class="summary-item__header-text">{{ "portfolios.reports.days_remaining.header" | translate }}</span>
+      {{Tooltip(("portfolios.reports.days_remaining.toolip" | translate), title="", classes="summary-item__header-icon")}}
     </h5>
     <p class="summary-item__value">{{ portfolio.days_to_funding_expiration }} days</p>
   </div>

templates/task_orders/fragments/task_order_view.html

@@ -11,16 +11,7 @@
     <section class="row">
       <div class='col col--grow summary-item'>
         <h4 class="summary-item__header">
-          <span class="summary-item__header-text">Total obligated funds</span>
-          {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }}
-        </h4>
-        <p class="summary-item__value--large">
-          {{ obligated_funds | dollars }}
-        </p>
-      </div>
-      <div class='col col--grow summary-item'>
-        <h4 class="summary-item__header">
-          <span class="summary-item__header-text">Total Task Order value</span>
+          <span class="summary-item__header-text">{{ 'task_orders.summary.total' | translate }}</span>
           {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }}
         </h4>
         <p class="summary-item__value--large">
@@ -29,7 +20,16 @@
       </div>
       <div class='col col--grow summary-item'>
         <h4 class="summary-item__header">
-          <span class="summary-item__header-text">Total expended funds</span>
+          <span class="summary-item__header-text">{{ 'task_orders.summary.obligated' | translate }}</span>
+          {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }}
+        </h4>
+        <p class="summary-item__value--large">
+          {{ obligated_funds | dollars }}
+        </p>
+      </div>
+      <div class='col col--grow summary-item'>
+        <h4 class="summary-item__header">
+          <span class="summary-item__header-text">{{ 'task_orders.summary.expended' | translate }}</span>
           {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="summary-item__header-icon") }}
         </h4>
         <p class="summary-item__value--large">
@@ -39,7 +39,7 @@
     </section>
     <hr>
     <section>
-      <h4>Documents</h4>
+      <h4>{{ 'task_orders.form.step_4.documents' | translate }}</h4>
       <div class="panel panel__content">
         {% if builder_mode %}
           {{ Icon('ok', classes="icon--green icon--medium") }}
@@ -52,7 +52,7 @@
     </section>
     <hr>
     <section>
-      <h4>CLIN summary</h4>
+      <h4>{{ 'task_orders.form.step_4.clins' | translate }}</h4>
       <table class="fixed-table-wrapper atat-table clin-summary">
         <thead>
           <tr>

templates/task_orders/index.html

@@ -66,7 +66,7 @@
 
 
 {% call StickyCTA(text="common.task_orders"|translate) %}
-    {% if user_can(permissions.CREATE_TASK_ORDER) and task_orders %}
+    {% if user_can(permissions.CREATE_TASK_ORDER) and to_count > 0 %}
       <a href="{{ url_for("task_orders.form_step_one_add_pdf", portfolio_id=portfolio.id) }}" class="usa-button usa-button-primary">
         {{ "task_orders.add_new_button" | translate }}
       </a>

templates/task_orders/step_1.html

@@ -16,8 +16,8 @@
 
 {% block to_builder_form_field %}
   {{ TOFormStepHeader(
-    title='task_orders.form.supporting_docs_header' | translate,
-    description='task_orders.form.supporting_docs_text' | translate,
+    title='task_orders.form.step_1.title' | translate,
+    description='task_orders.form.step_1.description' | translate,
   ) }}
   {{ UploadInput(form.pdf, portfolio.id) }}
 {% endblock %}

templates/task_orders/step_5.html

@@ -8,7 +8,7 @@
 {% set next_button_text = 'task_orders.form.step_5.next_button' | translate %}
 {% set previous_button_link = url_for("task_orders.form_step_four_review", task_order_id=task_order_id) %}
 {% set step = "5" %}
-{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %}
+{% set sticky_cta_text = 'task_orders.form.step_5.cta_text' | translate %}
 
 {% block to_builder_form_field %}
   {{ TOFormStepHeader(