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

Merge pull request #561 from dod-ccpo/to-form-fixes

Browse Source 
TO Form fixes
This commit is contained in:
leigh-mil
2019-01-23 11:03:45 -05:00
committed by GitHub
parent c16c5501cc 7eb40469c4
commit 37f8f41be9
8 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/components/checkbox_input.html
View File

@@ -1,7 +1,7 @@
{% macro CheckboxInput(field, inline=False) -%}
{% macro CheckboxInput(field, inline=False, classes="") -%}
<checkboxinput name='{{ field.name }}' inline-template key='{{ field.name }}'>
<div class='usa-input {% if field.errors %}usa-input--error{% endif %}'>
<div class='usa-input {{ classes }} {% if field.errors %}usa-input--error{% endif %}'>
<fieldset v-on:change="onInput" class="usa-input__choices {% if inline %}usa-input__choices--inline{% endif %}">
<legend>

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

@@ -16,7 +16,9 @@
{{ 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>
{{ OptionsInput(form.defense_component) }}
<div class="subheading--black">
{{ OptionsInput(form.defense_component) }}
</div>
<hr>

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

@@ -29,7 +29,9 @@
</a></p>
<p>{{ "task_orders.new.funding.estimate_usage_paragraph" | translate }}</p>
<div class="usa-input">
{{ form.pdf.label }}
<div class="usa-input__title">
{{ form.pdf.label }}
</div>
{{ form.pdf.description }}
<input type="file" disabled="disabled" />
</div>
@@ -39,12 +41,12 @@
<h3 class="subheading">{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
<p>{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}</p>
<h4 class="task-order-form__heading">{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
<h4 class="task-order-form__heading subheading">{{ "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 class="task-order-form__heading">{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
<h4 class="task-order-form__heading subheading">{{ "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)) }}

2
templates/task_orders/new/oversight.html
View File

@@ -25,7 +25,7 @@
<h3 class="subheading">{{ "task_orders.new.oversight.cor_info_title" | translate }}</h3>
<p>{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}</p>
{{ CheckboxInput(form.am_cor) }}
{{ CheckboxInput(form.am_cor, classes="normal") }}
<template v-if="!am_cor">
{{ UserInfo(form.cor_first_name, form.cor_last_name, form.cor_email, form.cor_phone_number) }}
{{ CheckboxInput(form.cor_invite) }}