diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/monitors-modal.html | 16 | ||||
| -rw-r--r-- | www/templates/montage-history.html | 5 | ||||
| -rw-r--r-- | www/templates/montage.html | 14 |
3 files changed, 16 insertions, 19 deletions
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index e2ee7bdb..ff0a11c3 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -9,7 +9,7 @@ <!-- --> <div id="monitorimage" style="height: 100vh;" class="main"> - <div ng-if="$root.authSession!='undefined'"> + <div ng-if="!animationInProgress"> <!--<span style="color:white">{{currentStreamMode}}</span>--> @@ -22,11 +22,11 @@ <div ng-if="animationInProgress"> <img style="width:100vw; height:100vh" ng-src="img/noimage.png" class="object-fit_contain" /> </div> - </div> - <div ng-if="$root.authSession=='undefined'"> + + <img id="singlemonitor" ng-src="img/noimage.png" style="width:100vw; height:100vh; display:block;" class="object-fit_contain" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" /> - </div> + </div> </ion-scroll> @@ -39,7 +39,7 @@ <!-- android needs this 100vh - otherwise max- does not work --> <!-- --> <div id="monitorimage" style="height: 100vh;" class="main"> - <div ng-if="$root.authSession!='undefined'"> + <div ng-if="!animationInProgress && !isBackground() && connKey"> <!--<span style="color:white">{{currentStreamMode}}</span>--> @@ -51,11 +51,11 @@ <div ng-if="animationInProgress || isBackground()"> <img style="width:100vw; height:100vh" ng-src="img/noimage.png" class="object-fit_contain" /> </div> - </div> - <div ng-if="$root.authSession=='undefined'"> + + <img id="singlemonitor" ng-src="img/noimage.png" style="width:100vw; height:100vh; display:block;" class="object-fit_contain" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" /> - </div> + </div> </ion-scroll> diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index f872718b..82fb70f3 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -140,10 +140,7 @@ </div> </div> - <!-- valid auth session &!background --> - <!--<div ng-if="!$root.authSession=='undefined' || isBackground()"> - <img image-spinner-src="img/noimage.png" /> - </div>--> + </span> </div> <ion-item ng-show="!MontageMonitors.length"> {{'kNoMonitors' | translate }} </ion-item> diff --git a/www/templates/montage.html b/www/templates/montage.html index f505c135..34dce100 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -123,8 +123,7 @@ <div class="row row-no-padding"> <div ng-class="monitor.Monitor.showSidebar?'col col-70 col-no-padding':'col col-no-padding'"> <figure role="group" class="{{dragBorder}}" ng-show="monitor.Monitor.listDisplay!='noshow'"> - <!--<div ng-if="!isModalActive" >--> - <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">--> + <div class="montage-image"> <div ng-if="LoginData.enableMontageOverlays" class="montage-buttons"> @@ -174,10 +173,7 @@ </div> <div ng-if="monitor.Monitor.showSidebar" class="montage-sidebar "> - <div class="row row-no-padding"> - <i class="ion-social-buffer"></i> {{'kMontageEventStorage' | translate }}: - {{formatBytes(monitor.Monitor.TotalEventDiskSpace,1)}} - </div> + <div ng-if="!monitor.Monitor.lastEvent"> <div class="row row-no-padding"> <div class="col col-no-padding"> @@ -197,10 +193,14 @@ {{humanizeTime(monitor.Monitor.lastEvent.events[0].Event.StartTime)}}<br /> </div> <div class="row row-no-padding"> - <i class="ion-clipboard"></i> {{monitor.Monitor.lastEvent.events[0].Event.Notes}}<br /> + <i class="ion-clipboard"></i> <span ng-class="{'object-notes': monitor.Monitor.lastEvent.object}">{{monitor.Monitor.lastEvent.events[0].Event.Notes}}</span><br /> </div> </div> + <div class="row row-no-padding"> + <i class="ion-social-buffer"></i> {{'kMontageEventStorage' | translate }}: + {{formatBytes(monitor.Monitor.TotalEventDiskSpace,1)}} + </div> </div> |