Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-27 12:36:14 +01:00
Code Issues Projects Releases Wiki Activity

dropdown options and iconography for subvaults

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-06 11:00:53 -04:00
parent 0feea6091b
commit 8f007a70db
6 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/organization/organizationSubvaultsController.js
View File

@ -45,6 +45,7 @@
templateUrl: 'app/organization/views/organizationSubvaultsUsers.html',
controller: 'organizationSubvaultsUsersController',
size: 'lg',
windowClass: 'organizationSubvaultsUsersModal',
resolve: {
subvault: function () { return subvault; }
}

2
src/app/organization/organizationSubvaultsUsersController.js
View File

@ -8,6 +8,8 @@
$scope.users = [];
$uibModalInstance.opened.then(function () {
$scope.modalWindow = angular.element(document).find('.organizationSubvaultsUsersModal');
$scope.loading = false;
apiService.subvaultUsers.listSubvault(
{

5
src/app/organization/views/organizationPeople.html
View File

@ -39,6 +39,11 @@
<i class="fa fa-cog"></i> <span class="caret"></span>
</button>
<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">
<a href="javascript:void(0)" ng-click="confirm(user)">
<i class="fa fa-fw fa-check"></i> Confirm

23
src/app/organization/views/organizationSubvaultsUsers.html
View File

@ -9,15 +9,23 @@
<div ng-show="!loading && !users.length">
<p>No users.</p>
</div>
<div class="table-responsive" ng-show="users.length">
<table class="table table-striped table-hover table-vmiddle">
<div class="table-responsive" ng-show="users.length" style="margin: 0;">
<table class="table table-striped table-hover table-vmiddle" style="margin: 0;">
<tbody>
<tr ng-repeat="user in users | orderBy: ['email']">
<td style="width: 40px;">
<button type="button" class="btn btn-link btn-table" uib-tooltip="Remove User"
ng-click="remove(user)">
<i class="fa fa-lg fa-remove"></i>
<td style="width: 70px;">
<div class="btn-group" uib-dropdown dropdown-append-to="modalWindow">
<button type="button" class="btn btn-default" uib-dropdown-toggle>
<i class="fa fa-cog"></i> <span class="caret"></span>
</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 style="width: 45px;">
<letter-avatar data="{{user.name || user.email}}"></letter-avatar>
@ -41,9 +49,6 @@
</tbody>
</table>
</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 class="modal-footer">
<button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>

4
src/app/vault/views/vault.html
View File

@ -76,7 +76,7 @@
</td>
<td>
<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>
</td>
</tr>
@ -164,7 +164,7 @@
<td>
<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-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>
</td>
</tr>

2
src/app/vault/views/vaultSubvaults.html
View File

@ -15,7 +15,7 @@
ng-show="subvaults.length && (!main.searchVaultText || subvaultLogins.length)">
<div class="box-header with-border">
<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>
</h3>
<div class="box-tools">