diff --git a/web/ajax/status.php b/web/ajax/status.php index 51e980dce..299c9e8a3 100644 --- a/web/ajax/status.php +++ b/web/ajax/status.php @@ -156,7 +156,7 @@ $statusData = array( 'permission' => 'Events', 'table' => 'Frames', '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( //'Id' => array( 'sql' => 'Frames.FrameId' ), 'FrameId' => true, @@ -312,7 +312,7 @@ switch( $_REQUEST['layout'] ) { case 'xml NOT CURRENTLY SUPPORTED' : { header("Content-type: application/xml" ); - echo( ''.'\n' ); + echo( ''.'\n' ); echo "<".strtolower($_REQUEST['entity']).">\n"; foreach ( $data as $key=>$value ) { $key = strtolower( $key ); diff --git a/web/skins/classic/includes/config.php b/web/skins/classic/includes/config.php index b5829426d..2eded5690 100644 --- a/web/skins/classic/includes/config.php +++ b/web/skins/classic/includes/config.php @@ -45,8 +45,11 @@ $scales = array( '12.5' => '1/8x', ); -if (isset($_REQUEST['view']) && ($_REQUEST['view'] == 'montage')) - unset($scales['auto']); //Remove auto if we aren't using event view +if (isset($_REQUEST['view']) && ($_REQUEST['view'] == 'montage')) { + unset($scales['auto']); //Remove auto on montage, use everywhere else +} else { + unset($scales['']); //Remove fixed on everything but montage +} $bandwidth_options = array( 'high' => translate('High'), diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 0bf3dd162..e73336c09 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -298,7 +298,7 @@ if ($reload == 'reload') ob_start(); echo ' ' . ZM_PATH_MAP .': '. getDiskPercent(ZM_PATH_MAP).'%'; ?> - +