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

Merge branch 'staging' into grid-styling

Browse Source
This commit is contained in:
Hannah Brinkman
2020-01-22 15:23:39 -05:00
committed by GitHub
parent 01341be95b 41c8a5d187
commit 674f6363d5
19 changed files with 96 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/portfolios/fragments/member_form_fields.html
View File

@@ -32,6 +32,6 @@
{{ TextInput(member_form.email, validation='email', optional=False) }}
{{ PhoneInput(member_form.phone_number, member_form.phone_ext)}}
{{ TextInput(member_form.dod_id, validation='dodId', optional=False) }}
<a href="#">How do I find the DoD ID?</a>
<a href="#">{{ "forms.new_member.dod_help" | translate }}</a>
</div>
{% endmacro %}

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

@@ -15,8 +15,7 @@
<p>{{ "portfolios.header" | translate }}</p>
<h1>{{ "New Portfolio" }}</h1>
</div>
</div>
{{ StickyCTA(text="Create New Portfolio") }}
{{ StickyCTA(text="portfolios.new.cta_step_1"|translate, context=("portfolios.new.sticky_header_context"|translate({"step": "1"}) )) }}
<base-form inline-template>
<div class="row">
<form id="portfolio-create" class="col" action="{{ url_for('portfolios.create_portfolio') }}" method="POST">
@@ -41,9 +40,9 @@
</div>
<div class='action-group-footer'>
{% block next_button %}
{{ SaveButton(text=('common.save' | translate), form="portfolio-create", element="input") }}
{{ SaveButton(text=('portfolios.new.save' | translate), form="portfolio-create", element="input") }}
{% endblock %}
<a href="{{ url_for('atst.home') }}">
<a class="usa-button usa-button-secondary" href="{{ url_for('atst.home') }}">
Cancel
</a>
</form>
@@ -51,4 +50,3 @@
</base-form>
</main>
{% endblock %}

12
templates/portfolios/reports/portfolio_summary.html
View File

@@ -5,15 +5,15 @@
<section class="row">
<div class='col col--grow summary-item'>
<h5 class="summary-item__header">
<span class="summary-item__header-text">Total Portfolio Value</span>
{{Tooltip(("common.lorem" | translate), title="", classes="summary-item__header-icon")}}
<span class="summary-item__header-text">{{ "portfolios.reports.total_value.header" | translate }}</span>
{{Tooltip(("portfolios.reports.total_value.tooltip" | translate), title="", classes="summary-item__header-icon")}}
</h5>
<p class="summary-item__value">{{ total_portfolio_value | dollars }}</p>
</div>
<div class='col col--grow summary-item'>
<h5 class="summary-item__header">
<span class="summary-item__header-text">Funding Duration</span>
{{Tooltip(("common.lorem" | translate), title="", classes="summary-item__header-icon")}}
<span class="summary-item__header-text">{{ "portfolios.reports.duration.header" | translate }}</span>
{{Tooltip(("portfolios.reports.duration.tooltip" | translate), title="", classes="summary-item__header-icon")}}
</h5>
{% set earliest_pop_start_date, latest_pop_end_date = portfolio.funding_duration %}
{% if earliest_pop_start_date and latest_pop_end_date %}
@@ -28,8 +28,8 @@
</div>
<div class='col col--grow summary-item'>
<h5 class="summary-item__header">
<span class="summary-item__header-text">Days Remaining</span>
{{Tooltip(("common.lorem" | translate), title="", classes="summary-item__header-icon")}}
<span class="summary-item__header-text">{{ "portfolios.reports.days_remaining.header" | translate }}</span>
{{Tooltip(("portfolios.reports.days_remaining.toolip" | translate), title="", classes="summary-item__header-icon")}}
</h5>
<p class="summary-item__value">{{ portfolio.days_to_funding_expiration }} days</p>
</div>