added further hints to ui for user convenience

Signed-off-by: fnuesse <felix.nuesse@t-online.de>

2 files changed, 50 insertions, 18 deletions

diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index 2a12d5b8..59b1bf2b 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -372,25 +372,51 @@
 
                 }, true);
 
+                $scope.no_credentials_label=[];
+                $scope.no_credentials_label.all=true;
+                $scope.no_credentials_label.s_good=false;
+                $scope.no_credentials_label.s_medium=false;
+                $scope.no_credentials_label.s_low=false;
+                $scope.no_credentials_label.expired=false;
+
+                $scope.disableAllLabels = function(){
+                    $scope.no_credentials_label.all=false;
+                    $scope.no_credentials_label.s_good=false;
+                    $scope.no_credentials_label.s_medium=false;
+                    $scope.no_credentials_label.s_low=false;
+                    $scope.no_credentials_label.expired=false;
+				};
+
                 //watch for special tags
                 $scope.$on('filterSpecial', function(event, args) {
+
+                    $scope.disableAllLabels();
                     switch (args) {
-                        case "strength_good": $scope.filterStrength(3,1000); break;
-                        case "strength_medium": $scope.filterStrength(2,3); break;
-                        case "strength_low": $scope.filterStrength(0,1); break;
-                        case "expired": $scope.filterExpired(); break;
-                        case "all": $scope.filterAll(); break;
+                        case "strength_good":
+                        	$scope.filterStrength(3,1000);
+                            $scope.no_credentials_label.s_good=true;
+                        	break;
+                        case "strength_medium":
+                        	$scope.filterStrength(2,3);
+                            $scope.no_credentials_label.s_medium=true;
+                        	break;
+                        case "strength_low":
+                        	$scope.filterStrength(0,1);
+                            $scope.no_credentials_label.s_low=true;
+                        	break;
+                        case "expired":
+                        	$scope.filterExpired();
+                            $scope.no_credentials_label.expired=true;
+                        	break;
+                        case "all":
+                        	$scope.filterAll();
+                            $scope.no_credentials_label.all=true;
+                        	break;
                     }
-
-                    $scope.delete_time=0;
-                    $rootScope.$broadcast('release_trashbin', $scope.delete_time);
-
                 });
 
-
-                $scope.getListSize = function(){
-                	var l = $scope.filtered_credentials;//$scope.active_vault.credentials.length
-                	console.log(l.length);
+                $scope.getListSizes = function(){
+                	var l = $scope.filtered_credentials;
 
                 	var deleted=0;
                     for (var i = 0; i < l.length; i++) {
@@ -399,7 +425,12 @@
 						}
                     }
 
-                	return l.length-deleted;
+                    var result=[];
+                    result.listsize=l.length;
+                    result.listsize_wout_deleted=l.length-deleted;
+                    result.listsize_deleted=deleted;
+
+                	return result;
 				};
 
                 $scope.filterAll = function(){
diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js
index 97288bfa..aa415cb5 100644
--- a/js/app/controllers/menu.js
+++ b/js/app/controllers/menu.js
@@ -111,6 +111,10 @@
 				};
 
                 $scope.filterCredentialBySpecial = function (string) {
+                	if(string !== 'nav_trashbin'){
+                        $scope.delete_time=0;
+                        $rootScope.$broadcast('set_delete_time', $scope.delete_time);
+					}
                     $rootScope.$broadcast('filterSpecial',string);
                 };
 
@@ -152,15 +156,12 @@
 					$scope.available_tags = TagService.getTags();
 				}, true);
 
-                $scope.$on('release_trashbin', function(event, args) {
-                    $scope.delete_time=args;
-				});
-
 				$scope.toggleDeleteTime = function () {
 					if ($scope.delete_time > 0) {
 						$scope.delete_time = 0;
 					} else {
 						$scope.delete_time = 1;
+                        this.filterCredentialBySpecial('nav_trashbin');
 					}
 					$rootScope.$broadcast('set_delete_time', $scope.delete_time);
 				};