ui tweaks

This commit is contained in:
Kyle Spearrin 2017-04-12 21:58:36 -04:00
parent b9f6351720
commit ce64601e38
5 changed files with 38 additions and 11 deletions

View File

@ -4,7 +4,7 @@
</div> </div>
<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise"> <form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise">
<div class="modal-body"> <div class="modal-body">
<p>Edit the subvaults that this subvault is being shared with.</p> <p>Edit the subvaults that this login is being shared with.</p>
<div class="callout callout-danger validation-errors" ng-show="form.$errors"> <div class="callout callout-danger validation-errors" ng-show="form.$errors">
<h4>Errors have occured</h4> <h4>Errors have occured</h4>
<ul> <ul>
@ -26,7 +26,7 @@
ng-checked="allSelected()" ng-checked="allSelected()"
ng-click="toggleSubvaultSelectionAll($event)"> ng-click="toggleSubvaultSelectionAll($event)">
</th> </th>
<th>Subvault</th> <th>Name</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

View File

@ -13,7 +13,7 @@
</div> </div>
<div ng-show="!organizations.length" class="callout callout-default"> <div ng-show="!organizations.length" class="callout callout-default">
<h4><i class="fa fa-info-circle"></i> No Organizations</h4> <h4><i class="fa fa-info-circle"></i> No Organizations</h4>
<p>You do not belong to any organizations.</p> <p>You do not belong to any organizations. Organizations allow you to share logins with other bitwarden users.</p>
<a ng-click="createOrg()" class="btn btn-default btn-flat"> <a ng-click="createOrg()" class="btn btn-default btn-flat">
Create an Organization Create an Organization
</a> </a>
@ -25,11 +25,13 @@
<option ng-repeat="org in organizations | orderBy: ['name']" value="{{org.id}}">{{org.name}}</option> <option ng-repeat="org in organizations | orderBy: ['name']" value="{{org.id}}">{{org.name}}</option>
</select> </select>
</div> </div>
<h4 ng-hide="!loadingSubvaults && !orgSubvaults.length">Subvault Access</h4>
<div ng-show="loadingSubvaults && !orgSubvaults.length"> <div ng-show="loadingSubvaults && !orgSubvaults.length">
<p>Loading...</p> <p>Loading...</p>
</div> </div>
<div ng-show="!loadingSubvaults && !orgSubvaults.length"> <div ng-show="!loadingSubvaults && !orgSubvaults.length" class="callout callout-default">
<p>No subvaults with write access.</p> <h4><i class="fa fa-info-circle"></i> No Subvaults</h4>
<p>You do not have write access to any subvaults for this organization.</p>
</div> </div>
<div class="table-responsive" ng-show="orgSubvaults.length" style="margin: 0;"> <div class="table-responsive" ng-show="orgSubvaults.length" style="margin: 0;">
<table class="table table-striped table-hover" style="margin: 0;"> <table class="table table-striped table-hover" style="margin: 0;">
@ -40,7 +42,7 @@
ng-checked="allSelected()" ng-checked="allSelected()"
ng-click="toggleSubvaultSelectionAll($event)"> ng-click="toggleSubvaultSelectionAll($event)">
</th> </th>
<th>Subvault</th> <th>Name</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

View File

@ -8,8 +8,18 @@
<div ng-show="loading && !subvaults.length"> <div ng-show="loading && !subvaults.length">
<p>Loading...</p> <p>Loading...</p>
</div> </div>
<div ng-show="!loading && !subvaults.length"> <div class="callout callout-default" style="background: #fff;" ng-show="!loading && !subvaults.length">
<p>No subvaults.</p> <h4><i class="fa fa-info-circle"></i> No Subvaults</h4>
<p>
You do not have any subvaults being shared with you.
</p>
<p>
Subvaults allow you to share logins with other bitwarden users. To start using subvaults create an organization or
ask an existing organization to invite you.
</p>
<a ui-sref="backend.user.settingsCreateOrg" class="btn btn-default btn-flat">
Create an Organization
</a>
</div> </div>
<div class="box" ng-class="{'collapsed-box': subvault.collapsed}" ng-repeat="subvault in subvaults | orderBy: ['name']" <div class="box" ng-class="{'collapsed-box': subvault.collapsed}" ng-repeat="subvault in subvaults | orderBy: ['name']"
ng-show="subvaults.length && (!main.searchVaultText || subvaultLogins.length)"> ng-show="subvaults.length && (!main.searchVaultText || subvaultLogins.length)">
@ -28,7 +38,10 @@
<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 subvault.</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> <p>
Share a login to this subvault by selecting <i class="fa fa-share-alt"></i> <b>Share</b> or
<i class="fa fa-share-alt"></i> <b>Subvaults</b> from the login's options (<i class="fa fa-cog"></i>) menu.
</p>
</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-vmiddle"> <table class="table table-striped table-hover table-vmiddle">

View File

@ -86,7 +86,7 @@
</li> </li>
<li> <li>
<a href="#"> <a href="#">
<i class="fa fa-certificate fa-fw"></i> <span>Download Apps</span> <i class="fa fa-cubes fa-fw"></i> <span>Get The Apps</span>
</a> </a>
</li> </li>
<li class="header"> <li class="header">

View File

@ -244,7 +244,7 @@ form .btn .loading-icon {
/* Callouts */ /* Callouts */
.callout.callout-default { .callout.callout-default {
&:extend(.bg-gray-light); background-color: #fff;
border-color: darken(@gray, 10%); border-color: darken(@gray, 10%);
a { a {
@ -258,6 +258,14 @@ form .btn .loading-icon {
} }
} }
.modal .callout.callout-default, .box .callout.callout-default {
&:extend(.bg-gray-light);
.btn-default:not(:hover) {
background-color: #ffffff;
}
}
.callout a.btn { .callout a.btn {
text-decoration: none; text-decoration: none;
@ -294,6 +302,10 @@ form .btn .loading-icon {
top: 5px; top: 5px;
} }
.box-body p:last-child {
margin-bottom: 0;
}
/* Toastr */ /* Toastr */
#toast-container { #toast-container {