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

followup changes based on comments in #833

This commit is contained in:
Andrew Bauer 2015-05-21 12:23:31 -05:00
parent 45b5fd3945
commit bf4038a724
7 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,8 +137,6 @@ function getControlCommands( $monitor )
function controlFocus( $monitor, $cmds ) function controlFocus( $monitor, $cmds )
{ {
global $SLANG;
ob_start(); ob_start();
?> ?>
<div class="arrowControl focusControls"> <div class="arrowControl focusControls">

2
web/skins/classic/includes/export_functions.php
View File

@ -103,8 +103,6 @@ html ul.tabs li.active, html ul.tabs li.active a:hover {
function exportEventDetail( $event, $exportFrames, $exportImages ) function exportEventDetail( $event, $exportFrames, $exportImages )
{ {
global $SLANG;
ob_start(); ob_start();
exportHeader( translate('Event')." ".$event['Id'] ); exportHeader( translate('Event')." ".$event['Id'] );

2
web/skins/classic/views/console.php
View File

@ -302,7 +302,7 @@ foreach( $displayMonitors as $monitor )
$scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE ); $scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
?> ?>
<td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td> <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
<td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.$SLANG['Fn'.$monitor['Function']].( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td> <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
<?php if ( $monitor['Type'] == "Local" ) { ?> <?php if ( $monitor['Type'] == "Local" ) { ?>
<td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td> <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td>
<?php } elseif ( $monitor['Type'] == "Remote" ) { ?> <?php } elseif ( $monitor['Type'] == "Remote" ) { ?>

2
web/skins/classic/views/function.php
View File

@ -46,7 +46,7 @@ xhtmlHeaders(__FILE__, translate('Function')." - ".validHtmlStr($monitor['Name']
foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction ) foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
{ {
?> ?>
<option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo $SLANG['Fn'.$optFunction] ?></option> <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo translate('Fn'.$optFunction) ?></option>
<?php <?php
} }
?> ?>

2
web/skins/classic/views/options.php
View File

@ -27,7 +27,7 @@ if ( !canView( 'System' ) )
$canEdit = canEdit( 'System' ); $canEdit = canEdit( 'System' );
$tabs = array(); $tabs = array();
$tabs['skins'] = translate('Display'); // change me to be supported by SLANG... $tabs['skins'] = translate('Display');
$tabs['system'] = translate('System'); $tabs['system'] = translate('System');
$tabs['config'] = translate('Config'); $tabs['config'] = translate('Config');
$tabs['paths'] = translate('Paths'); $tabs['paths'] = translate('Paths');

2
web/skins/classic/views/timeline.php
View File

@ -671,8 +671,6 @@ else
function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomClass=false ) function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomClass=false )
{ {
global $SLANG;
ob_start(); ob_start();
$labelCount = 0; $labelCount = 0;
$lastTick = 0; $lastTick = 0;

2
web/skins/mobile/includes/control_functions.php
View File

@ -135,8 +135,6 @@ function getControlCommands( $monitor )
function controlPresets( $monitor, $cmds ) function controlPresets( $monitor, $cmds )
{ {
global $SLANG;
define( "MAX_PRESETS", "10" ); define( "MAX_PRESETS", "10" );
$sql = "select * from ControlPresets where MonitorId = '".$monitor['Id']."'"; $sql = "select * from ControlPresets where MonitorId = '".$monitor['Id']."'";