From db41693fd6d46b13eefcca00c6df0b2bcfc2f01a Mon Sep 17 00:00:00 2001 From: Scott Robinson Date: Sun, 22 Dec 2013 20:53:09 +0000 Subject: [PATCH 1/3] Update montage.js save montage scale % as cookie --- web/skins/classic/views/js/montage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js index cc49d5776..b8ea83aa6 100644 --- a/web/skins/classic/views/js/montage.js +++ b/web/skins/classic/views/js/montage.js @@ -134,6 +134,7 @@ function changeScale() streamImg.style.width = newWidth + "px"; streamImg.style.height = newHeight + "px"; } + Cookie.write( 'zmMontageScale', scale, { duration: 10*365 } ); } var monitors = new Array(); From 375d67cdf2137c89f9f82e64fa6831aa12831f9a Mon Sep 17 00:00:00 2001 From: Scott Robinson Date: Sun, 22 Dec 2013 20:56:18 +0000 Subject: [PATCH 2/3] Update montage.php Make use of new zmMontageScale cookie --- web/skins/classic/views/montage.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php index 6a93ee727..2362a7fad 100644 --- a/web/skins/classic/views/montage.php +++ b/web/skins/classic/views/montage.php @@ -44,8 +44,11 @@ foreach( dbFetchAll( $sql ) as $row ) { continue; } + if ( isset( $_REQUEST['scale'] ) ) $scale = validInt($_REQUEST['scale']); + else if ( isset( $_COOKIE['zmMontageScale'] ) ) + $scale = $_COOKIE['zmMontageScale']; else $scale = reScale( SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); From f2d9deaed6babaa125398ba475635a7196badeca Mon Sep 17 00:00:00 2001 From: Scott Robinson Date: Tue, 24 Dec 2013 11:07:27 +0000 Subject: [PATCH 3/3] Update test.monitor.sql testing travis build --- db/test.monitor.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/test.monitor.sql b/db/test.monitor.sql index 084a6ebcb..030577f33 100644 --- a/db/test.monitor.sql +++ b/db/test.monitor.sql @@ -1 +1,2 @@ -INSERT INTO Monitors (Name, Type, Function, Enabled, Format, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation, Deinterlacing, Brightness, Contrast, Hue, Colour, RefBlendPerc) VALUES ('travis_test','Remote','Modect',1,255,'http','simple','50.79.143.149','21146','/mjpg/video.mjpg',1280,800,3,0,'0',0,-1,-1,-1,-1,12); +INSERT INTO Monitors (Name, Type, Function, Enabled, Format, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation, Deinterlacing, Brightness, Contrast, Hue, Colour, RefBlendPerc) VALUES ('travis_test1','Remote','Modect',1,255,'http','simple','50.79.143.149','21146','/mjpg/video.mjpg',1280,800,3,0,'0',0,-1,-1,-1,-1,12); +INSERT INTO Monitors (Name, Type, Function, Enabled, Format, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation, Deinterlacing, Brightness, Contrast, Hue, Colour, RefBlendPerc) VALUES ('travis_test2','Remote','Modect',1,255,'http','simple','50.79.143.149','21146','/mjpg/video.mjpg',1280,800,3,0,'0',0,-1,-1,-1,-1,12);