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

Merge pull request #1414 from dod-ccpo/fix-view-only-in-ff

Browse Source 
Fix portfolio header in FF
This commit is contained in:
leigh-mil 2020-02-18 09:51:14 -05:00 committed by GitHub
commit 697efc92bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
styles/components/_portfolio_layout.scss
View File

@ -20,14 +20,11 @@
.col--grow { .col--grow {
overflow: inherit; overflow: inherit;
display: table; align-self: center;
min-height: 10rem;
} }
&__name { &__name {
@include h1; @include h1;
display: table-cell;
vertical-align: middle;
h1 { h1 {
margin: 0; margin: 0;

59
templates/portfolios/header.html
View File

@ -17,36 +17,37 @@
<h1>{{ portfolio.name }}</h1> <h1>{{ portfolio.name }}</h1>
</div> </div>
</div> </div>
<div class='row links'> <div class="col">
{% if user_can(permissions.VIEW_PORTFOLIO_ADMIN) %} <div class='row links'>
{% if user_can(permissions.VIEW_PORTFOLIO_ADMIN) %}
{{ Link(
icon='cog',
text='navigation.portfolio_navigation.breadcrumbs.admin' | translate,
url=url_for("portfolios.admin", portfolio_id=portfolio.id),
active=request.url_rule.endpoint == "portfolios.admin",
) }}
{% endif %}{% if user_can(permissions.VIEW_PORTFOLIO_FUNDING) %}
{{ Link(
icon='funding',
text='navigation.portfolio_navigation.breadcrumbs.funding' | translate,
url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id),
active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.view_task_order", "task_orders.form_step_one_add_pdf", "task_orders.submit_form_step_one_add_pdf", "task_orders.form_step_two_add_number", "task_orders.submit_form_step_two_add_number", "task_orders.form_step_three_add_clins", "task_orders.submit_form_step_three_add_clins", "task_orders.form_step_four_review", "task_orders.form_step_five_confirm_signature"],
) }}
{% endif %}
{{ Link( {{ Link(
icon='cog', icon='applications',
text='navigation.portfolio_navigation.breadcrumbs.admin' | translate, text='navigation.portfolio_navigation.breadcrumbs.applications' | translate,
url=url_for("portfolios.admin", portfolio_id=portfolio.id), url=url_for("applications.portfolio_applications", portfolio_id=portfolio.id),
active=request.url_rule.endpoint == "portfolios.admin", active=request.url_rule.endpoint in ["applications.portfolio_applications", "applications.settings"],
) }} ) }}
{% endif %}{% if user_can(permissions.VIEW_PORTFOLIO_FUNDING) %} {% if user_can(permissions.VIEW_PORTFOLIO_REPORTS) %}
{{ Link( {{ Link(
icon='funding', icon='chart-pie',
text='navigation.portfolio_navigation.breadcrumbs.funding' | translate, text='navigation.portfolio_navigation.breadcrumbs.reports' | translate,
url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id), url=url_for("portfolios.reports", portfolio_id=portfolio.id),
active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.view_task_order", "task_orders.form_step_one_add_pdf", "task_orders.submit_form_step_one_add_pdf", "task_orders.form_step_two_add_number", "task_orders.submit_form_step_two_add_number", "task_orders.form_step_three_add_clins", "task_orders.submit_form_step_three_add_clins", "task_orders.form_step_four_review", "task_orders.form_step_five_confirm_signature"], active=request.url_rule.endpoint == "portfolios.reports",
) }} ) }}
{% endif %} {% endif %}
{{ Link( </div>
icon='applications',
text='navigation.portfolio_navigation.breadcrumbs.applications' | translate,
url=url_for("applications.portfolio_applications", portfolio_id=portfolio.id),
active=request.url_rule.endpoint in ["applications.portfolio_applications", "applications.settings"],
) }}
{% if user_can(permissions.VIEW_PORTFOLIO_REPORTS) %}
{{ Link(
icon='chart-pie',
text='navigation.portfolio_navigation.breadcrumbs.reports' | translate,
url=url_for("portfolios.reports", portfolio_id=portfolio.id),
active=request.url_rule.endpoint == "portfolios.reports",
) }}
{% endif %}
</div> </div>
</div> </div>