diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-05 11:45:19 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-05 11:45:19 -0400 |
| commit | e337593cc65dac19eeb29fc99b7def02fdbc55ed (patch) | |
| tree | b0d1e5797e478063dfce50ccb81148406d5ccee1 /www/templates/events.html | |
| parent | 65869bd131cc2f05a09a0a0ca360f4c514828116 (diff) | |
#241 - lots of fixes, now switching between fid=XXX and path=YYYY mode depending on API version and other muti-server fixes
Former-commit-id: 57ace2fa05175a07a5565c24820f5f56c6cfd2e0
Diffstat (limited to 'www/templates/events.html')
| -rw-r--r-- | www/templates/events.html | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/www/templates/events.html b/www/templates/events.html index 13083ba0..fc003db3 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -1,4 +1,4 @@ -<div ng-controller="EventModalCtrl"> + <ion-view cache-view="false"> <ion-nav-title>{{scrollPosition();}}</ion-nav-title> <ion-nav-buttons side="left"> @@ -150,13 +150,15 @@ <p>scroll <i class="icon ion-arrow-left-c"></i> <i class="icon ion-arrow-right-c"></i></p> <ion-scroll direction="x" overflow-scroll="false"> - baseURL {{event.Event.baseURL}} + <span ng-repeat="alarm in alarm_images"> <figure style="display:inline-block"> - <figcaption><p>frame:{{alarm.id}} score:{{alarm.score}}</p></figcaption> - <img 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.id, event.Event.Id)"/> + <figcaption><p>frame:{{alarm.frameid}} score:{{alarm.score}}</p></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)"/> </figure> @@ -194,7 +196,11 @@ <!-- <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> --> - <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> + <img ng-if="event.Event.imageMode=='path'" imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> + + <img ng-if="event.Event.imageMode=='fid'" imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{slide.id}}" image-spinner-loader="lines" height="190px" ;/> + + <br/> @@ -339,4 +345,3 @@ </ion-view> -</div>
\ No newline at end of file |