pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update formatting

Browse Source 
Remove html tags from translations file
Rename csp_cost_estimate to pdf
This commit is contained in:
leigh-mil
2019-01-11 09:41:03 -05:00
parent b18e3a9e10
commit 52b3b054b5
7 changed files with 47 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
templates/task_orders/new/app_info.html
View File

@@ -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>
<i>
{{ "task_orders.new.app_info.sample_scope" | translate | safe }}
</i>
</p>
<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>
{{ "task_orders.new.app_info.market_research_paragraph" | translate | safe }}
</p>
<p>{{ "task_orders.new.app_info.market_research_paragraph" | translate | safe }}</p>
{% endblock %}

66
templates/task_orders/new/funding.html
View File

@@ -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>
<!-- Get Funding Section -->
<h3>{{ "task_orders.new.funding.performance_period_title" | translate }}</h3>
<div>
<!-- Get Funding Section -->
<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>
<h3>{{ "task_orders.new.funding.estimate_usage_title" | translate }}</h3>
<hr>
{{ "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">
{{ form.csp_cost_estimate.label }}
{{ form.csp_cost_estimate.description }}
{{ form.csp_cost_estimate }}
<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>
<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 %}