From 2552d027b9ac8ee8488e171911632fdf5df1980a Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 16 Sep 2016 00:16:31 -0400
Subject: [PATCH] no sites message for vault and current tab pages

---
 src/popup/app/current/views/current.html | 33 +++++++++++--------
 src/popup/app/vault/vaultController.js   | 16 +++++++--
 src/popup/app/vault/views/vault.html     | 41 ++++++++++++++----------
 3 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index c251443f9d..2252d1de32 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -5,21 +5,26 @@
     <div class="title">Current Tab Sites</div>
 </div>
 <div class="content content-tabs">
-    <div class="list">
-        <div class="list-grouped">
-            <div ng-click="fillSite(site)" class="list-grouped-item condensed" style="cursor: pointer;"
-                 ng-repeat="site in theSites = (sites | orderBy: ['name', 'username'])">
-                <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Password" ngclipboard ngclipboard-error="clipboardError(e)"
-                   ngclipboard-success="clipboardSuccess(e, 'Password')" data-clipboard-text="{{site.password}}" ng-class="{'disabled': !site.password}">
-                    <i class="fa fa-lg fa-key"></i>
-                </a>
-                <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Username" ngclipboard ngclipboard-error="clipboardError(e)"
-                   ngclipboard-success="clipboardSuccess(e, 'Username')" data-clipboard-text="{{site.username}}" ng-class="{'disabled': !site.username}">
-                    <i class="fa fa-lg fa-user"></i>
-                </a>
-                <span class="text">{{site.name}}</span>
-                <span class="detail">{{site.username}}</span>
+    <div ng-if="sites.length">
+        <div class="list">
+            <div class="list-grouped">
+                <div ng-click="fillSite(site)" class="list-grouped-item condensed" style="cursor: pointer;"
+                     ng-repeat="site in theSites = (sites | orderBy: ['name', 'username'])">
+                    <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Password" ngclipboard ngclipboard-error="clipboardError(e)"
+                       ngclipboard-success="clipboardSuccess(e, 'Password')" data-clipboard-text="{{site.password}}" ng-class="{'disabled': !site.password}">
+                        <i class="fa fa-lg fa-key"></i>
+                    </a>
+                    <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Username" ngclipboard ngclipboard-error="clipboardError(e)"
+                       ngclipboard-success="clipboardSuccess(e, 'Username')" data-clipboard-text="{{site.username}}" ng-class="{'disabled': !site.username}">
+                        <i class="fa fa-lg fa-user"></i>
+                    </a>
+                    <span class="text">{{site.name}}</span>
+                    <span class="detail">{{site.username}}</span>
+                </div>
             </div>
         </div>
     </div>
+    <div ng-if="!sites.length">
+        <p>No sites available for tab. <a href="" ng-click="addSite()">Add one</a></p>
+    </div>
 </div>
diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index 3352bfecca..0e34f6d1b8 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -64,9 +64,19 @@
             return item.name.toLowerCase();
         };
 
-        $scope.setFolderFilter = function (folder) {
-            $scope.folderFilter = {};
-            $scope.folderFilter.folderId = folder.id;
+        $scope.filterByFolder = function (folder) {
+
+        };
+
+        $scope.searchSites = function () {
+            if (!$scope.searchText) {
+                return;
+            }
+
+            return function (site) {
+                return (site.name && site.name.indexOf($scope.searchText) !== -1) ||
+                    (site.username && site.username.indexOf($scope.searchText) !== -1);
+            };
         };
 
         $scope.addSite = function () {
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index c6e754a393..dc138f7634 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -8,24 +8,31 @@
     </div>
 </div>
 <div class="content content-tabs">
-    <div class="list">
-        <div class="list-grouped" ng-repeat="folder in vaultFolders | orderBy: folderSort" ng-show="vaultFolders.length">
-            <div class="list-grouped-header">
-                <i class="fa fa-folder-open"></i> {{folder.name}}
-            </div>
-            <div ng-click="viewSite(site)" class="list-grouped-item condensed" style="cursor: pointer;" 
-               ng-repeat="site in folderSites = (vaultSites | filter: { folderId: folder.id } | filter: (searchText || '') | orderBy: ['name', 'username'])">
-                <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Password" ngclipboard ngclipboard-error="clipboardError(e)"
-                        ngclipboard-success="clipboardSuccess(e, 'Password')" data-clipboard-text="{{site.password}}" ng-class="{'disabled': !site.password}">
-                    <i class="fa fa-lg fa-key"></i>
-                </a>
-                <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Username" ngclipboard ngclipboard-error="clipboardError(e)"
-                        ngclipboard-success="clipboardSuccess(e, 'Username')" data-clipboard-text="{{site.username}}" ng-class="{'disabled': !site.username}">
-                    <i class="fa fa-lg fa-user"></i>
-                </a>
-                <span class="text">{{site.name}}</span>
-                <span class="detail">{{site.username}}</span>
+    <div ng-if="vaultSites.length">
+        <div class="list">
+            <div class="list-grouped" ng-repeat="folder in vaultFolders | orderBy: folderSort" ng-show="vaultFolders.length">
+                <div ng-if="(vaultSites |  filter: { folderId: folder.id } | filter: searchSites()).length">
+                    <div class="list-grouped-header">
+                        <i class="fa fa-folder-open"></i> {{folder.name}}
+                    </div>
+                    <div ng-click="viewSite(site)" class="list-grouped-item condensed" style="cursor: pointer;"
+                         ng-repeat="site in folderSites = (vaultSites | filter: { folderId: folder.id } | filter: searchSites() | orderBy: ['name', 'username'])">
+                        <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Password" ngclipboard ngclipboard-error="clipboardError(e)"
+                           ngclipboard-success="clipboardSuccess(e, 'Password')" data-clipboard-text="{{site.password}}" ng-class="{'disabled': !site.password}">
+                            <i class="fa fa-lg fa-key"></i>
+                        </a>
+                        <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Username" ngclipboard ngclipboard-error="clipboardError(e)"
+                           ngclipboard-success="clipboardSuccess(e, 'Username')" data-clipboard-text="{{site.username}}" ng-class="{'disabled': !site.username}">
+                            <i class="fa fa-lg fa-user"></i>
+                        </a>
+                        <span class="text">{{site.name}}</span>
+                        <span class="detail">{{site.username}}</span>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
+    <div ng-if="!sites.length">
+        <p>No sites to list. <a href="" ng-click="addSite()">Add one</a></p>
+    </div>
 </div>