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

Don't include the third nav element for nav banner when there is no banner set so as to take up less space

pull/3779/head
Isaac Connor 2023-10-23 17:06:28 -04:00
parent 7596cdcde3
commit b01908e93c
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,10 +290,7 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin)
<?php
} // end if (!ZM_OPT_USE_AUTH) or $user )
$banner_html = getConsoleBannerHTML();
if ($banner_html) {
echo '<nav class="navbar navbar-expand-md justify-content-center" id="navbar-three">'.$banner_html.'</nav>';
}
echo getConsoleBannerHTML();
?>
</div>
<?php
@ -380,10 +377,7 @@ function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $ski
</div>
</nav><!-- End First Navbar -->
<nav class="navbar navbar-expand-md justify-content-center" id="navbar-three">
<?php echo getConsoleBannerHTML() ?>
</nav><!-- End Second Navbar -->
<?php echo getConsoleBannerHTML() ?>
</div>
<?php
@ -533,7 +527,9 @@ function getConsoleBannerHTML() {
$result = '';
if ( defined('ZM_WEB_CONSOLE_BANNER') and ZM_WEB_CONSOLE_BANNER != '' ) {
$result .= '<nav class="navbar navbar-expand-md justify-content-center" id="navbar-three">';
$result .= '<h2 id="getConsoleBannerHTML">'.validHtmlStr(ZM_WEB_CONSOLE_BANNER).'</h2>';
$result .= '</nav>';
}
return $result;
}