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

Add description text to officer edit forms and update styling

Browse Source
This commit is contained in:
leigh-mil 2019-02-07 15:39:36 -05:00
parent 6dec26c93c
commit 4bd4b4d488
3 changed files with 58 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
styles/sections/_task_order.scss
View File

@ -361,6 +361,32 @@
} }
.officer__form { .officer__form {
padding: 1.5rem;
background-color: $color-aqua-lightest;
border-left-color: $color-blue;
border-left-style: solid;
border-left-width: $gap / 2;
.edit-officer {
h4 {
color: $color-gray;
margin-bottom: 0.5rem;
}
p {
font-size: 1.5rem;
}
}
.usa-input__title {
font-weight: normal;
}
.form-row {
margin-bottom: 0rem;
margin-top: 0rem;
}
.officer__form--actions { .officer__form--actions {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

56
templates/portfolios/task_orders/invitations.html
View File

@ -14,43 +14,43 @@
{% endmacro %} {% endmacro %}
{% macro EditOfficerInfo(form, officer_type) -%} {% macro EditOfficerInfo(form, officer_type) -%}
<div class='officer__form'>
<template v-if="editing"> <template v-if="editing">
<div class='alert'> <div class='officer__form'>
<div class='alert__content'> <div class="edit-officer">
<div class='form-row'> <h4>{{ ("task_orders.invitations." + officer_type + ".edit_title") | translate}}</h4>
<div class='form-col form-col--half'> <p>{{ "task_orders.invitations.edit_text" | translate}}</p>
{{ TextInput(form.first_name) }} </div>
</div> <div class='form-row'>
<div class='form-col form-col--half'>
<div class='form-col form-col--half'> {{ TextInput(form.first_name) }}
{{ TextInput(form.last_name) }}
</div>
</div> </div>
<div class='form-row'> <div class='form-col form-col--half'>
<div class='form-col form-col--half'> {{ TextInput(form.last_name) }}
{{ TextInput(form.email, placeholder='name@mail.mil', validation='email') }} </div>
</div> </div>
<div class='form-col form-col--half'> <div class='form-row'>
{{ TextInput(form.phone_number, placeholder='(123) 456-7890', validation='usPhone') }} <div class='form-col form-col--half'>
</div> {{ TextInput(form.email, placeholder='name@mail.mil', validation='email') }}
</div> </div>
{% if form.dod_id.data %}
{{ TextInput(form.dod_id, validation='dodId', disabled=True)}} <div class='form-col form-col--half'>
{% endif %} {{ TextInput(form.phone_number, placeholder='(123) 456-7890', validation='usPhone') }}
<div class='alert__actions officer__form--actions'>
<a href="#{{ officer_type }}" v-on:click="cancel" class="icon-link">
{{ Icon("x") }}
<span>Cancel</span>
</a>
<input type='submit' class='usa-button usa-button-primary' value='Save Changes' />
</div> </div>
</div> </div>
{% if form.dod_id.data %}
{{ TextInput(form.dod_id, validation='dodId', disabled=True)}}
{% endif %}
<div class='alert__actions officer__form--actions'>
<a href="#{{ officer_type }}" v-on:click="cancel" class="icon-link">
{{ Icon("x") }}
<span>Cancel</span>
</a>
<input type='submit' class='usa-button usa-button-primary' value='Save Changes' />
</div>
</div> </div>
</template> </template>
</div>
{% endmacro %} {% endmacro %}
{% macro OfficerInfo(task_order, officer_type, form) %} {% macro OfficerInfo(task_order, officer_type, form) %}

4
translations.yaml
View File

@ -461,21 +461,25 @@ task_orders:
pending_to: Pending TO Completion pending_to: Pending TO Completion
invitations: invitations:
dod_id_label: DoD ID dod_id_label: DoD ID
edit_text: A new invitation e-mail will be sent when new information is saved.
contracting_officer: contracting_officer:
title: Contracting Officer (KO) Information title: Contracting Officer (KO) Information
description: You'll need a signature from your KO. You might want to work with your program Financial Manager to get your TO documents moving in the right direction. description: You'll need a signature from your KO. You might want to work with your program Financial Manager to get your TO documents moving in the right direction.
add_button_text: Add / Invite KO add_button_text: Add / Invite KO
invite_button_text: Invite KO invite_button_text: Invite KO
edit_title: Edit KO
contracting_officer_representative: contracting_officer_representative:
title: Contracting Officer Representative (COR) Information title: Contracting Officer Representative (COR) Information
description: Your COR may assist in submitting the Task Order documents within their official system of record. description: Your COR may assist in submitting the Task Order documents within their official system of record.
add_button_text: Add / Invite COR add_button_text: Add / Invite COR
invite_button_text: Invite COR invite_button_text: Invite COR
edit_title: Edit COR
security_officer: security_officer:
title: IA Security Officer Information title: IA Security Officer Information
description: Your Security Officer will need to answer some security configuration questions in order to generate a DD-254 document, then digitally sign. description: Your Security Officer will need to answer some security configuration questions in order to generate a DD-254 document, then digitally sign.
add_button_text: Add / Invite Security Officer add_button_text: Add / Invite Security Officer
invite_button_text: Invite Security Officer invite_button_text: Invite Security Officer
edit_title: Edit SO
ko_review: ko_review:
alert_title: Verify Your Info alert_title: Verify Your Info
title: Task Order Builder title: Task Order Builder