Merge pull request #1154 from dod-ccpo/add-env-roles-to-app-members-table

Add env role to the app members table and truncate long env names
This commit is contained in:
leigh-mil 2019-11-05 15:58:25 -05:00 committed by GitHub
commit 7b96a05f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 6 deletions

View File

@ -149,6 +149,11 @@
.member-list { .member-list {
.responsive-table-wrapper { .responsive-table-wrapper {
margin-bottom: 0; margin-bottom: 0;
table.atat-table {
table-layout: fixed;
width: 100%;
}
} }
input.usa-button.usa-button-primary { input.usa-button.usa-button-primary {
@ -207,9 +212,31 @@
margin: 4rem; margin: 4rem;
} }
.member-list__subhead { .env_role {
font-weight: $font-normal; width: 50%;
font-size: $base-font-size; }
.form-col--two-thirds {
width: 66.66%;
flex-basis: unset;
}
.row {
display: flex;
padding-right: $gap;
.env-role__environment {
min-width: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-weight: $font-bold;
}
.env-role__role {
white-space: nowrap;
display: inline-block;
}
} }
} }

View File

@ -95,7 +95,7 @@
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Application Permissions</th> <th>Application Permissions</th>
<th>Environment Access</th> <th class="env_role">Environment Access</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -116,14 +116,23 @@
<td> <td>
{% for perm, value in member.permission_sets.items() %} {% for perm, value in member.permission_sets.items() %}
{{ ("portfolios.applications.members.{}.{}".format(perm, value)) | translate }}<br> <div>
{{ ("portfolios.applications.members.{}.{}".format(perm, value)) | translate }}
</div>
{% endfor %} {% endfor %}
</td> </td>
<td> <td>
<div class="form-row"> <div class="form-row">
<div class="form-col form-col--two-thirds"> <div class="form-col form-col--two-thirds">
{% for env in member.environment_roles %} {% for env in member.environment_roles %}
{{ env.environment_name }}<br> <div class="row">
<span class="env-role__environment">
{{ env.environment_name }}
</span>
<span class="env-role__role">
: {{ env.role }}
</span>
</div>
{% endfor %} {% endfor %}
</div> </div>
<div class="form-col form-col--one-third"> <div class="form-col form-col--one-third">