diff options
| -rw-r--r-- | www/js/EventCtrl.js | 7 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 3 | ||||
| -rw-r--r-- | www/templates/events.html | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 0e805876..63bd0f96 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -806,7 +806,8 @@ angular.module('zmApp.controllers') id: data.event.Frame[i].Id, frameid: data.event.Frame[i].FrameId, score: data.event.Frame[i].Score, - fname: padToN(data.event.Frame[i].FrameId, eventImageDigits) + "-capture.jpg" + fname: padToN(data.event.Frame[i].FrameId, eventImageDigits) + "-capture.jpg", + time:data.event.Frame[i].TimeStamp }); timestamp = data.event.Frame[i].TimeStamp; } @@ -1489,6 +1490,10 @@ angular.module('zmApp.controllers') $scope.prettifyTime = function (str) { return moment(str).format(ZMDataModel.getTimeFormat()); }; + + $scope.prettifyTimeSec = function (str) { + return moment(str).format(ZMDataModel.getTimeFormatSec()); + }; $scope.prettify = function (str) { diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index badc4983..29fcd66f 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -264,7 +264,7 @@ "kShowAlarmedEvents" :"Show alarmed events", "kShowAllEvents" :"Show all events", "kShowAllFrames" :"all", - "kShowTimeDiffFrames" :"different timestamps", + "kShowTimeDiffFrames" :"unique times", "kShowTip" :"show tip", "kShowing" :"Showing", "kShowingEvent" :"showing event", @@ -283,6 +283,7 @@ "kTapLiveMonitor" :"Live Monitor", "kTapMontage" :"Montage", "kThanksForUsing" :"Thanks for using", + "kTime" :"time", "kTimeline" :"Timeline", "kTimelineControlDisplay" :"tap:view event, double-tap:view frame graph", "kTimelineMessage" :"double-tap exits. touch/mouse-over and drag over items to see frames", diff --git a/www/templates/events.html b/www/templates/events.html index cf5a0a03..1eded906 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -149,7 +149,7 @@ <!--scroll <i class="icon ion-arrow-left-c"></i> <i class="icon ion-arrow-right-c"></i>--> - <button ng-click="toggleTypeOfAlarms()" class="button button-small button-assertive"> + <button ng-click="toggleTypeOfAlarms()" class="button button-small button-assertive button-outline"> {{'kType' | translate}}:{{typeOfFrames}} </button> </p> @@ -161,7 +161,7 @@ <figure class = "animated slideInLeft" style="display:inline-block"> <!--{{event.Event.baseURL}} p:{{event.Event.imageMode}}--> - <figcaption class="smallnote">{{ 'kFrame' | translate}} :{{alarm.frameid}} {{ 'kScore' | translate }} :{{alarm.score}}</figcaption> + <figcaption class="smallnote">{{ 'kFrame' | translate}}:{{alarm.frameid}},{{ 'kScore' | translate }}:{{alarm.score}}, {{'kTime'|translate}}: {{prettifyTimeSec(alarm.time)}}</figcaption> <img ng-if="event.Event.imageMode=='path'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)" /> <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)" /> |