diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index de9f3f92..1b2e2692 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -272,6 +272,7 @@ .members-table-ppoc { select::-ms-expand { display: none; + color: $color-gray; } select { @@ -288,11 +289,12 @@ word-break: normal; padding-right: 3rem; padding-left: 1.2rem; + color: $color-gray; } select:hover { box-shadow: none; - color: $color-base; + color: $color-gray; } } diff --git a/templates/fragments/admin/members_edit.html b/templates/fragments/admin/members_edit.html index 8f5f8fd2..13811667 100644 --- a/templates/fragments/admin/members_edit.html +++ b/templates/fragments/admin/members_edit.html @@ -3,17 +3,20 @@ {% for subform in member_perms_form.members_permissions %} {% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, subform.user_id.data) %} {% set ppoc = subform.user_id.data == portfolio.owner.id %} + {% set archive_button_class = 'button-danger-outline' %} {{ subform.member.data }} - {% if subform.user_id.data == user.id %} - (you) - {% set archive_button_class = 'usa-button-disabled' %} - {% elif ppoc %} - {% set archive_button_class = 'usa-button-disabled' %} - {% else %} - {% set archive_button_class = 'button-danger-outline' %} - {% endif %} +
+ {% if ppoc %} + {% set archive_button_class = 'usa-button-disabled' %} + PPoC + {% endif %} + {% if subform.user_id.data == user.id %} + {% set archive_button_class = 'usa-button-disabled' %} + (you) + {% endif %} +
{{ OptionsInput(subform.perms_app_mgmt, label=False, disabled=ppoc) }} diff --git a/templates/fragments/admin/members_view.html b/templates/fragments/admin/members_view.html index 33e66478..b79979b4 100644 --- a/templates/fragments/admin/members_view.html +++ b/templates/fragments/admin/members_view.html @@ -1,18 +1,24 @@ {% for subform in member_perms_form.members_permissions %} + {% set ppoc = subform.user_id.data == portfolio.owner.id %} + {% set heading_perms = [subform.perms_app_mgmt, subform.perms_funding, subform.perms_reporting, subform.perms_portfolio_mgmt] %} {{ subform.member.data }} - {% if subform.member.data == user.full_name %} - (you) - {% endif %} +
+ {% if ppoc %} + PPoC + {% endif %} + {% if subform.user_id.data == user.id %} + (you) + {% endif %} +
- {% set heading_perms = [subform.perms_app_mgmt, subform.perms_funding, subform.perms_reporting, subform.perms_portfolio_mgmt] %} {% for access in heading_perms %} - {% if dict(access.choices).get(access.data) == 'Edit Access' %} - Edit Access + {% if dict(access.choices).get(access.data) == ('portfolios.members.permissions.edit_access' | translate) %} + {{ 'portfolios.members.permissions.edit_access' | translate }} {% else %} - View Only + {{ 'portfolios.members.permissions.view_only' | translate }} {% endif %} {% endfor %}