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

Merge branch 'always_show_ptz' into storageareas

This commit is contained in:
Isaac Connor 2016-04-04 16:45:54 -04:00
parent 868e5a51fa 5f3e7134fb
commit 564f189416
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/skins/classic/css/classic/control.css
View File

@ -1,12 +1,11 @@
.ptzControls { .ptzControls {
vertical-align: top; vertical-align: top;
margin: 10px auto 0; margin: 10px auto 0;
width: 300px; width: 500px;
} }
.ptzControls input.ptzTextBtn { .ptzControls input.ptzTextBtn {
margin-top: 2px; margin-top: 2px;
width: 40px;
} }
.ptzControls .controlsPanel { .ptzControls .controlsPanel {
@ -72,6 +71,8 @@
.ptzControls .controlsPanel .pantiltPanel { .ptzControls .controlsPanel .pantiltPanel {
margin: 0 auto; margin: 0 auto;
height: 180px; height: 180px;
float: left;
width: 100px;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .pantiltButtons { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .pantiltButtons {
@ -126,12 +127,12 @@
background: url("../../graphics/arrow-dr.gif") no-repeat 0 0; background: url("../../graphics/arrow-dr.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .powerControls { .ptzControls .controlsPanel .powerControls {
margin: 0 auto; margin: 5px auto;
} }
.ptzControls .presetControls { .ptzControls .presetControls {
margin: 0 auto; margin: 5px auto;
} }
.ptzControls .presetControls input { .ptzControls .presetControls input {

15
web/skins/classic/css/dark/control.css
View File

@ -1,12 +1,11 @@
.ptzControls { .ptzControls {
vertical-align: top; vertical-align: top;
margin: 10px auto 0; margin: 10px auto 0;
width: 300px; width: 500px;
} }
.ptzControls input.ptzTextBtn { .ptzControls input.ptzTextBtn {
margin-top: 2px; margin-top: 2px;
width: 40px;
} }
.ptzControls .controlsPanel { .ptzControls .controlsPanel {
@ -72,6 +71,8 @@
.ptzControls .controlsPanel .pantiltPanel { .ptzControls .controlsPanel .pantiltPanel {
margin: 0 auto; margin: 0 auto;
height: 180px; height: 180px;
float: left;
width: 100px;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .pantiltButtons { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .pantiltButtons {
@ -79,8 +80,8 @@
border: 1px solid #006699; border: 1px solid #006699;
text-align: center; text-align: center;
padding: 1px; padding: 1px;
width: 96px; width: 100px;
height: 96px; height: 100px;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .arrowBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .arrowBtn {
@ -126,12 +127,12 @@
background: url("../../graphics/arrow-dr.gif") no-repeat 0 0; background: url("../../graphics/arrow-dr.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .powerControls { .ptzControls .controlsPanel .powerControls {
margin: 0 auto; margin: 5px auto;
} }
.ptzControls .presetControls { .ptzControls .presetControls {
margin: 0 auto; margin: 5px auto;
} }
.ptzControls .presetControls input { .ptzControls .presetControls input {

15
web/skins/classic/css/flat/control.css
View File

@ -1,12 +1,11 @@
.ptzControls { .ptzControls {
vertical-align: top; vertical-align: top;
margin: 10px auto 0; margin: 10px auto 0;
width: 300px; width: 500px;
} }
.ptzControls input.ptzTextBtn { .ptzControls input.ptzTextBtn {
margin-top: 2px; margin-top: 2px;
width: 40px;
} }
.ptzControls .controlsPanel { .ptzControls .controlsPanel {
@ -72,6 +71,8 @@
.ptzControls .controlsPanel .pantiltPanel { .ptzControls .controlsPanel .pantiltPanel {
margin: 0 auto; margin: 0 auto;
height: 180px; height: 180px;
float: left;
width: 100px;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .pantiltButtons { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .pantiltButtons {
@ -79,8 +80,8 @@
border: 1px solid #006699; border: 1px solid #006699;
text-align: center; text-align: center;
padding: 1px; padding: 1px;
width: 96px; width: 100px;
height: 96px; height: 100px;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .arrowBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .arrowBtn {
@ -126,12 +127,12 @@
background: url("../../graphics/arrow-dr.gif") no-repeat 0 0; background: url("../../graphics/arrow-dr.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .powerControls { .ptzControls .controlsPanel .powerControls {
margin: 0 auto; margin: 5px auto;
} }
.ptzControls .presetControls { .ptzControls .presetControls {
margin: 0 auto; margin: 5px auto;
} }
.ptzControls .presetControls input { .ptzControls .presetControls input {

12
web/skins/classic/includes/control_functions.php
View File

@ -367,24 +367,22 @@ function ptzControls( $monitor )
echo controlIris( $monitor, $cmds ); echo controlIris( $monitor, $cmds );
if ( $monitor->CanWhite() ) if ( $monitor->CanWhite() )
echo controlWhite( $monitor, $cmds ); echo controlWhite( $monitor, $cmds );
if ( $monitor->CanMove() || ( $monitor->CanWake() || $monitor->CanSleep() || $monitor->CanReset() ) ) if ( $monitor->CanMove() ) {
{
?> ?>
<div class="pantiltPanel"> <div class="pantiltPanel">
<?php <?php
if ( $monitor->CanMove() )
echo controlPanTilt( $monitor, $cmds ); echo controlPanTilt( $monitor, $cmds );
if ( $monitor->CanWake() || $monitor->CanSleep() || $monitor->CanReset() )
echo controlPower( $monitor, $cmds );
?> ?>
</div> </div>
<?php <?php
} }
if ( $monitor->CanWake() || $monitor->CanSleep() || $monitor->CanReset() )
echo controlPower( $monitor, $cmds );
if ( $monitor->HasPresets() )
echo controlPresets( $monitor, $cmds );
?> ?>
</div> </div>
<?php <?php
if ( $monitor->HasPresets() )
echo controlPresets( $monitor, $cmds );
return( ob_get_clean() ); return( ob_get_clean() );
} }
?> ?>