ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sync up tags with collapsed header and remove the fixed-top class so that the stick header takes over.

pull/3659/head
Isaac Connor 2023-01-29 10:54:38 -05:00
parent 5bf89b7178
commit 689ae56732
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/skins/classic/includes/functions.php
View File

@ -195,17 +195,13 @@ function getNavBarHTML() {
// The legacy navigation bar that collapses into a pulldown menu on small screens. // The legacy navigation bar that collapses into a pulldown menu on small screens.
// //
function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin) { function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin) {
$status = runtimeStatus($running); $status = runtimeStatus($running);
?> ?>
<div class="container-fluid" id="navbar-container"> <div class="container-fluid" id="navbar-container">
<nav class="navbar navbar-expand-md justify-content-center flex-row" id="navbar-one"> <nav class="navbar navbar-expand-md justify-content-center flex-row" id="navbar-one">
<div class="navbar-brand justify-content-start align-self-start"> <div class="navbar-brand justify-content-start align-self-start">
<?php echo getNavBrandHTML() ?> <?php echo getNavBrandHTML() ?>
</div> </div>
<!-- the Navigation Bar Hamburger Button --> <!-- the Navigation Bar Hamburger Button -->
<!-- <!--
<div class="nav justify-content-end flex-grow-1"> <div class="nav justify-content-end flex-grow-1">
@ -225,7 +221,6 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin)
<!-- <!--
</div> </div>
--> -->
<div class="collapse navbar-collapse" id="main-header-nav"> <div class="collapse navbar-collapse" id="main-header-nav">
<?php <?php
@ -308,29 +303,22 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin)
// A new, slimmer navigation bar, permanently collapsed into a dropdown // A new, slimmer navigation bar, permanently collapsed into a dropdown
// //
function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $skin) { function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $skin) {
$status = runtimeStatus($running); $status = runtimeStatus($running);
?> ?>
<div class="fixed-top container-fluid"> <div class="container-fluid" id="navbar-container">
<nav class="navbar px-1 flex-nowrap"> <nav class="navbar px-1 flex-nowrap">
<div class="navbar-brand align-self-start px-0"> <div class="navbar-brand align-self-start px-0">
<?php echo getNavBrandHTML() ?> <?php echo getNavBrandHTML() ?>
</div> </div>
<nav class="navbar navbar-expand-md align-self-start px-0"> <nav class="navbar navbar-expand-md align-self-start px-0">
<?php <?php
// *** Build the statistics shown on the navigation bar *** // *** Build the statistics shown on the navigation bar ***
if ( (!ZM_OPT_USE_AUTH) or $user ) { if ( (!ZM_OPT_USE_AUTH) or $user ) {
?> ?>
<div id="reload" class="collapse navbar-collapse px-0"> <div id="reload" class="collapse navbar-collapse px-0">
<ul id="Version" class="pr-2 navbar-nav"> <ul id="Version" class="pr-2 navbar-nav">
<?php echo getZMVersionHTML() ?> <?php echo getZMVersionHTML() ?>
</ul> </ul>
<ul id="Bandwidth" class="px-2 navbar-nav"> <ul id="Bandwidth" class="px-2 navbar-nav">
<?php echo getBandwidthHTML($bandwidth_options, $user) ?> <?php echo getBandwidthHTML($bandwidth_options, $user) ?>
</ul> </ul>
@ -392,7 +380,7 @@ function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $ski
</nav><!-- End First Navbar --> </nav><!-- End First Navbar -->
<nav class="navbar navbar-expand-md justify-content-center"> <nav class="navbar navbar-expand-md justify-content-center" id="navbar-three">
<?php echo getConsoleBannerHTML() ?> <?php echo getConsoleBannerHTML() ?>
</nav><!-- End Second Navbar --> </nav><!-- End Second Navbar -->
</div> </div>