diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-08-11 15:47:11 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-08-11 15:47:11 -0400 |
| commit | a09333e8b97a5f5c71331ce18777889510aed302 (patch) | |
| tree | 9f6b69e4996088ee13004c3bee6ea9d5f57e89db /www/templates/montage.html | |
| parent | 68af457b04b26e26f0414b821dabe7359e18a0ad (diff) | |
API auth tied into ZM auth, enabled client to work in both auth and non-auth mode honoring ZM's auth system
Diffstat (limited to 'www/templates/montage.html')
| -rw-r--r-- | www/templates/montage.html | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html index 259f6587..df9ea17c 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -41,14 +41,22 @@ {{monitor.Monitor.Name}} </header> </span> <article class="main"> + <!-- back to ng-src. spinner was not updating when rand changes--> <!-- FIXME: Scale is 50% hardcoded --> - <img image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" + <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)" on-hold="onHold($index)" on-release="onRelease($index)" style="display:block;" image-spinner-loader="lines" + /> + + <div id="div-$index" ng-if="showSizeButtons" style= "position:absolute;top:0; left:0; width:100%; height:100%; background-color:red;z-index:100"> + HELLO + + </div> + </article> </span> </div> |