diff options
| -rw-r--r-- | www/css/style.css | 4 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 20 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 23 |
3 files changed, 43 insertions, 4 deletions
diff --git a/www/css/style.css b/www/css/style.css index 45f66257..2067b06a 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -24,6 +24,7 @@ Credit: https://css-tricks.com/snippets/css/a-guide-to-flexbox/ font-weight: normal; text-align: left; flex-wrap:wrap; + } .wrapper > * { @@ -49,7 +50,8 @@ Credit: https://css-tricks.com/snippets/css/a-guide-to-flexbox/ .main { text-align: center; background: #EEEEEE; - + margin: 0px; + padding: 0px; /*padding:2px;*/ } diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index eed6424c..952b4e88 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -17,6 +17,8 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', ['$ionicPlatfo $scope.connKey = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; + + // These are the commands ZM uses to move around // in ZMS var eventCommands = { @@ -26,7 +28,11 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', ['$ionicPlatfo zoomout: "9", stop: "3", pause: "1", - play: "2" + play: "2", + fastFwd:"4", + slowFwd:"5", + fastRev:"7", + slowRev:"6" }; $scope.showSearch = false; @@ -270,6 +276,18 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', ['$ionicPlatfo case "1": toast_blurb = "pausing playback for "; break; + case "4": + toast_blurb = "fast forward "; + break; + case "5": + toast_blurb = "slow forward "; + break; + case "6": + toast_blurb = "slow rewind "; + break; + case "7": + toast_blurb = "fast rewind "; + break; } diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index a3cd5bcc..4880939e 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -9,13 +9,14 @@ ng-src="{{loginData.streamingurl}}/cgi-bin/zms?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps={{loginData.maxFPS}}&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" /> </ion-scroll> </div> + </ion-content> </ion-modal-view> <nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> <button mfb-button icon="ion-close" label="exit event view" ng-click="closeModal()"></button> - <a mfb-button icon="ion-skip-backward" label="previous" ng-click="controlEventStream(eventCommands.previous)"></a> - <a mfb-button icon="ion-skip-forward" label="next" ng-click="controlEventStream(eventCommands.next)"></a> + <a mfb-button icon="ion-reply" label="previous event" ng-click="controlEventStream(eventCommands.previous)"></a> + <a mfb-button icon="ion-forward" label="next event" ng-click="controlEventStream(eventCommands.next)"></a> </nav> <nav mfb-menu position="bl" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> @@ -23,3 +24,21 @@ <a mfb-button icon="ion-pause" label="pause" ng-click="controlEventStream(eventCommands.pause)"></a> <a mfb-button icon="ion-play" label="play" ng-click="controlEventStream(eventCommands.play)"></a> </nav> + + +<nav mfb-menu position="tr" effect="zoomin" label="collapse" active-icon="ion-chevron-up" resting-icon="ion-chevron-down" toggling-method="click" class="eventbuttons"> + <a mfb-button icon="ion-ios-fastforward" label="fast forward" ng-click="controlEventStream(eventCommands.fastFwd)"></a> + <a mfb-button icon="ion-ios-fastforward-outline" label="slow forward" ng-click="controlEventStream(eventCommands.slowFwd)"></a> + <a mfb-button icon="ion-ios-rewind" label="fast rewind" ng-click="controlEventStream(eventCommands.fastRev)"></a> + <a mfb-button icon="ion-ios-rewind-outline" label="slow rewind" ng-click="controlEventStream(eventCommands.slowRev)"></a> + +</nav> + +<!-- +<span class="eventbuttons"> +<a class="button icon button-balanced ion-gear-a"></a> +<a class="button button-balanced icon ion-gear-a"></a> + <a class="button icon button-balanced ion-gear-a"></a> +<a class="button button-balanced icon ion-gear-a"></a> +</span>--> + |