From 49f46ac9276395b9a7070a2339228b46363dd094 Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kjohnson@gnulnx.net>
Date: Tue, 15 Mar 2016 13:43:49 -0400
Subject: [PATCH] Move the header into its own file, and include it in options
 view.

---
 web/skins/classic/views/console.php | 49 +----------------------------
 web/skins/classic/views/header.php  | 46 +++++++++++++++++++++++++++
 web/skins/classic/views/options.php |  6 ++--
 3 files changed, 50 insertions(+), 51 deletions(-)
 create mode 100644 web/skins/classic/views/header.php

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index ccb7fff5e..abff983a6 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -189,54 +189,7 @@ xhtmlHeaders( __FILE__, translate('Console') );
     <input type="hidden" name="view" value="<?php echo $view ?>"/>
     <input type="hidden" name="action" value=""/>
 
-
-<div class="navbar navbar-default">
-	<div class="container">
-		<div class="navbar-header">
-			<a class="navbar-brand" href="http://www.zoneminder.com" target="ZoneMinder">ZoneMinder</a>
-		</div>
-
-		<ul class="nav navbar-nav">
-<?php if ( canView( 'System' ) ) { ?>
-			<li><?php echo makePopupLink( '?view=options', 'zmOptions', 'options', translate('Options') ) ?></li>
-			<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>
-<?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><?php echo makePopupLink( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?></li>
-
-<?php if ( canView( 'Stream' ) && $cycleCount > 1 ) {
-	$cycleGroup = isset($_COOKIE['zmGroup'])?$_COOKIE['zmGroup']:0;
-?>
-			<li class="dropdown">
-				<a href="#" class="dropdown-toggle" data-toggle="dropdown">Montage <span class="caret"></span></a>
-				<ul class="dropdown-menu">
-					<li><?php echo makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), translate('Cycle'), $running ) ?></li>
-					<li><?php echo makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', translate('Montage'), $running ) ?></li>
-					<li><?php echo makePopupLink( '?view=montagereview&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montagereview', translate('Montage Review'), $running ) ?></li>
-				</ul>
-			</li>
-<?php } ?>
-		</ul>
-
-<div class="navbar-right">
-<?php if ( ZM_OPT_USE_AUTH ) { ?>
-	<p class="navbar-text"><?php echo translate('LoggedInAs') ?> <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?> </p>
-<?php } ?>
-
-<?php if ( canEdit( 'System' ) ) { ?>
-		<a class="btn btn-default navbar-btn" href="/?view=state" onclick="createPopup( '?view=state', 'zmState', 'state' ); return( false );"> <?php echo $status ?> </a>
-
-<?php } else if ( canView( 'System' ) ) { ?>
-		<p class="navbar-text"> <?php echo $status ?> </p>
-<?php } ?>
-</div>
-
-	</div> <!-- End .container-fluid -->
-</div> <!-- End .navbar .navbar-default -->
-
+    <?php include("skins/$skin/views/header.php") ?>
 
     <div class="container-fluid">
       <table id="consoleTable" cellspacing="0">
diff --git a/web/skins/classic/views/header.php b/web/skins/classic/views/header.php
new file mode 100644
index 000000000..c0aeb0394
--- /dev/null
+++ b/web/skins/classic/views/header.php
@@ -0,0 +1,46 @@
+<div class="navbar navbar-default">
+	<div class="container">
+		<div class="navbar-header">
+			<a class="navbar-brand" href="http://www.zoneminder.com" target="ZoneMinder">ZoneMinder</a>
+		</div>
+
+		<ul class="nav navbar-nav">
+<?php if ( canView( 'System' ) ) { ?>
+			<li><?php echo makePopupLink( '?view=options', 'zmOptions', 'options', translate('Options') ) ?></li>
+			<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>
+<?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><?php echo makePopupLink( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?></li>
+
+<?php if ( canView( 'Stream' ) && $cycleCount > 1 ) {
+	$cycleGroup = isset($_COOKIE['zmGroup'])?$_COOKIE['zmGroup']:0;
+?>
+			<li class="dropdown">
+				<a href="#" class="dropdown-toggle" data-toggle="dropdown">Montage <span class="caret"></span></a>
+				<ul class="dropdown-menu">
+					<li><?php echo makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), translate('Cycle'), $running ) ?></li>
+					<li><?php echo makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', translate('Montage'), $running ) ?></li>
+					<li><?php echo makePopupLink( '?view=montagereview&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montagereview', translate('Montage Review'), $running ) ?></li>
+				</ul>
+			</li>
+<?php } ?>
+		</ul>
+
+<div class="navbar-right">
+<?php if ( ZM_OPT_USE_AUTH ) { ?>
+	<p class="navbar-text"><?php echo translate('LoggedInAs') ?> <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?> </p>
+<?php } ?>
+
+<?php if ( canEdit( 'System' ) ) { ?>
+		<a class="btn btn-default navbar-btn" href="/?view=state" onclick="createPopup( '?view=state', 'zmState', 'state' ); return( false );"> <?php echo $status ?> </a>
+
+<?php } else if ( canView( 'System' ) ) { ?>
+		<p class="navbar-text"> <?php echo $status ?> </p>
+<?php } ?>
+</div>
+
+	</div> <!-- End .container-fluid -->
+</div> <!-- End .navbar .navbar-default -->
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 74743cb38..c81f7be95 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -57,9 +57,9 @@ xhtmlHeaders( __FILE__, translate('Options') );
 ?>
 <body>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Options') ?></h2>
-    </div>
+
+    <?php include("skins/$skin/views/header.php") ?>
+
     <div id="content">
       <ul class="nav nav-tabs">
 <?php