diff --git a/web/includes/functions.php b/web/includes/functions.php index d6aa7492c..b10e74eac 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -487,6 +487,16 @@ function makePopupButton($url, $winName, $winSize, $buttonValue, $condition=1, $ return $string; } +function makeButton($url, $buttonValue, $condition=1, $options='') { + $string = ''.PHP_EOL; + return $string; +} + function htmlSelect($name, $contents, $values, $behaviours=false) { $behaviourText = ''; if ( !empty($behaviours) ) { diff --git a/web/skins/classic/views/js/zones.js b/web/skins/classic/views/js/zones.js index 634db6843..45f0ee9da 100644 --- a/web/skins/classic/views/js/zones.js +++ b/web/skins/classic/views/js/zones.js @@ -9,6 +9,12 @@ function streamCmdQuit( ) { } } +// Manage the Add New Zone button +function AddNewZone(el) { + url = el.getAttribute('data-url'); + window.location.assign(url); +} + var monitors = new Array(); function initPage() { diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php index b4df1fce1..daa304657 100644 --- a/web/skins/classic/views/zone.php +++ b/web/skins/classic/views/zone.php @@ -118,6 +118,7 @@ $StreamHTML = getStreamHTML($monitor, array('mode'=>'single')); xhtmlHeaders(__FILE__, translate('Zone')); ?> +
Name().' - '.translate('Zone').' '.$newZone['Name'] ?>

diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php index 7edcd0e7d..568293b7e 100644 --- a/web/skins/classic/views/zones.php +++ b/web/skins/classic/views/zones.php @@ -101,7 +101,7 @@ xhtmlHeaders(__FILE__, translate('Zones')); foreach( $zones as $zone ) { ?> - ViewWidth(), $monitor->ViewHeight()), validHtmlStr($zone['Name']), true, 'data-on-click-true="streamCmdQuit"'); ?> + / ViewWidth()*$monitor->ViewHeight()) ) ?> disabled="disabled"/> @@ -111,10 +111,10 @@ xhtmlHeaders(__FILE__, translate('Zones')); ?> -
- ViewWidth(), $monitor->ViewHeight()), translate('AddNewZone'), canEdit('Monitors')); ?> - -
+
+ + +