Update formatting

Remove html tags from translations file
Rename csp_cost_estimate to pdf

atst/domain/task_orders.py

@@ -26,7 +26,7 @@ class TaskOrders(object):
         "funding": [
             "performance_length",
             "start_date",
-            "csp_cost_estimate",
+            # "pdf",
             "end_date",
             "clin_01",
             "clin_02",

atst/forms/task_order.py

@@ -86,9 +86,9 @@ class FundingForm(CacheableForm):
     end_date = DateField(
         translate("forms.task_order.end_date_label"), format="%m/%d/%Y"
     )
-    csp_cost_estimate = FileField(
+    pdf = FileField(
-        translate("forms.task_order.csp_cost_est_label"),
+        translate("forms.task_order.pdf_label"),
-        description=translate("forms.task_order.csp_cost_est_description"),
+        description=translate("forms.task_order.pdf_description"),
     )
     clin_01 = IntegerField(translate("forms.task_order.clin_01_label"))
     clin_02 = IntegerField(translate("forms.task_order.clin_02_label"))

atst/routes/task_orders/new.py

@@ -15,7 +15,6 @@ from atst.domain.workspaces import Workspaces
 from atst.domain.workspace_roles import WorkspaceRoles
 import atst.forms.task_order as task_order_form
 from atst.services.invitation import Invitation as InvitationService
-from atst.utils.localization import translate
 
 
 TASK_ORDER_SECTIONS = [

js/components/forms/funding.js

@@ -3,6 +3,7 @@ import { conformToMask } from 'vue-text-mask'
 
 import FormMixin from '../../mixins/form'
 import textinput from '../text_input'
+import optionsinput from '../options_input'
 
 export default {
   name: 'funding',
@@ -11,6 +12,7 @@ export default {
 
   components: {
     textinput,
+    optionsinput
   },
 
   props: {

templates/task_orders/new/app_info.html

@@ -11,15 +11,11 @@
 
 {% block form %}
 
+<!-- App Info Section -->
 <h3>{{ "task_orders.new.app_info.basic_info_title"| translate }}</h3>
 {{ TextInput(form.portfolio_name, placeholder="The name of your office or organization") }}
 {{ TextInput(form.scope, paragraph=True) }}
-<p>
+<p><i>{{ "task_orders.new.app_info.sample_scope" | translate | safe }}</i></p>
-<i>
-  {{ "task_orders.new.app_info.sample_scope" | translate | safe }}
-</i>
-</p>
-
 {{ OptionsInput(form.defense_component) }}
 
 <hr>
@@ -38,9 +34,6 @@
 <hr>
 
 <h3>{{ "task_orders.new.app_info.market_research_title" | translate }}</h3>
-<p>
+<p>{{ "task_orders.new.app_info.market_research_paragraph" | translate | safe }}</p>
-{{ "task_orders.new.app_info.market_research_paragraph" | translate | safe }}
-</p>
-
 
 {% endblock %}

templates/task_orders/new/funding.html

@@ -4,6 +4,8 @@
 {% from "components/options_input.html" import OptionsInput %}
 {% from "components/date_input.html" import DateInput %}
 
+{% from "components/icon.html" import Icon %}
+
 {% block heading %}
   {{ "task_orders.new.funding.section_title" | translate }}
 {% endblock %}
@@ -11,46 +13,42 @@
 {% block form %}
 
 <funding inline-template v-bind:initial-data='{{ form.data|tojson }}'>
-<div>
+  <div>
-  <!-- Get Funding Section           -->
+    <!-- Get Funding Section           -->
-  <h3>{{ "task_orders.new.funding.performance_period_title" | translate }}</h3>
+    <h3>{{ "task_orders.new.funding.performance_period_title" | translate }}</h3>
+    <p>{{ "task_orders.new.funding.performance_period_description" | translate }}</p>
+    <p>{{ "task_orders.new.funding.performance_period_paragraph" | translate }}</p>
+    {{ OptionsInput(form.performance_length) }}
 
-  {{ "task_orders.new.funding.performance_period_paragraph" | translate | safe }}
+    <hr>
 
-  {{ OptionsInput(form.performance_length) }}
+    <h3>{{ "task_orders.new.funding.estimate_usage_title" | translate }}</h3>
+    <p>{{ "task_orders.new.funding.estimate_usage_description" | translate }}</p>
+    <p><a class="icon-link" href="{{ url_for('atst.jedi_csp_calculator') }}">
+      {{ Icon("link")}} Cloud Service Provider's estimate calculator
+    </a></p>
+    <p>{{ "task_orders.new.funding.estimate_usage_paragraph" | translate }}</p>
+    <div class="usa-input">
+      {{ form.pdf.label }}
+      {{ form.pdf.description }}
+      <input type="file" disabled="disabled" />
+    </div>
 
-  <hr>
+    <hr>
-  <h3>{{ "task_orders.new.funding.estimate_usage_title" | translate }}</h3>
 
-  {{ "task_orders.new.funding.estimate_usage_paragraph" | translate | safe }}
+    <h3>{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
+    <p>{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}</p>
 
-  <div class="usa-input">
+    <h4>{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
-    {{ form.csp_cost_estimate.label }}
+    <p>{{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}</p>
-    {{ form.csp_cost_estimate.description }}
+    {{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }}
-    {{ form.csp_cost_estimate }}
+    {{ TextInput(form.clin_02, validation='dollars', disabled=(not config.CLASSIFIED)) }}
+
+    <h4>{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
+    <p>{{ "task_orders.new.funding.support_assistance_paragraph" | translate }}</p>
+    {{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }}
+    {{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', disabled=(not config.CLASSIFIED)) }}
   </div>
-
-  <hr>
-  <h3>{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
-  <p>
-  {{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}
-  </p>
-
-  <h4>{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
-  <p>
-  {{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}
-  </p>
-
-  {{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }}
-  {{ TextInput(form.clin_02, validation='dollars', disabled=(not config.CLASSIFIED)) }}
-
-  <h4>{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
-  <p>
-  {{ "task_orders.new.funding.support_assistance_paragraph" | translate }}
-  </p>
-  {{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }}
-  {{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', disabled=(not config.CLASSIFIED)) }}
-</div>
 </funding>
 
 {% endblock %}

translations.yaml

@@ -184,8 +184,8 @@ forms:
     performance_length_label: Period of Performance length
     start_date_label: Start Date
     end_date_label: End Date
-    csp_cost_est_label: Upload a copy of your CSP Cost Estimate Research
+    pdf_label: Upload a copy of your CSP Cost Estimate Research
-    csp_cost_est_description: Upload a PDF or screenshot fo your usage estimate from the calculator.
+    pdf_description: Upload a PDF or screenshot of your usage estimate from the calculator.
     clin_01_label: 'CLIN 01 : Unclassified'
     clin_02_label: 'CLIN 02: Classified'
     clin_03_label: 'CLIN 03: Unclassified'
@@ -358,14 +358,11 @@ task_orders:
     funding:
       section_title: Funding
       performance_period_title: Period of Performance
-      performance_period_paragraph: |
+      performance_period_description: Choose the dates your task order will cover.
-        <p>Choose the dates your task order will cover.</p>
+      performance_period_paragraph: Because your funds will be lost if you don’t use them, we strongly recommend submitting small, short-duration task orders, usually a three month period. We’ll notify you when your period of performance is nearing the end so you can request your next set of funds with a new task order.
-        <p>Because your funds will be lost if you don’t use them, we strongly recommend submitting small, short-duration task orders, usually a three month period. We’ll notify you when your period of performance is nearing the end so you can request your next set of funds with a new task order.</p>
       estimate_usage_title: Estimate Your Cloud Usage
-      estimate_usage_paragraph: |
+      estimate_usage_description: Calculate how much your cloud usage will cost. A technical representative should help you complete this calculation. These calculatiosnd will become your CLINs.
-        <p>Calculate how much your cloud usage will cost. A technical representative should help you complete this calculation. These calculatiosnd will become your CLINs.</p>
+      estimate_usage_paragraph: This is only an estimation tool to help you make an informed evaluation of what you expect to use. While you're tied to the dollar amount you specify in your task order, you're not obligated by the resources you indicate in the calculator.
-        <p><a class="icon-link" href="{{ url_for('atst.jedi_csp_calculator') }}">**link image** Cloud Service Provider's estimate calculator</a></p>
-        <p>This is only an estimation tool to help you make an informed evaluation of what you expect to use. While you're tied to the dollar amount you specify in your task order, you're not obligated by the resources you indicate in the calculator.</p>
       cloud_calculations_title: Cloud Usage Calculations
       cloud_calculations_paragraph: Enter the results of your cloud usage calculations.
       cloud_offerings_title: Cloud Offerings