diff --git a/web/zm_config.php.z b/web/zm_config.php.z index 7033544a8..071dfc3cd 100644 --- a/web/zm_config.php.z +++ b/web/zm_config.php.z @@ -151,7 +151,7 @@ $jws = array( 'device' => array( 'w'=>196, 'h'=>164 ), 'function' => array( 'w'=>248, 'h'=>92 ), 'events' => array( 'w'=>720, 'h'=>480 ), - 'event' => array( 'w'=>420, 'h'=>500 ), + 'event' => array( 'w'=>60, 'h'=>160 ), 'filter' => array( 'w'=>560, 'h'=>250 ), 'filtersave' => array( 'w'=>520, 'h'=>200 ), 'zones' => array( 'w'=>72, 'h'=>232 ), diff --git a/web/zm_html_view_events.php b/web/zm_html_view_events.php index f9387ec5c..fe37719f2 100644 --- a/web/zm_html_view_events.php +++ b/web/zm_html_view_events.php @@ -154,7 +154,7 @@ function newWindow(Url,Name,Width,Height) } function eventWindow(Url,Name) { - var Name = window.open(Url,Name,"resizable,scrollbars,width== $jws['event']['w'] ?>,height== $jws['event']['h'] ?>"); + var Name = window.open(Url,Name,"resizable,scrollbars,width== $monitor[Width]+$jws['event']['w'] ?>,height== $monitor[Height]+$jws['event']['h'] ?>"); } function filterWindow(Url,Name) { diff --git a/web/zm_html_view_watchevents.php b/web/zm_html_view_watchevents.php index b7b6cd48c..f7b728b03 100644 --- a/web/zm_html_view_watchevents.php +++ b/web/zm_html_view_watchevents.php @@ -39,16 +39,26 @@ header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1 header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); // HTTP/1.0 + + $result = mysql_query( "select * from Monitors where Id = '$mid'" ); + if ( !$result ) + die( mysql_error() ); + $monitor = mysql_fetch_assoc( $result ); + ?>
-