followup changes based on comments in #833
This commit is contained in:
parent
45b5fd3945
commit
bf4038a724
|
@ -137,8 +137,6 @@ function getControlCommands( $monitor )
|
|||
|
||||
function controlFocus( $monitor, $cmds )
|
||||
{
|
||||
global $SLANG;
|
||||
|
||||
ob_start();
|
||||
?>
|
||||
<div class="arrowControl focusControls">
|
||||
|
|
|
@ -103,8 +103,6 @@ html ul.tabs li.active, html ul.tabs li.active a:hover {
|
|||
|
||||
function exportEventDetail( $event, $exportFrames, $exportImages )
|
||||
{
|
||||
global $SLANG;
|
||||
|
||||
ob_start();
|
||||
exportHeader( translate('Event')." ".$event['Id'] );
|
||||
|
||||
|
|
|
@ -302,7 +302,7 @@ foreach( $displayMonitors as $monitor )
|
|||
$scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
|
||||
?>
|
||||
<td class="colName"><?php echo makePopupLink( '?view=watch&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&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&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" ) { ?>
|
||||
<td class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td>
|
||||
<?php } elseif ( $monitor['Type'] == "Remote" ) { ?>
|
||||
|
|
|
@ -46,7 +46,7 @@ xhtmlHeaders(__FILE__, translate('Function')." - ".validHtmlStr($monitor['Name']
|
|||
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
|
||||
}
|
||||
?>
|
||||
|
|
|
@ -27,7 +27,7 @@ if ( !canView( 'System' ) )
|
|||
$canEdit = canEdit( 'System' );
|
||||
|
||||
$tabs = array();
|
||||
$tabs['skins'] = translate('Display'); // change me to be supported by SLANG...
|
||||
$tabs['skins'] = translate('Display');
|
||||
$tabs['system'] = translate('System');
|
||||
$tabs['config'] = translate('Config');
|
||||
$tabs['paths'] = translate('Paths');
|
||||
|
|
|
@ -671,8 +671,6 @@ else
|
|||
|
||||
function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomClass=false )
|
||||
{
|
||||
global $SLANG;
|
||||
|
||||
ob_start();
|
||||
$labelCount = 0;
|
||||
$lastTick = 0;
|
||||
|
|
|
@ -135,8 +135,6 @@ function getControlCommands( $monitor )
|
|||
|
||||
function controlPresets( $monitor, $cmds )
|
||||
{
|
||||
global $SLANG;
|
||||
|
||||
define( "MAX_PRESETS", "10" );
|
||||
|
||||
$sql = "select * from ControlPresets where MonitorId = '".$monitor['Id']."'";
|
||||
|
|
Loading…
Reference in New Issue