bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-12 06:13:28 +00:00
Code Issues Releases Wiki Activity

use uib-dropdowns

Browse Source
This commit is contained in:
Kyle Spearrin
2017-04-01 10:25:48 -04:00
parent a678f03284
commit 3011e9a804
4 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,11 +34,11 @@
<tr ng-repeat="user in filteredUsers = (users | filter: (filterSearch || '') | <tr ng-repeat="user in filteredUsers = (users | filter: (filterSearch || '') |
orderBy: ['type', 'name', 'email'])"> orderBy: ['type', 'name', 'email'])">
<td style="width: 70px;"> <td style="width: 70px;">
<div class="btn-group"> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default" uib-dropdown-toggle>
<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"> <ul class="dropdown-menu" uib-dropdown-menu>
<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

6
src/app/organization/views/organizationSubvaults.html
View File

@@ -38,11 +38,11 @@
<tr ng-repeat="subvault in filteredSubvaults = (subvaults | filter: (filterSearch || '') | <tr ng-repeat="subvault in filteredSubvaults = (subvaults | filter: (filterSearch || '') |
orderBy: ['name'])"> orderBy: ['name'])">
<td style="width: 70px;"> <td style="width: 70px;">
<div class="btn-group"> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default" uib-dropdown-toggle>
<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"> <ul class="dropdown-menu" uib-dropdown-menu>
<li> <li>
<a href="javascript:void(0)" ng-click="users(subvault)"> <a href="javascript:void(0)" ng-click="users(subvault)">
<i class="fa fa-fw fa-users"></i> Users <i class="fa fa-fw fa-users"></i> Users

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

@@ -16,14 +16,16 @@
Favorites <small>{{favoriteLogins.length}} logins</small> Favorites <small>{{favoriteLogins.length}} logins</small>
</h3> </h3>
<div class="box-tools"> <div class="box-tools">
<div class="btn-group"> <div class="btn-group" uib-dropdown>
<button type="button" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown" uib-tooltip="Options"> <button type="button" class="btn btn-box-tool" uib-tooltip="Options" uib-dropdown-toggle>
<i class="fa fa-gear"></i> <i class="fa fa-gear"></i>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
<li> <li>
<a href="#" ng-click="addLogin(null, true)">Add Login</a> <a href="#" ng-click="addLogin(null, true)">
<i class="fa fa-fw fa-plus-circle"></i> Add Login
</a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -43,11 +45,11 @@
<tr ng-repeat="login in favoriteLogins = (logins | filter: { favorite: true } | <tr ng-repeat="login in favoriteLogins = (logins | filter: { favorite: true } |
filter: (main.searchVaultText || '') | orderBy: ['name', 'username'])"> filter: (main.searchVaultText || '') | orderBy: ['name', 'username'])">
<td style="width: 70px;"> <td style="width: 70px;">
<div class="btn-group"> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default" uib-dropdown-toggle>
<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"> <ul class="dropdown-menu" uib-dropdown-menu>
<li ng-show="!login.organizationId"> <li ng-show="!login.organizationId">
<a href="javascript:void(0)" ng-click="share(login)"> <a href="javascript:void(0)" ng-click="share(login)">
<i class="fa fa-fw fa-share-alt"></i> Share <i class="fa fa-fw fa-share-alt"></i> Share
@@ -80,20 +82,26 @@
{{folder.name}} <small>{{folderLogins.length}} logins</small> {{folder.name}} <small>{{folderLogins.length}} logins</small>
</h3> </h3>
<div class="box-tools"> <div class="box-tools">
<div class="btn-group"> <div class="btn-group" uib-dropdown>
<button type="button" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown" uib-tooltip="Options"> <button type="button" class="btn btn-box-tool" uib-dropdown-toggle uib-tooltip="Options">
<i class="fa fa-gear"></i> <i class="fa fa-gear"></i>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
<li> <li>
<a href="#" ng-click="addLogin(folder)">Add Login</a> <a href="#" ng-click="addLogin(folder)">
<i class="fa fa-fw fa-plus-circle"></i> Add Login
</a>
</li> </li>
<li ng-show="folder.id"> <li ng-show="folder.id">
<a href="#" ng-click="editFolder(folder)">Edit Folder</a> <a href="#" ng-click="editFolder(folder)">
<i class="fa fa-fw fa-pencil"></i> Edit Folder
</a>
</li> </li>
<li ng-show="canDeleteFolder(folder)"> <li ng-show="canDeleteFolder(folder)">
<a href="#" ng-click="deleteFolder(folder)">Delete Folder</a> <a href="#" ng-click="deleteFolder(folder)" class="text-red">
<i class="fa fa-fw fa-trash"></i> Delete Folder
</a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -113,11 +121,11 @@
<tr ng-repeat="login in folderLogins = (logins | filter: { folderId: folder.id } | <tr ng-repeat="login in folderLogins = (logins | filter: { folderId: folder.id } |
filter: (main.searchVaultText || '') | orderBy: ['name', 'username'])"> filter: (main.searchVaultText || '') | orderBy: ['name', 'username'])">
<td style="width: 70px;"> <td style="width: 70px;">
<div class="btn-group"> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default" uib-dropdown-toggle>
<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"> <ul class="dropdown-menu" uib-dropdown-menu>
<li ng-show="!login.organizationId"> <li ng-show="!login.organizationId">
<a href="javascript:void(0)" ng-click="share(login)"> <a href="javascript:void(0)" ng-click="share(login)">
<i class="fa fa-fw fa-share-alt"></i> Share <i class="fa fa-fw fa-share-alt"></i> Share

6
src/less/vault.less
View File

@@ -116,11 +116,15 @@ form .btn .loading-icon {
.dropdown-menu { .dropdown-menu {
border-color: #ccc; border-color: #ccc;
> li > a > .fa { > li > a {
color: @text-color;
> .fa {
margin-right: 0; margin-right: 0;
margin-left: -5px; margin-left: -5px;
} }
} }
}
/* Forms */ /* Forms */