summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-07-03 08:32:13 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-07-03 08:32:13 -0400
commit5d11ab12195dcc70192e706fbbfd106cd7d7f24d (patch)
tree0cdee3b274b030260c3a9be98d4d219c28603a32 /www/templates
parent15f501727a91bc4fdf2c155d572cf00c11436eef (diff)
fixed a nasty scaling bug -- size was getting corrupted because I was adding strings
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/montage.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html
index e1403aa7..213eeda6 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -17,7 +17,7 @@
<div class=" range range-positive">
<i class="icon ion-arrow-shrink"></i>
- <input type="range" ng-model="slider.monsize" min="1" max="6" ng-change="sliderChanged()">
+ <input type="range" ng-model="slider.monsize" min="1" max="6" ng-change="sliderChanged(slider.monsize)">
<i class="icon ion-arrow-expand"></i>
</div>
@@ -32,7 +32,7 @@
</span>
<article class="main">
<!-- FIXME: Scale is 50% hardcoded -->
- <img ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" width="{{((devWidth-30)/(7-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)" on-hold="onHold($index)" on-release="onRelease($index)" />
+ <img ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" 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)" />
</article>