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

subvault list UI updates

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-01 22:17:28 -04:00
parent 3011e9a804
commit bf9414199c
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/services/cryptoService.js
View File

@ -30,6 +30,7 @@ angular
return; return;
} }
_service.clearOrgKeys();
var orgKeysb64 = {}, var orgKeysb64 = {},
_orgKeys = {}, _orgKeys = {},
setKey = false; setKey = false;

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

@ -26,39 +26,32 @@
</div> </div>
<div class="box-body" ng-class="{'no-padding': subvaultLogins.length}"> <div class="box-body" ng-class="{'no-padding': subvaultLogins.length}">
<div ng-show="!subvaultLogins.length"> <div ng-show="!subvaultLogins.length">
<p>No logins in this folder.</p> <p>No logins in this subvault.</p>
<button type="button" ng-click="addLogin(subvault)" class="btn btn-default btn-flat">Add a Login</button> <button type="button" ng-click="addLogin(subvault)" class="btn btn-default btn-flat">Add a Login</button>
</div> </div>
<div class="table-responsive" ng-show="subvaultLogins.length"> <div class="table-responsive" ng-show="subvaultLogins.length">
<table class="table table-striped table-hover table-selectable"> <table class="table table-striped table-hover table-vmiddle">
<thead>
<tr>
<th style="width: 75px; min-width: 75px;"></th>
<th>Name</th>
<th style="width: 300px;">Username</th>
</tr>
</thead>
<tbody> <tbody>
<tr ng-repeat="login in subvaultLogins = (logins | filter: filterBySubvault(subvault) | <tr ng-repeat="login in subvaultLogins = (logins | filter: filterBySubvault(subvault) |
filter: (main.searchVaultText || '') | orderBy: ['name', 'username'])"> filter: (main.searchVaultText || '') | orderBy: ['name', 'username'])">
<td class="actions"> <td style="width: 70px;">
<button type="button" ng-click="deleteLogin(login)" class="btn btn-link btn-table" <div class="btn-group" uib-dropdown dropdown-append-to-body>
uib-tooltip="Delete"> <button type="button" class="btn btn-default" uib-dropdown-toggle>
<i class="fa fa-lg fa-trash"></i> <i class="fa fa-cog"></i> <span class="caret"></span>
</button>
<button type="button" ng-click="editLogin(login)" class="btn btn-link btn-table"
uib-tooltip="View/Edit">
<i class="fa fa-lg fa-pencil"></i>
</button> </button>
<ul class="dropdown-menu" uib-dropdown-menu>
<li>
<a href="javascript:void(0)" ng-click="deleteLogin(login)" class="text-red">
<i class="fa fa-fw fa-trash"></i> Delete
</a>
</li>
</ul>
</div>
</td> </td>
<td ng-click="editLogin(login)"> <td>
<span ng-click="$event.stopPropagation()"> <a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
{{login.name}}
<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>
</span> <div class="text-sm text-muted">{{login.username}}</div>
</td>
<td ng-click="editLogin(login)">
<span ng-click="$event.stopPropagation()">{{login.username}}</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>