Added option for a more compact montage view (still needs more work)

3 files changed, 18 insertions, 7 deletions

diff --git a/www/index.html b/www/index.html
index f5c9e47e..33fe6cb6 100644
--- a/www/index.html
+++ b/www/index.html
@@ -107,7 +107,7 @@
             </span>Events</ion-item>
 
                     <ion-item href="#/state" menu-close><span class=" item-icon-left">
-            <i class="icon ion-settings"></i>
+            <i class="icon ion-information-circled"></i>
             </span>System Status</ion-item>
 
                     <!-- <ion-item href="#/events-graphs" menu-close>Graphs</ion-item> -->
@@ -120,7 +120,7 @@
 
                       <ion-item nav-clear menu-close href="#/devoptions">
                         <span class=" item-icon-left">
-                <i class="icon ion-person"></i>
+                <i class="icon ion-settings"></i>
             </span> Developer Settings
                     </ion-item>
 
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 9313d660..3fff9c7c 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -7,6 +7,12 @@
 angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', function ($scope, $rootScope, ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http) {
 
     var timestamp = new Date().getUTCMilliseconds();
+    $scope.isMinimal = false;
+
+    $scope.switchMinimal = function()
+    {
+        $scope.minimal = !$scope.minimal;
+    };
 
       $scope.togglePTZ = function () {
         $scope.showPTZ = !$scope.showPTZ;
@@ -125,8 +131,6 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     };
 
     function controlPTZ(monitorId, cmd) {
-        //    curl -X POST "http://arjunrc.ddns.net:9898/zm/index.php" -d "view=request&request=control&user=admin&passwd=indiglo&id=4&control=moveConLeft"
-
 
         //curl -X POST "http://server.com/zm/index.php?view=request" -d "request=control&user=admin&passwd=xx&id=4&control=moveConLeft"
 
diff --git a/www/templates/montage.html b/www/templates/montage.html
index b1141905..d69fdfa7 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -3,6 +3,10 @@
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
     </ion-nav-buttons>
 
+      <ion-nav-buttons side="right">
+        <button class="button button-icon button-clear ion-android-contract" ng-click="switchMinimal()"></button>
+    </ion-nav-buttons>
+
     <ion-content padding="true">
 
         <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
@@ -19,15 +23,16 @@
 
             <span ng-repeat="monitor in monitors| limitTo: monLimit">
            
-          
+      <span ng-if="!minimal">
            <header class="header">&nbsp;<i class="ion-monitor"></i> {{monitor.Monitor.Name}}&nbsp;</header>
+                </span>
                <article class="main">
                 <!-- does not route via APIs. As of today, there is no way to do this via apis.
                  FIXME: I should probably not pass username and password here - instead go the http interceptor
                  and auth token mode -->
                 <div ng-if="!isSimulated()">
 
-                    <img  ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps=3&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable)"  />
+                    <img  ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable)"  />
 
                    </div>
 
@@ -37,6 +42,8 @@
 
                    </div>
                 </article>
+
+    <span ng-if="!minimal">
                <span style="font-size:10px;">
                <footer class="footer">
                   
@@ -49,7 +56,7 @@
                     </span>
             </span>
             </footer>
-
+                </span>
             </span>
         </div>
     </ion-content>