Better UI for the permissions table in the repository, as well as fix some other avatar issues

This commit is contained in:
Joseph Schorr 2015-03-31 14:36:09 -04:00
parent 805af1c0c0
commit 9018cf14eb
6 changed files with 58 additions and 8 deletions

View file

@ -4,7 +4,7 @@
<!-- User/Team Permissions -->
<div class="co-panel">
<div class="co-panel-heading"><i class="fa fa-key"></i> User and Robot Permissions</div>
<div class="panel-body">
<div class="panel-body" style="padding-top: 5px;">
<div class="repository-permissions-table" repository="repository"></div>
</div>
</div>
@ -12,7 +12,7 @@
<!-- Access Tokens (DEPRECATED) -->
<div class="co-panel" ng-show="hasTokens">
<div class="co-panel-heading"><i class="fa fa-key"></i> Access Token Permissions</div>
<div class="panel-body">
<div class="panel-body" style="padding-top: 5px;">
<div class="repository-tokens-table" repository="repository" has-tokens="hasTokens"></div>
</div>
</div>

View file

@ -2,7 +2,7 @@
<div class="resource-view"
resources="[permissionResources.team, permissionResources.user]"
error-message="'Could not load repository permissions'">
<table class="co-table permissions">
<table class="co-table no-lines permissions">
<thead>
<tr>
<td>Account Name</td>
@ -12,7 +12,10 @@
</thead>
<!-- Team Permissions -->
<tr ng-repeat="(name, permission) in permissionResources.team.value">
<tr class="co-table-header-row" ng-if="permissionResources.team.value">
<td colspan="3"><i class="fa fa-group"></i> Team Permissions</td>
</tr>
<tr class="indented-row" ng-repeat="(name, permission) in permissionResources.team.value">
<td class="team entity">
<span class="entity-reference" namespace="repository.namespace"
entity="buildEntityForPermission(name, permission, 'team')"
@ -33,12 +36,18 @@
</tr>
<!-- User Permissions -->
<tr ng-repeat="(name, permission) in permissionResources.user.value">
<td class="{{ 'user entity ' + (permission.is_org_member ? '' : 'outside') }}">
<tr class="co-table-header-row" ng-if="permissionResources.user.value">
<td colspan="3"><i class="fa fa-user"></i> User and Robot Account Permissions</td>
</tr>
<tr class="indented-row" ng-repeat="(name, permission) in permissionResources.user.value">
<td class="user-permission-entity">
<span class="entity-reference" namespace="repository.namespace"
entity="buildEntityForPermission(name, permission, 'user')"
avatar-size="24">
</span>
<i class="fa fa-exclamation-triangle outside-org"
ng-if="permission.is_org_member === false"
data-title="This user is not a member of the organization" bs-tooltip></i>
</td>
<td class="user-permissions">
<div class="btn-group btn-group-sm">
@ -54,6 +63,8 @@
</td>
</tr>
<tr class="add-row-spacer"><td colspan="3"></td></tr>
<tr class="add-row">
<td id="add-entity-permission" class="admin-search">
<span class="entity-search" namespace="repository.namespace"