diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-11 12:04:50 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-11 12:04:50 -0400 |
| commit | e4a4af16734a7b63bf23b27ce0c6041276e6ecc3 (patch) | |
| tree | 11ba20b611300a87656041e6b201053c1c92768f /www/templates/montage.html | |
| parent | d7c5302f66c905177cf8314ffca121a0593328cd (diff) | |
#606 more cleanups
Diffstat (limited to 'www/templates/montage.html')
| -rw-r--r-- | www/templates/montage.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html index 1a0b56df..2434ae5a 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -101,23 +101,22 @@ <figure class="{{dragBorder}}" ng-show="monitor.Monitor.listDisplay!='noshow'"> <!--<div ng-if="!isModalActive" >--> <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">--> - <div ng-if="$root.authSession!='undefined' && !isBackground() "> + <div ng-if="$root.authSession!='undefined' && $root.authSession!=''"> <div ng-if = "!minimal" > - <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{constructStream(monitor)}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}" /> </div> <div ng-if = "minimal"> - <img id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/zms?mode={{getMode()}}&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{randToAvoidCacheMem}}{{appendConnKey(monitor.Monitor.connKey)}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}" /> + <img id="img-{{$index}}" image-spinner-src="{{constructStream(monitor)}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}" /> </div> </div> <figcaption id="slowpulse" ng-class="monitor.Monitor.isAlarmed==true?'alarmed-figcaption animated infinite flash':'normal-figcaption'" > - + {{monitor.Monitor.connKey}} <span ng-if="monitor.Monitor.isStamp && isDragabillyOn"><i class="animated infinite flash ion-pin"></i> </span><i class="ion-ios-videocam"></i> {{monitor.Monitor.Name}} <i ng-if="$root.runMode!='lowbw'" style="{{monitor.Monitor.alarmState}}" class="ion-record"></i> |