From 5f3e7134fb308095dec7175f1eb4a89374af0b4c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 4 Apr 2016 13:22:26 -0400 Subject: [PATCH] split power out of the Panel box so that I can style it better --- web/skins/classic/includes/control_functions.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php index c22c39da6..cc99cacbc 100644 --- a/web/skins/classic/includes/control_functions.php +++ b/web/skins/classic/includes/control_functions.php @@ -367,24 +367,22 @@ function ptzControls( $monitor ) echo controlIris( $monitor, $cmds ); if ( $monitor->CanWhite() ) echo controlWhite( $monitor, $cmds ); - if ( $monitor->CanMove() || ( $monitor->CanWake() || $monitor->CanSleep() || $monitor->CanReset() ) ) - { + if ( $monitor->CanMove() ) { ?>
CanMove() ) echo controlPanTilt( $monitor, $cmds ); - if ( $monitor->CanWake() || $monitor->CanSleep() || $monitor->CanReset() ) - echo controlPower( $monitor, $cmds ); ?>
CanWake() || $monitor->CanSleep() || $monitor->CanReset() ) + echo controlPower( $monitor, $cmds ); + if ( $monitor->HasPresets() ) + echo controlPresets( $monitor, $cmds ); ?> HasPresets() ) - echo controlPresets( $monitor, $cmds ); return( ob_get_clean() ); } ?>