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

Merge pull request #1268 from dod-ccpo/bug-fixes

Browse Source 
Bug fixes
This commit is contained in:
Jay R. Newlin (PromptWorks) 2019-12-26 16:45:35 -05:00 committed by GitHub
commit 0f1bb0080d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/components/sidenav_item.html
View File

@ -1,5 +1,3 @@
{% from "components/icon.html" import Icon %}
{% macro SidenavItem(label, href, active=False) -%} {% macro SidenavItem(label, href, active=False) -%}
<li> <li>
<a class="sidenav__link {% if active %}sidenav__link--active{% endif %}" href="{{href}}" title="{{label}}"> <a class="sidenav__link {% if active %}sidenav__link--active{% endif %}" href="{{href}}" title="{{label}}">

2
templates/portfolios/new/step_1.html
View File

@ -41,7 +41,7 @@
{% block next_button %} {% block next_button %}
{{ SaveButton(text=('common.save' | translate), form="portfolio-create", element="input") }} {{ SaveButton(text=('common.save' | translate), form="portfolio-create", element="input") }}
{% endblock %} {% endblock %}
<a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}"> <a href="{{ url_for('atst.home') }}">
Cancel Cancel
</a> </a>
</form> </form>

5
templates/task_orders/step_1.html
View File

@ -14,6 +14,9 @@
{% set step = "1" %} {% set step = "1" %}
{% block to_builder_form_field %} {% block to_builder_form_field %}
{{ TOFormStepHeader('task_orders.form.supporting_docs_header' | translate, 'task_orders.form.supporting_docs_text' | translate) }} {{ TOFormStepHeader(
title='task_orders.form.supporting_docs_header' | translate,
description='task_orders.form.supporting_docs_text' | translate,
) }}
{{ UploadInput(form.pdf, portfolio.id) }} {{ UploadInput(form.pdf, portfolio.id) }}
{% endblock %} {% endblock %}

5
templates/task_orders/step_2.html
View File

@ -9,6 +9,9 @@
{% set step = "2" %} {% set step = "2" %}
{% block to_builder_form_field %} {% block to_builder_form_field %}
{{ TOFormStepHeader('task_orders.form.add_to_header' | translate, 'task_orders.form.add_to_description' | translate)}} {{ TOFormStepHeader(
title='task_orders.form.add_to_header' | translate,
description='task_orders.form.add_to_description' | translate,
) }}
{{ TextInput(form.number, validation='taskOrderNumber', optional=False) }} {{ TextInput(form.number, validation='taskOrderNumber', optional=False) }}
{% endblock %} {% endblock %}

6
templates/task_orders/step_3.html
View File

@ -12,7 +12,11 @@
{% block to_builder_form_field %} {% block to_builder_form_field %}
<div> <div>
{{ TOFormStepHeader('task_orders.form.clin_title' | translate, 'task_orders.form.clin_description' | translate, task_order.number) }} {{ TOFormStepHeader(
title='task_orders.form.clin_title' | translate,
description='task_orders.form.clin_description' | translate,
to_number=task_order.number,
) }}
{% for clin in form.clins %} {% for clin in form.clins %}
{{ CLINFields(contract_start, contract_end, clin, index=loop.index - 1) }} {{ CLINFields(contract_start, contract_end, clin, index=loop.index - 1) }}

5
templates/task_orders/step_5.html
View File

@ -10,7 +10,10 @@
{% set step = "5" %} {% set step = "5" %}
{% block to_builder_form_field %} {% block to_builder_form_field %}
{{ TOFormStepHeader('task_orders.form.step_5.description' | translate, to_number=task_order.number) }} {{ TOFormStepHeader(
description='task_orders.form.step_5.description' | translate,
to_number=task_order.number
) }}
<div class="task-order__confirmation"> <div class="task-order__confirmation">
{{ CheckboxInput(form.signature) }} {{ CheckboxInput(form.signature) }}
{{ CheckboxInput(form.confirm) }} {{ CheckboxInput(form.confirm) }}