vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Streamline and cleanup the entity-reference so it can be used everywhere in a simple fashion. Also changes the entity-search to use the reference as its icon source when in persistent mode

Browse source
This commit is contained in:
Joseph Schorr 2014-01-21 16:23:00 -05:00
parent c2928a96d0
commit 74df6b1df7
11 changed files with 87 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

5
static/partials/org-admin.html
View file

@ -92,12 +92,11 @@
<tr ng-repeat="memberInfo in (membersFound | filter:search | limitTo:50)">
<td>
<span class="entity-reference" name="memberInfo.username" isrobot="memberInfo.is_robot" isorgadmin="true"></span>
<span class="entity-reference" entity="memberInfo" namespace="organization.name"></span>
</td>
<td>
<span class="team-link" ng-repeat="team in memberInfo.teams">
<i class="fa fa-group"></i>
<a href="/organization/{{ organization.name }}/teams/{{ team }}">{{ team }}</a>
<span class="entity-reference" namespace="organization.name" entity="{'kind': 'team', 'name': team}"></span>
</span>
</td>
<td>

9
static/partials/repo-admin.html
View file

@ -51,7 +51,9 @@
<!-- Team Permissions -->
<tr ng-repeat="(name, permission) in permissions['team']">
<td class="team entity">
<span class="entity-reference" orgname="repo.namespace" team="name"></span>
<span class="entity-reference" namespace="repo.namespace"
entity="buildEntityForPermission(name, permission, 'team')">
</span>
</td>
<td class="user-permissions">
<span class="role-group" current-role="permission.role" role-changed="setRole(role, name, 'team')" roles="roles"></span>
@ -67,8 +69,9 @@
<!-- User Permissions -->
<tr ng-repeat="(name, permission) in permissions['user']">
<td class="{{ 'user entity ' + (permission.is_org_member ? '' : 'outside') }}">
<span class="entity-reference" name="name" isrobot="permission.is_robot"></span>
<i class="fa fa-exclamation-triangle" ng-show="permission.is_org_member === false" data-trigger="hover" bs-popover="{'content': 'This user is not a member of the organization'}"></i>
<span class="entity-reference" namespace="repo.namespace"
entity="buildEntityForPermission(name, permission, 'user')">
</span>
</td>
<td class="user-permissions">
<div class="btn-group btn-group-sm">

4
static/partials/team-view.html
View file

@ -14,11 +14,11 @@
<table class="permissions">
<tr ng-repeat="(name, member) in members">
<td class="user entity">
<span class="entity-reference" name="member.username" isrobot="member.is_robot"></span>
<span class="entity-reference" entity="member" namespace="organization.name"></span>
</td>
<td>
<span class="delete-ui" tabindex="0" title="Remove User" ng-show="canEditMembers">
<span class="delete-ui-button" ng-click="removeMember(member.username)"><button class="btn btn-danger">Remove</button></span>
<span class="delete-ui-button" ng-click="removeMember(member.name)"><button class="btn btn-danger">Remove</button></span>
<i class="fa fa-times"></i>
</span>
</td>