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

spacing

This commit is contained in:
Isaac Connor 2018-07-09 12:33:21 -04:00
parent afa31842b5
commit ba8dc2059d
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/skins/classic/views/cycle.php
View File

@ -44,12 +44,12 @@ foreach( $displayMonitors as &$row ) {
if ( isset($_REQUEST['mid']) && $row['Id'] == $_REQUEST['mid'] ) if ( isset($_REQUEST['mid']) && $row['Id'] == $_REQUEST['mid'] )
$monIdx = count($monitors); $monIdx = count($monitors);
$row['ScaledWidth'] = reScale( $row['Width'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); $row['ScaledWidth'] = reScale($row['Width'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
$row['ScaledHeight'] = reScale( $row['Height'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); $row['ScaledHeight'] = reScale($row['Height'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
$row['PopupScale'] = reScale( SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); $row['PopupScale'] = reScale(SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
$row['connKey'] = generateConnKey(); $row['connKey'] = generateConnKey();
$monitors[] = new Monitor( $row ); $monitors[] = new Monitor($row);
} # end foreach Monitor } # end foreach Monitor
if ( $monitors ) { if ( $monitors ) {
@ -63,14 +63,14 @@ if ( $monitors ) {
} }
noCacheHeaders(); noCacheHeaders();
xhtmlHeaders(__FILE__, translate('CycleWatch') ); xhtmlHeaders(__FILE__, translate('CycleWatch'));
?> ?>
<body> <body>
<div id="page"> <div id="page">
<?php echo $navbar = getNavBarHTML(); ?> <?php echo $navbar = getNavBarHTML(); ?>
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<?php if ( $mode == "stream" ) { ?> <?php if ( $mode == 'stream' ) { ?>
<a href="?view=<?php echo $view ?>&amp;mode=still&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stills') ?></a> <a href="?view=<?php echo $view ?>&amp;mode=still&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stills') ?></a>
<?php } else { ?> <?php } else { ?>
<a href="?view=<?php echo $view ?>&amp;mode=stream&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stream') ?></a> <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stream') ?></a>
@ -84,7 +84,7 @@ xhtmlHeaders(__FILE__, translate('CycleWatch') );
<div id="imageFeed"> <div id="imageFeed">
<?php <?php
if ( $monitor ) { if ( $monitor ) {
echo getStreamHTML( $monitor, array( 'scale'=>$scale, 'mode'=>$mode ) ); echo getStreamHTML($monitor, array('scale'=>$scale, 'mode'=>$mode));
} else { } else {
echo "There are no monitors to view."; echo "There are no monitors to view.";
} }

6
web/skins/classic/views/js/cycle.js
View File

@ -1,9 +1,9 @@
function nextCycleView() { function nextCycleView() {
window.location.replace( '?view=cycle&mid='+nextMid+'&mode='+mode, cycleRefreshTimeout ); window.location.replace('?view=cycle&mid='+nextMid+'&mode='+mode, cycleRefreshTimeout);
} }
function initCycle() { function initCycle() {
nextCycleView.periodical( cycleRefreshTimeout ); nextCycleView.periodical(cycleRefreshTimeout);
} }
window.addEvent( 'domready', initCycle ); window.addEvent('domready', initCycle);

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

@ -37,7 +37,6 @@ if ( ! visibleMonitor($mid) ) {
return; return;
} }
$monitor = new Monitor($mid); $monitor = new Monitor($mid);
#Whether to show the controls button #Whether to show the controls button
@ -68,7 +67,7 @@ xhtmlHeaders( __FILE__, $monitor->Name().' - '.translate('Feed') );
<div id="monitorName"><?php echo $monitor->Name() ?></div> <div id="monitorName"><?php echo $monitor->Name() ?></div>
<div id="menuControls"> <div id="menuControls">
<?php <?php
if ( canView( 'Control' ) && $monitor->Type() == 'Local' ) { if ( canView('Control') && $monitor->Type() == 'Local' ) {
?> ?>
<div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor->Id(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div> <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor->Id(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div>
<?php <?php