Merge pull request #62 from digital-gnome/storageareas-robotsmerge
Storageareas robotsmerge
This commit is contained in:
commit
3b5e70c51a
|
@ -156,7 +156,7 @@ $statusData = array(
|
||||||
'permission' => 'Events',
|
'permission' => 'Events',
|
||||||
'table' => 'Frames',
|
'table' => 'Frames',
|
||||||
'limit' => 1,
|
'limit' => 1,
|
||||||
'selector' => array( array( 'table' => 'Events', 'join' => 'Events.Id = Frames.EventId', 'selector'=>"Events.Id' ), 'Frames.FrameId" ),
|
'selector' => array( array( 'table' => 'Events', 'join' => 'Events.Id = Frames.EventId', 'selector'=>'Events.Id' ), 'Frames.FrameId' ),
|
||||||
'elements' => array(
|
'elements' => array(
|
||||||
//'Id' => array( 'sql' => 'Frames.FrameId' ),
|
//'Id' => array( 'sql' => 'Frames.FrameId' ),
|
||||||
'FrameId' => true,
|
'FrameId' => true,
|
||||||
|
@ -312,7 +312,7 @@ switch( $_REQUEST['layout'] ) {
|
||||||
case 'xml NOT CURRENTLY SUPPORTED' :
|
case 'xml NOT CURRENTLY SUPPORTED' :
|
||||||
{
|
{
|
||||||
header("Content-type: application/xml" );
|
header("Content-type: application/xml" );
|
||||||
echo( '<?xml version="1.0' encoding='iso-8859-1"?>'.'\n' );
|
echo( '<?xml version="1.0" encoding="iso-8859-1"?>'.'\n' );
|
||||||
echo "<".strtolower($_REQUEST['entity']).">\n";
|
echo "<".strtolower($_REQUEST['entity']).">\n";
|
||||||
foreach ( $data as $key=>$value ) {
|
foreach ( $data as $key=>$value ) {
|
||||||
$key = strtolower( $key );
|
$key = strtolower( $key );
|
||||||
|
|
|
@ -45,8 +45,11 @@ $scales = array(
|
||||||
'12.5' => '1/8x',
|
'12.5' => '1/8x',
|
||||||
);
|
);
|
||||||
|
|
||||||
if (isset($_REQUEST['view']) && ($_REQUEST['view'] == 'montage'))
|
if (isset($_REQUEST['view']) && ($_REQUEST['view'] == 'montage')) {
|
||||||
unset($scales['auto']); //Remove auto if we aren't using event view
|
unset($scales['auto']); //Remove auto on montage, use everywhere else
|
||||||
|
} else {
|
||||||
|
unset($scales['']); //Remove fixed on everything but montage
|
||||||
|
}
|
||||||
|
|
||||||
$bandwidth_options = array(
|
$bandwidth_options = array(
|
||||||
'high' => translate('High'),
|
'high' => translate('High'),
|
||||||
|
|
|
@ -298,7 +298,7 @@ if ($reload == 'reload') ob_start();
|
||||||
echo ' ' . ZM_PATH_MAP .': '. getDiskPercent(ZM_PATH_MAP).'%';
|
echo ' ' . ZM_PATH_MAP .': '. getDiskPercent(ZM_PATH_MAP).'%';
|
||||||
?></li>
|
?></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div> <!-- End .footer/reload -->
|
<!-- End .footer/reload --></div>
|
||||||
<?php
|
<?php
|
||||||
if ($reload == 'reload') return( ob_get_clean() );
|
if ($reload == 'reload') return( ob_get_clean() );
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue