Fix permissions display

This commit is contained in:
George Drummond 2019-06-12 15:34:20 -04:00
parent 6911eff35e
commit c640495a06
No known key found for this signature in database
GPG Key ID: 296DD6077123BF17
3 changed files with 43 additions and 32 deletions

View File

@ -554,7 +554,6 @@
flex-direction: row-reverse; flex-direction: row-reverse;
} }
.defense-row {
.admin-title { .admin-title {
padding: 0 0 0.4rem 0; padding: 0 0 0.4rem 0;
margin-top: 0; margin-top: 0;
@ -569,7 +568,6 @@
margin-bottom: 2rem; margin-bottom: 2rem;
} }
} }
}
.member-list__name { .member-list__name {
margin-top: 1rem; margin-top: 1rem;

View File

@ -11,7 +11,7 @@
<div class="panel"> <div class="panel">
<div class="panel__content"> <div class="panel__content">
{% if user_can(permissions.VIEW_PORTFOLIO_NAME) %} {% if user_can(permissions.EDIT_PORTFOLIO_NAME) %}
<base-form inline-template> <base-form inline-template>
<form method="POST" action="{{ url_for('portfolios.edit', portfolio_id=portfolio.id) }}" autocomplete="false"> <form method="POST" action="{{ url_for('portfolios.edit', portfolio_id=portfolio.id) }}" autocomplete="false">
{{ portfolio_form.csrf_token }} {{ portfolio_form.csrf_token }}
@ -19,11 +19,26 @@
<div class='form-col form-col--half'> <div class='form-col form-col--half'>
{{ TextInput(portfolio_form.name, validation="portfolioName") }} {{ TextInput(portfolio_form.name, validation="portfolioName") }}
</div> </div>
<div class='edit-portfolio-name action-group'> <div class='edit-portfolio-name action-group'>
{{ SaveButton(text='Save', additional_classes='usa-button-big') }} {{ SaveButton(text='Save', additional_classes='usa-button-big') }}
</div> </div>
</div> </div>
</form>
</base-form>
{% else %}
<div>
<div class='admin-title'>
{{ "portfolios.admin.portfolio_name" | translate }}
</div>
</div>
<div>
<div class='admin-content'>
{{ portfolio.name }}
</div>
</div>
{% endif %}
<div class='defense-row'> <div class='defense-row'>
<div> <div>
<div class='admin-title'>{{ "forms.task_order.defense_component_label" | translate }}</div> <div class='admin-title'>{{ "forms.task_order.defense_component_label" | translate }}</div>
@ -34,9 +49,6 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</form>
</base-form>
{% endif %}
</div> </div>
</div> </div>

View File

@ -440,6 +440,7 @@ portfolios:
portfolio_members_subheading: These members have different levels of access to the portfolio. portfolio_members_subheading: These members have different levels of access to the portfolio.
portfolio_members_title: Portfolio members portfolio_members_title: Portfolio members
settings_info: Learn more about these settings settings_info: Learn more about these settings
portfolio_name: Portfolio name
applications: applications:
add_application_text: Add a new application add_application_text: Add a new application
add_environment: Add new environment add_environment: Add new environment