diff options
| -rw-r--r-- | www/js/EventCtrl.js | 5 | ||||
| -rw-r--r-- | www/templates/events.html | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 666f7c7f..b291516c 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -3183,7 +3183,7 @@ angular.module('zmApp.controllers') return stream; - } + }; $scope.constructAlarmFrame = function(event, alarm, motion) { var stream = ""; @@ -3195,8 +3195,7 @@ angular.module('zmApp.controllers') } else if (event.Event.imageMode=='path') { - st - ream = event.Event.baseURL+ + stream = event.Event.baseURL+ "/index.php?view=image&path=" +event.Event.relativePath + motion? alarm.aname:alarm.fname + "&height=380"; diff --git a/www/templates/events.html b/www/templates/events.html index c9ec2815..eb34deed 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -8,7 +8,7 @@ ng-click="handleAlarms();" ng-if="$root.isAlarm"></button> </ion-nav-buttons> <ion-nav-buttons side="right"> - <a style="" class="button button-icon icon ion-android-more-vertical" ng-click="popover.show($event)" ;> </a> + <a class="button button-icon icon ion-android-more-vertical" ng-click="popover.show($event)" ;> </a> <a class="button button-icon icon ion-search" ng-href="" ng-click="searchClicked();"> </a> </ion-nav-buttons> <div ng-if="showSearch"> |