From 0adc14da4e945c465b4ee9caeb198f2a0a5479b6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 12 Jul 2017 11:17:07 -0400
Subject: [PATCH 1/2] fix links to Filter and Devices

---
 web/skins/classic/includes/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 415e5f40b..51771d133 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -211,10 +211,10 @@ function getNavBarHTML() {
 			<li><?php if ( logToDatabase() > Logger::NOLOG ) { ?> <?php echo makePopupLink( '?view=log', 'zmLog', 'log', '<span class="'.logState().'">'.translate('Log').'</span>' ) ?><?php } ?></li>
 <?php } ?>
 <?php if ( ZM_OPT_X10 && canView( 'Devices' ) ) { ?>
-			<li><a href="/?view=devices">Devices</a></li>
+			<li><a href="?view=devices">Devices</a></li>
 <?php } ?>
 			<li><?php echo makePopupLink( '?view=groups', 'zmGroups', 'groups', sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ).($group?' ('.$group['Name'].')':''), canView( 'Groups' ) ); ?></li>
-			<li><a href="/?view=filter">Filters</a></li>
+			<li><a href="?view=filter">Filters</a></li>
 
 <?php 
   $cycleGroup = isset($_COOKIE['zmGroup'])?$_COOKIE['zmGroup']:0;

From 22e957ba4666cfef8f8f2b98442c0ebdaa1c661b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 12 Jul 2017 12:49:01 -0400
Subject: [PATCH 2/2] clean up state a bit, use 1 less call to daemon check by
 using global . When selecting a layout, set img width to 100%

---
 web/skins/classic/includes/functions.php | 12 ++++++++++++
 web/skins/classic/views/console.php      | 10 ++--------
 web/skins/classic/views/filter.php       |  3 +--
 web/skins/classic/views/js/montage.js    |  2 +-
 web/skins/classic/views/state.php        |  3 ++-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 51771d133..7850394b2 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -285,4 +285,16 @@ function getNavBarHTML() {
 <?php
   return( ob_get_clean() );
 } // end function getNavBarHTML()
+function xhtmlFooter() {
+  global $skin;
+if ( canEdit('System') ) {
+  include("skins/$skin/views/state.php");
+?>
+<?php
+}
+?>
+</body></html>
+<?php
+} // end xhtmlFooter
+
 ?>
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 871f20830..3f39029ed 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -290,11 +290,5 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
         </tfoot>
       </table>
     </div>
-    </form>
-<?php
-if ( canEdit('System') ) {
-  include("skins/$skin/views/state.php");
-}
-?>
-</body>
-</html>
+  </form>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 90a6adf71..9aa23ad42 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -405,5 +405,4 @@ if ( canEdit( 'Events' ) ) {
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 16dc51a44..a2903c86a 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -130,7 +130,7 @@ function selectLayout( element ) {
         } else if ( streamImg.nodeName == 'APPLET' || streamImg.nodeName == 'OBJECT' ) {
           // APPLET's and OBJECTS need to be re-initialized
         }
-        streamImg.style.width = '';
+        streamImg.style.width = '100%';
       }
       var zonesSVG = $('zones'+monitor.id);
       if ( zonesSVG ) {
diff --git a/web/skins/classic/views/state.php b/web/skins/classic/views/state.php
index 2457e698c..a1de5b92d 100644
--- a/web/skins/classic/views/state.php
+++ b/web/skins/classic/views/state.php
@@ -40,7 +40,8 @@ if ( !canEdit( 'System' ) ) {
 	          <label for="runState" class="col-sm-3 control-label">Change State</label>
 	          <div class="col-sm-9">
               <select id="runState" name="runState" class="form-control">
-<?php if ( daemonCheck() ) { ?>
+<?php 
+      if ( $running ) { ?>
                 <option value="stop" selected="selected"><?php echo translate('Stop') ?></option>
                 <option value="restart"><?php echo translate('Restart') ?></option>
 <?php } else { ?>