#570 enabled icon toggle so as not to overwhelm small screens. Also added pinning.

2 files changed, 10 insertions, 4 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 2a4ac72f..1c74255b 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -171,7 +171,7 @@ angular.module('zmApp.controllers')
         'reloadInMontage': false,
         'momentGridSize': 40,
         'momentMonitorFilter': [],
-        'enableMomentSubMenu': false,
+        'enableMomentSubMenu': true,
 
 
       };
@@ -1030,7 +1030,7 @@ angular.module('zmApp.controllers')
 
                   if (typeof loginData.enableMomentSubMenu == 'undefined') {
 
-                    loginData.enableMomentSubMenu = false;
+                    loginData.enableMomentSubMenu = true;
 
                   }
 
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js
index d4eceb7f..84af262e 100644
--- a/www/js/MomentCtrl.js
+++ b/www/js/MomentCtrl.js
@@ -239,7 +239,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
   $scope.togglePin =function(ndx) {
     $scope.moments[ndx].Event.pinned = !$scope.moments[ndx].Event.pinned;
     if ($scope.moments[ndx].Event.pinned) {
-      $scope.moments[ndx].Event.pinnedIcon ="animated infinite flash ion-pin";
+      $scope.moments[ndx].Event.pinnedIcon =" ion-pin assertive";
     }
     else {
       $scope.moments[ndx].Event.pinnedIcon ="ion-pin";
@@ -518,7 +518,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
   };
 
   $scope.getMoments = function (cond) {
-    momentType = cond;
+    if (!cond)  cond = momentType;
     getMoments(cond);
   };
 
@@ -670,6 +670,10 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
   });
 
 
+  $scope.toggleIcons = function() {
+
+    $scope.showIcons = !$scope.showIcons;
+  };
 
   $scope.$on('$ionicView.beforeEnter', function () {
     /*var w = Math.round(parseInt($rootScope.devWidth) / parseInt($rootScope.pixelRatio)) ;
@@ -682,6 +686,8 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
     p = Math.ceil(p/5)*5;
     console.log ("P="+p);*/
 
+    $scope.showIcons = true;
+
     var ld = NVRDataModel.getLogin();
 
     $scope.loadingStatus = $translate.instant('kLoading');