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

Update copy, add totals box, style buttons

Browse Source
This commit is contained in:
leigh-mil
2019-06-10 16:44:09 -04:00
parent bad99edd4c
commit 1e817c6755
6 changed files with 294 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
templates/components/text_input.html
View File

@@ -14,7 +14,8 @@
initial_value='',
classes='',
noMaxWidth=False,
optional=False) -%}
optional=False,
showLabel=True) -%}
<textinput
v-cloak
@@ -32,24 +33,26 @@
class='{% if disabled %}input--disabled{% endif %} {{ classes }}'
v-bind:class="['usa-input usa-input--validation--' + validation, { 'usa-input--error': showError, 'usa-input--success': showValid, 'usa-input--validation--paragraph': paragraph, 'no-max-width': noMaxWidth }]">
<label for={{field.name}}>
<div class="usa-input__title">
{{ label }}
{% if tooltip and not disabled %}
{{ Tooltip(tooltip, tooltip_title) }}
{% if showLabel %}
<label for={{field.name}}>
<div class="usa-input__title">
{{ label }}
{% if tooltip and not disabled %}
{{ Tooltip(tooltip, tooltip_title) }}
{% endif %}
</div>
{% if field.description %}
<span class='usa-input__help'>{{ description | safe }}</span>
{% endif %}
</div>
{% if field.description %}
<span class='usa-input__help'>{{ description | safe }}</span>
{% endif %}
{% if not disabled %}
<span v-show='showError'>{{ Icon('alert',classes="icon-validation") }}</span>
<span v-show='showValid'>{{ Icon('ok',classes="icon-validation") }}</span>
{% endif %}
{% if not disabled %}
<span v-show='showError'>{{ Icon('alert',classes="icon-validation") }}</span>
<span v-show='showValid'>{{ Icon('ok',classes="icon-validation") }}</span>
{% endif %}
</label>
</label>
{% endif %}
{% if paragraph %}

11
templates/components/totals_box.html
View File

@@ -1,14 +1,19 @@
{% macro TotalsBox(task_order) -%}
{% macro TotalsBox(task_order=None, obligated_funds=0, contract_amount=0) -%}
<div class="col totals-box">
{% if task_order %}
{% set obligated_funds = task_order.total_obligated_funds %}
{% set contract_amount = task_order.total_contract_amount %}
{% endif %}
<div class="h4">Total obligated funds</div>
<div class="h3">{{ task_order.total_obligated_funds | dollars }}</div>
<div class="h3">{{ obligated_funds | dollars }}</div>
<div>This is the funding allocated to cloud services. It may be 100% or a portion of the total task order budget.</div>
<hr>
<div class="h4">Total contract amount</div>
<div class="h3">{{ task_order.total_contract_amount | dollars }}</div>
<div class="h3">{{ contract_amount | dollars }}</div>
<div>This is the value of all funds obligated for this contract, including -- but not limited to -- funds obligated for the cloud.</div>
</div>