ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PTZ control restructuring. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2554 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2008-07-16 13:16:19 +00:00
parent 336ce62c15
commit fad6b0ec11
2 changed files with 4 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
web/skins/classic/views/control.php
View File

@ -50,8 +50,6 @@ require_once( ZM_SKIN_PATH.'/includes/control_functions.php' );
$sql = "select C.*,M.* from Monitors as M inner join Controls as C on (M.ControlId = C.Id ) where M.Id = '".$mid."'"; $sql = "select C.*,M.* from Monitors as M inner join Controls as C on (M.ControlId = C.Id ) where M.Id = '".$mid."'";
$monitor = dbFetchOne( $sql ); $monitor = dbFetchOne( $sql );
$cmds = getControlCommands( $monitor );
$focusWindow = true; $focusWindow = true;
xhtmlHeaders(__FILE__, $SLANG['Control'] ); xhtmlHeaders(__FILE__, $SLANG['Control'] );
@ -71,36 +69,8 @@ xhtmlHeaders(__FILE__, $SLANG['Control'] );
</div> </div>
</div> </div>
<div id="content"> <div id="content">
<div id="ptzControls"> <div id="ptzControls" class="ptzControls">
<div id="controlsPanel"> <?= ptzControls( $monitor ) ?>
<?php
if ( $monitor['CanFocus'] )
echo controlFocus( $monitor );
if ( $monitor['CanZoom'] )
echo controlZoom( $monitor );
if ( $monitor['CanMove'] || ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] ) )
{
?>
<div id="pantiltPanel">
<?php
if ( $monitor['CanMove'] )
echo controlPanTilt( $monitor );
if ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] )
echo controlPower( $monitor );
?>
</div>
<?php
}
if ( $monitor['CanIris'] )
echo controlIris( $monitor );
if ( $monitor['CanWhite'] )
echo controlWhite( $monitor );
?>
</div>
<?php
if ( $monitor['HasPresets'] )
echo controlPresets( $monitor );
?>
</div> </div>
</div> </div>
</div> </div>

33
web/skins/classic/views/watch.php
View File

@ -149,38 +149,9 @@ if ( canEdit( 'Monitors' ) )
if ( $showControls ) if ( $showControls )
{ {
require_once( ZM_SKIN_PATH.'/includes/control_functions.php' ); require_once( ZM_SKIN_PATH.'/includes/control_functions.php' );
$cmds = getControlCommands( $monitor );
?>
<div id="ptzControls"<?= $_REQUEST['control']?'':' class="hidden"' ?>>
<div id="controlsPanel">
<?php
if ( $monitor['CanFocus'] )
echo controlFocus( $monitor );
if ( $monitor['CanZoom'] )
echo controlZoom( $monitor );
if ( $monitor['CanMove'] || ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] ) )
{
?>
<div id="pantiltPanel">
<?php
if ( $monitor['CanMove'] )
echo controlPanTilt( $monitor );
if ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] )
echo controlPower( $monitor );
?>
</div>
<?php
}
if ( $monitor['CanIris'] )
echo controlIris( $monitor );
if ( $monitor['CanWhite'] )
echo controlWhite( $monitor );
?>
</div>
<?php
if ( $monitor['HasPresets'] )
echo controlPresets( $monitor );
?> ?>
<div id="ptzControls" class="ptzControls<?= $_REQUEST['control']?'':' hidden' ?>">
<?= ptzControls( $monitor ) ?>
</div> </div>
<?php <?php
} }