From 2552d027b9ac8ee8488e171911632fdf5df1980a Mon Sep 17 00:00:00 2001 From: Kyle Spearrin 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 c251443f..2252d1de 100644 --- a/src/popup/app/current/views/current.html +++ b/src/popup/app/current/views/current.html @@ -5,21 +5,26 @@
Current Tab Sites
-
-
-
- - - - - - - {{site.name}} - {{site.username}} +
+
+
+
+ + + + + + + {{site.name}} + {{site.username}} +
+
+

No sites available for tab. Add one

+
diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js index 3352bfec..0e34f6d1 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 c6e754a3..dc138f76 100644 --- a/src/popup/app/vault/views/vault.html +++ b/src/popup/app/vault/views/vault.html @@ -8,24 +8,31 @@
-
-
-
- {{folder.name}} -
-
- - - - - - - {{site.name}} - {{site.username}} +
+
+
+
+
+ {{folder.name}} +
+
+ + + + + + + {{site.name}} + {{site.username}} +
+
+
+

No sites to list. Add one

+