dropdown options and iconography for subvaults
This commit is contained in:
parent
0feea6091b
commit
8f007a70db
|
@ -45,6 +45,7 @@
|
||||||
templateUrl: 'app/organization/views/organizationSubvaultsUsers.html',
|
templateUrl: 'app/organization/views/organizationSubvaultsUsers.html',
|
||||||
controller: 'organizationSubvaultsUsersController',
|
controller: 'organizationSubvaultsUsersController',
|
||||||
size: 'lg',
|
size: 'lg',
|
||||||
|
windowClass: 'organizationSubvaultsUsersModal',
|
||||||
resolve: {
|
resolve: {
|
||||||
subvault: function () { return subvault; }
|
subvault: function () { return subvault; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
$scope.users = [];
|
$scope.users = [];
|
||||||
|
|
||||||
$uibModalInstance.opened.then(function () {
|
$uibModalInstance.opened.then(function () {
|
||||||
|
$scope.modalWindow = angular.element(document).find('.organizationSubvaultsUsersModal');
|
||||||
|
|
||||||
$scope.loading = false;
|
$scope.loading = false;
|
||||||
apiService.subvaultUsers.listSubvault(
|
apiService.subvaultUsers.listSubvault(
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,6 +39,11 @@
|
||||||
<i class="fa fa-cog"></i> <span class="caret"></span>
|
<i class="fa fa-cog"></i> <span class="caret"></span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" uib-dropdown-menu>
|
<ul class="dropdown-menu" uib-dropdown-menu>
|
||||||
|
<li>
|
||||||
|
<a href="javascript:void(0)" ng-click="edit(user.id)">
|
||||||
|
<i class="fa fa-fw fa-pencil"></i> Edit
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
<li ng-show="user.status === 1">
|
<li ng-show="user.status === 1">
|
||||||
<a href="javascript:void(0)" ng-click="confirm(user)">
|
<a href="javascript:void(0)" ng-click="confirm(user)">
|
||||||
<i class="fa fa-fw fa-check"></i> Confirm
|
<i class="fa fa-fw fa-check"></i> Confirm
|
||||||
|
|
|
@ -9,15 +9,23 @@
|
||||||
<div ng-show="!loading && !users.length">
|
<div ng-show="!loading && !users.length">
|
||||||
<p>No users.</p>
|
<p>No users.</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="table-responsive" ng-show="users.length">
|
<div class="table-responsive" ng-show="users.length" style="margin: 0;">
|
||||||
<table class="table table-striped table-hover table-vmiddle">
|
<table class="table table-striped table-hover table-vmiddle" style="margin: 0;">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr ng-repeat="user in users | orderBy: ['email']">
|
<tr ng-repeat="user in users | orderBy: ['email']">
|
||||||
<td style="width: 40px;">
|
<td style="width: 70px;">
|
||||||
<button type="button" class="btn btn-link btn-table" uib-tooltip="Remove User"
|
<div class="btn-group" uib-dropdown dropdown-append-to="modalWindow">
|
||||||
ng-click="remove(user)">
|
<button type="button" class="btn btn-default" uib-dropdown-toggle>
|
||||||
<i class="fa fa-lg fa-remove"></i>
|
<i class="fa fa-cog"></i> <span class="caret"></span>
|
||||||
</button>
|
</button>
|
||||||
|
<ul class="dropdown-menu" uib-dropdown-menu>
|
||||||
|
<li>
|
||||||
|
<a href="javascript:void(0)" ng-click="remove(user)" class="text-red">
|
||||||
|
<i class="fa fa-fw fa-remove"></i> Remove
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td style="width: 45px;">
|
<td style="width: 45px;">
|
||||||
<letter-avatar data="{{user.name || user.email}}"></letter-avatar>
|
<letter-avatar data="{{user.name || user.email}}"></letter-avatar>
|
||||||
|
@ -41,9 +49,6 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<h4>Add User</h4>
|
|
||||||
<p>Coming soon...</p>
|
|
||||||
<p>Navigate to a specific user from the "people" page to associate them to a subvault.</p>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
|
<button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
|
<a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
|
||||||
<i class="fa fa-user text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
|
<i class="fa fa-share-alt text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
|
||||||
<div class="text-sm text-muted">{{login.username}}</div>
|
<div class="text-sm text-muted">{{login.username}}</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -164,7 +164,7 @@
|
||||||
<td>
|
<td>
|
||||||
<a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
|
<a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
|
||||||
<i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="login.favorite"></i>
|
<i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="login.favorite"></i>
|
||||||
<i class="fa fa-user text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
|
<i class="fa fa-share-alt text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
|
||||||
<div class="text-sm text-muted">{{login.username}}</div>
|
<div class="text-sm text-muted">{{login.username}}</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
ng-show="subvaults.length && (!main.searchVaultText || subvaultLogins.length)">
|
ng-show="subvaults.length && (!main.searchVaultText || subvaultLogins.length)">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">
|
<h3 class="box-title">
|
||||||
<i class="fa fa-server"></i>
|
<i class="fa fa-share-alt-square"></i>
|
||||||
{{subvault.name}} <small>{{subvaultLogins.length}} logins</small>
|
{{subvault.name}} <small>{{subvaultLogins.length}} logins</small>
|
||||||
</h3>
|
</h3>
|
||||||
<div class="box-tools">
|
<div class="box-tools">
|
||||||
|
|
Loading…
Reference in New Issue