From ce64601e38d7a57ab6a97584857e9f71e3be8ef2 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 12 Apr 2017 21:58:36 -0400
Subject: [PATCH] ui tweaks

---
 src/app/vault/views/vaultLoginSubvaults.html |  4 ++--
 src/app/vault/views/vaultShare.html          | 10 ++++++----
 src/app/vault/views/vaultSubvaults.html      | 19 ++++++++++++++++---
 src/app/views/userLayout.html                |  2 +-
 src/less/vault.less                          | 14 +++++++++++++-
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/app/vault/views/vaultLoginSubvaults.html b/src/app/vault/views/vaultLoginSubvaults.html
index 702c7b4eec..3f1118eb76 100644
--- a/src/app/vault/views/vaultLoginSubvaults.html
+++ b/src/app/vault/views/vaultLoginSubvaults.html
@@ -4,7 +4,7 @@
 </div>
 <form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise">
     <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">
             <h4>Errors have occured</h4>
             <ul>
@@ -26,7 +26,7 @@
                                    ng-checked="allSelected()"
                                    ng-click="toggleSubvaultSelectionAll($event)">
                         </th>
-                        <th>Subvault</th>
+                        <th>Name</th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/src/app/vault/views/vaultShare.html b/src/app/vault/views/vaultShare.html
index 465fd8eea9..0a480f82fe 100644
--- a/src/app/vault/views/vaultShare.html
+++ b/src/app/vault/views/vaultShare.html
@@ -13,7 +13,7 @@
         </div>
         <div ng-show="!organizations.length" class="callout callout-default">
             <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">
                 Create an Organization
             </a>
@@ -25,11 +25,13 @@
                     <option ng-repeat="org in organizations | orderBy: ['name']" value="{{org.id}}">{{org.name}}</option>
                 </select>
             </div>
+            <h4 ng-hide="!loadingSubvaults && !orgSubvaults.length">Subvault Access</h4>
             <div ng-show="loadingSubvaults && !orgSubvaults.length">
                 <p>Loading...</p>
             </div>
-            <div ng-show="!loadingSubvaults && !orgSubvaults.length">
-                <p>No subvaults with write access.</p>
+            <div ng-show="!loadingSubvaults && !orgSubvaults.length" class="callout callout-default">
+                <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 class="table-responsive" ng-show="orgSubvaults.length" style="margin: 0;">
                 <table class="table table-striped table-hover" style="margin: 0;">
@@ -40,7 +42,7 @@
                                        ng-checked="allSelected()"
                                        ng-click="toggleSubvaultSelectionAll($event)">
                             </th>
-                            <th>Subvault</th>
+                            <th>Name</th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/src/app/vault/views/vaultSubvaults.html b/src/app/vault/views/vaultSubvaults.html
index 2dfcc8763c..a653953d9e 100644
--- a/src/app/vault/views/vaultSubvaults.html
+++ b/src/app/vault/views/vaultSubvaults.html
@@ -8,8 +8,18 @@
     <div ng-show="loading && !subvaults.length">
         <p>Loading...</p>
     </div>
-    <div ng-show="!loading && !subvaults.length">
-        <p>No subvaults.</p>
+    <div class="callout callout-default" style="background: #fff;" ng-show="!loading && !subvaults.length">
+        <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 class="box" ng-class="{'collapsed-box': subvault.collapsed}" ng-repeat="subvault in subvaults | orderBy: ['name']"
          ng-show="subvaults.length && (!main.searchVaultText || subvaultLogins.length)">
@@ -28,7 +38,10 @@
         <div class="box-body" ng-class="{'no-padding': subvaultLogins.length}">
             <div ng-show="!subvaultLogins.length">
                 <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 class="table-responsive" ng-show="subvaultLogins.length">
                 <table class="table table-striped table-hover table-vmiddle">
diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html
index c67df68651..da7639d275 100644
--- a/src/app/views/userLayout.html
+++ b/src/app/views/userLayout.html
@@ -86,7 +86,7 @@
             </li>
             <li>
                 <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>
             </li>
             <li class="header">
diff --git a/src/less/vault.less b/src/less/vault.less
index 82f359e388..76319e5579 100644
--- a/src/less/vault.less
+++ b/src/less/vault.less
@@ -244,7 +244,7 @@ form .btn .loading-icon {
 /* Callouts */
 
 .callout.callout-default {
-    &:extend(.bg-gray-light);
+    background-color: #fff;
     border-color: darken(@gray, 10%);
 
     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 {
     text-decoration: none;
 
@@ -294,6 +302,10 @@ form .btn .loading-icon {
     top: 5px;
 }
 
+.box-body p:last-child {
+    margin-bottom: 0;
+}
+
 /* Toastr */
 
 #toast-container {