From 0feea6091b916bb64ea9ac5326ce0971a957b28d Mon Sep 17 00:00:00 2001 From: Kyle Spearrin <kyle.spearrin@gmail.com> Date: Thu, 6 Apr 2017 10:24:15 -0400 Subject: [PATCH] subvault messages when sharing --- src/app/vault/views/vaultShare.html | 15 +++++++++------ src/app/views/userLayout.html | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/app/vault/views/vaultShare.html b/src/app/vault/views/vaultShare.html index f3239586a8..65cb3d42ec 100644 --- a/src/app/vault/views/vaultShare.html +++ b/src/app/vault/views/vaultShare.html @@ -1,4 +1,4 @@ -<div class="modal-header"> +<div class="modal-header"> <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">×</span></button> <h4 class="modal-title"><i class="fa fa-share-alt"></i> Share Login <small>{{login.name}}</small></h4> </div> @@ -17,11 +17,13 @@ <option ng-repeat="org in organizations | orderBy: ['name']" value="{{org.id}}">{{org.name}}</option> </select> </div> - - <div ng-show="!loadingSubvaults && !subvaults.length"> - <p>No subvaults.</p> + <div ng-show="loadingSubvaults && !orgSubvaults.length"> + <p>Loading...</p> </div> - <div class="table-responsive" ng-show="subvaults.length" style="margin: 0;"> + <div ng-show="!loadingSubvaults && !orgSubvaults.length"> + <p>No subvaults with write access.</p> + </div> + <div class="table-responsive" ng-show="orgSubvaults.length" style="margin: 0;"> <table class="table table-striped table-hover" style="margin: 0;"> <thead> <tr> @@ -34,7 +36,8 @@ </tr> </thead> <tbody> - <tr ng-repeat="subvault in subvaults | filter: { organizationId: model.organizationId } | orderBy: ['name']"> + <tr ng-repeat="subvault in orgSubvaults = + (subvaults | filter: { organizationId: model.organizationId } | orderBy: ['name'])"> <td valign="middle"> <input type="checkbox" name="selectedSubvaults[]" diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html index bc805c59fa..ff7afd747a 100644 --- a/src/app/views/userLayout.html +++ b/src/app/views/userLayout.html @@ -92,7 +92,7 @@ <li ng-repeat="org in orgs | orderBy: ['name']"> <a href="javascript:void(0)" ng-click="viewOrganization(org.id)"> <letter-avatar data="{{org.name}}" avclass="img-responsive img-rounded" round="false" - avheight="40" avwidth="40"></letter-avatar> + avheight="40" avwidth="40" bgcolor="#1a2226"></letter-avatar> </a> </li> </ul>