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

Merge pull request #1428 from dod-ccpo/content-updates

Browse Source 
Content updates
This commit is contained in:
leigh-mil 2020-02-17 16:48:47 -05:00 committed by GitHub
commit 611672d449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
styles/elements/_inputs.scss
View File

@ -60,6 +60,12 @@
margin: ($gap * 2) 0; margin: ($gap * 2) 0;
max-width: 75rem; max-width: 75rem;
&-label-helper {
font-size: $small-font-size;
margin-left: $gap;
margin-right: $gap;
}
label { label {
padding: 0 0 ($gap / 2) 0; padding: 0 0 ($gap / 2) 0;
margin: 0; margin: 0;

2
templates/components/multi_checkbox_input.html
View File

@ -26,7 +26,7 @@
<div class="usa-input__title"> <div class="usa-input__title">
{{ field.label | striptags }} {{ field.label | striptags }}
{% if optional %} {% if optional %}
<span class="usa-input-label-helper">(optional)</span> <span class="usa-input-label-helper">{{ "common.optional" | translate }}</span>
{% endif %} {% endif %}
{% if tooltip %}{{ Tooltip(tooltip) }}{% endif %} {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %}
{% if not field.description %} {% if not field.description %}

2
templates/components/options_input.html
View File

@ -27,7 +27,7 @@
<div class="usa-input__title{% if not field.description %}-inline{% endif %}"> <div class="usa-input__title{% if not field.description %}-inline{% endif %}">
{{ field.label | striptags}} {{ field.label | striptags}}
{% if optional %} {% if optional %}
<span class="usa-input-label-helper">(optional)</span> <span class="usa-input-label-helper">{{ "common.optional" | translate }}</span>
{% endif %} {% endif %}
{% if tooltip %}{{ Tooltip(tooltip) }}{% endif %} {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %}
</div> </div>

2
templates/components/text_input.html
View File

@ -40,7 +40,7 @@
<div class="usa-input__title"> <div class="usa-input__title">
{{ label }} {{ label }}
{% if optional and showOptional %} {% if optional and showOptional %}
<span class="usa-input-label-helper">(optional)</span> <span class="usa-input-label-helper">{{ "common.optional" | translate }}</span>
{% endif %} {% endif %}
{% if tooltip and not disabled %} {% if tooltip and not disabled %}
{{ Tooltip(tooltip, tooltip_title) }} {{ Tooltip(tooltip, tooltip_title) }}

7
translations.yaml
View File

@ -51,6 +51,7 @@ common:
lorem: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. lorem: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
name: Name name: Name
next: Next next: Next
optional: Optional
previous: Previous previous: Previous
save: Save save: Save
save_changes: Save Changes save_changes: Save Changes
@ -506,12 +507,12 @@ portfolios:
archive_button: Delete member archive_button: Delete member
reports: reports:
days_remaining: days_remaining:
header: Days Remaining header: Days remaining
toolip: Days remaining are the days of funding remaining in the portfolio. toolip: Days remaining are the days of funding remaining in the portfolio.
duration: duration:
header: Funding Duration header: Funding duration
tooltip: Funding duration is the period of time that there is a valid task order funding the portfolio. tooltip: Funding duration is the period of time that there is a valid task order funding the portfolio.
estimate_warning: Reports displayed in JEDI are estimates and not a system of record. estimate_warning: Reports displayed in JEDI are estimates and not a system of record. To manage your costs, go to Azure by selecting the Login to Azure button above.
total_value: total_value:
header: Total Portfolio Value header: Total Portfolio Value
tooltip: Total portfolio value is all obligated funds for current and upcoming task orders in this portfolio. tooltip: Total portfolio value is all obligated funds for current and upcoming task orders in this portfolio.