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/timeline-modal.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/timeline-modal.html')
| -rw-r--r-- | www/templates/timeline-modal.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/www/templates/timeline-modal.html b/www/templates/timeline-modal.html index 3df31ec0..1584b961 100644 --- a/www/templates/timeline-modal.html +++ b/www/templates/timeline-modal.html @@ -35,7 +35,10 @@ <figure style="display:inline-block"> <figcaption><small>f:{{alarm.fid}} scr:{{alarm.score}} @ {{alarm.time}}</small></figcaption> - <img image-spinner-src="{{playbackURL}}/index.php?view=image&path={{alarm.relativePath}}{{alarm.fname}}&height=380" style="width: auto; height: auto;max-width: 100%;max-height: 170px;" on-tap="showImage(playbackURL,alarm.relativePath,alarm.fname, alarm.fid)"/> + <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> |