Merge pull request #1568 from coreos-inc/robots-view

Restyle robots view
This commit is contained in:
josephschorr 2016-06-22 01:19:19 -04:00 committed by GitHub
commit dbe14fe729
2 changed files with 28 additions and 15 deletions

View file

@ -29,17 +29,28 @@
.robots-manager-element .permissions-table-wrapper { .robots-manager-element .permissions-table-wrapper {
margin-left: 0px; margin-left: 0px;
border-left: 2px solid #ccc; margin-top: 0px;
padding-left: 20px;
background-color: rgba(238, 238, 238, 0.21);
padding: 14px;
padding-bottom: 8px;
padding-left: 16px;
padding-top: 20px;
} }
.robots-manager-element .permissions-table tbody tr:last-child td { .robots-manager-element .permissions-table {
margin-bottom: 10px;
}
.robots-manager-element .permissions-table tbody tr td {
border-bottom: 0px; border-bottom: 0px;
padding: 4px;
} }
.robots-manager-element .permissions-display-row { .robots-manager-element .permissions-display-row {
position: relative; position: relative;
padding-bottom: 20px; padding-bottom: 10px;
} }
.robots-manager-element .permissions-display-row td:first-child { .robots-manager-element .permissions-display-row td:first-child {
@ -59,6 +70,11 @@
margin-right: 6px; margin-right: 6px;
} }
.robots-manager-element .fa-caret-down, .robots-manager-element .fa-caret-right {
margin-right: 4px;
color: #aaa;
}
.robots-manager-element .repo-circle .fa-hdd-o { .robots-manager-element .repo-circle .fa-hdd-o {
font-size: 1.7em; font-size: 1.7em;
} }

View file

@ -33,7 +33,6 @@
<table class="cor-table" ng-if="(robots | filter:robotFilter).length"> <table class="cor-table" ng-if="(robots | filter:robotFilter).length">
<thead> <thead>
<td class="caret-col hidden-xs" ng-if="(user || organization.is_admin)"></td>
<td>Robot Account Name</td> <td>Robot Account Name</td>
<td ng-if="organization">Teams</td> <td ng-if="organization">Teams</td>
<td>Direct Repository Permissions</td> <td>Direct Repository Permissions</td>
@ -42,13 +41,6 @@
<tbody ng-repeat="robotInfo in robots | filter:robotFilter | orderBy:getShortenedRobotName" bindonce> <tbody ng-repeat="robotInfo in robots | filter:robotFilter | orderBy:getShortenedRobotName" bindonce>
<tr ng-class="robotInfo.showing_permissions ? 'open' : 'closed'"> <tr ng-class="robotInfo.showing_permissions ? 'open' : 'closed'">
<td class="caret-col hidden-xs" bo-if="(user || organization.is_admin)">
<span bo-if="robotInfo.repositories.length > 0" ng-click="showPermissions(robotInfo)">
<i class="fa"
ng-class="robotInfo.showing_permissions ? 'fa-caret-down' : 'fa-caret-right'"
data-title="View Permissions List" bs-tooltip></i>
</span>
</td>
<td class="robot"> <td class="robot">
<i class="fa ci-robot hidden-xs"></i> <i class="fa ci-robot hidden-xs"></i>
<a ng-click="showRobot(robotInfo)"> <a ng-click="showRobot(robotInfo)">
@ -57,7 +49,7 @@
</td> </td>
<td bo-if="organization"> <td bo-if="organization">
<span class="empty" bo-if="robotInfo.teams.length == 0"> <span class="empty" bo-if="robotInfo.teams.length == 0">
(Not a member of any team) No teams
</span> </span>
<span class="empty" bo-if="robotInfo.teams.length > 0"> <span class="empty" bo-if="robotInfo.teams.length > 0">
<span ng-repeat="team in robotInfo.teams" <span ng-repeat="team in robotInfo.teams"
@ -70,11 +62,16 @@
</td> </td>
<td> <td>
<span class="empty" bo-if="robotInfo.repositories.length == 0"> <span class="empty" bo-if="robotInfo.repositories.length == 0">
(No direct permissions on any repositories) No repositories
</span> </span>
<span class="member-perm-summary" bo-if="robotInfo.repositories.length > 0"> <span class="member-perm-summary" bo-if="robotInfo.repositories.length > 0">
Direct Permissions on <span ng-click="showPermissions(robotInfo)">
<i class="fa"
ng-class="robotInfo.showing_permissions ? 'fa-caret-down' : 'fa-caret-right'"
data-title="View Permissions List" bs-tooltip></i>
</span>
<a class="hidden-xs" is-only-text="!organization.is_admin" <a class="hidden-xs" is-only-text="!organization.is_admin"
ng-click="showPermissions(robotInfo)"> ng-click="showPermissions(robotInfo)">
<span bo-text="robotInfo.repositories.length"></span> <span bo-text="robotInfo.repositories.length"></span>