ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put the optional banner in its own navbar

This commit is contained in:
Andrew Bauer 2020-08-02 13:48:15 -05:00
parent d6999f5628
commit a937e14899
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,7 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $filter
$status = runtimeStatus($running); $status = runtimeStatus($running);
?> ?>
<div class="fixed-top container-fluid p-0 p-0"> <div class="fixed-top container-fluid p-0">
<nav class="navbar navbar-expand-md navbar-dark bg-dark justify-content-center flex-row"> <nav class="navbar navbar-expand-md navbar-dark bg-dark justify-content-center flex-row">
<div class="navbar-brand justify-content-start align-self-start"> <div class="navbar-brand justify-content-start align-self-start">
@ -361,12 +361,15 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $filter
<?php echo getZMVersionHTML() ?> <?php echo getZMVersionHTML() ?>
</ul> </ul>
</div> </div>
<?php echo getConsoleBannerHTML() ?>
<?php <?php
} // end if (!ZM_OPT_USE_AUTH) or $user ) } // end if (!ZM_OPT_USE_AUTH) or $user )
?> ?>
</div><!-- End Collapsible Panel --> </div><!-- End Collapsible Panel -->
</nav><!-- End Second Navbar --> </nav><!-- End Second Navbar -->
<nav class="navbar navbar-expand-md bg-dark justify-content-center p-0">
<?php echo getConsoleBannerHTML() ?>
</nav><!-- End Third Navbar -->
</div> </div>
<?php <?php
} // end function getNormalNavBarHTML() } // end function getNormalNavBarHTML()
@ -380,8 +383,8 @@ function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $fil
$status = runtimeStatus($running); $status = runtimeStatus($running);
?> ?>
<div class="fixed-top container-fluid p-0">
<nav class="navbar navbar-fixed-top navbar-dark bg-dark px-1 flex-nowrap"> <nav class="navbar navbar-dark bg-dark 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() ?>
@ -434,8 +437,6 @@ function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $fil
</button> </button>
<?php } ?> <?php } ?>
<?php echo getConsoleBannerHTML() ?>
<div style="background-color:#485460" class="dropdown-menu dropdown-menu-right px-3" id="main-header-nav"> <div style="background-color:#485460" class="dropdown-menu dropdown-menu-right px-3" id="main-header-nav">
<?php <?php
if ( $user and $user['Username'] ) { if ( $user and $user['Username'] ) {
@ -455,7 +456,12 @@ function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $fil
?> ?>
</div> </div>
</nav> </nav><!-- End First Navbar -->
<nav class="navbar navbar-expand-md bg-dark justify-content-center p-0">
<?php echo getConsoleBannerHTML() ?>
</nav><!-- End Second Navbar -->
</div>
<?php <?php
} // End function getCollapsedNavBarHTML } // End function getCollapsedNavBarHTML
@ -552,7 +558,7 @@ function getConsoleBannerHTML() {
$result=''; $result='';
if ( defined('ZM_WEB_CONSOLE_BANNER') and ZM_WEB_CONSOLE_BANNER != '' ) { if ( defined('ZM_WEB_CONSOLE_BANNER') and ZM_WEB_CONSOLE_BANNER != '' ) {
$result .= '<h3 id="getConsoleBannerHTML">'.validHtmlStr(ZM_WEB_CONSOLE_BANNER).'</h3>'; $result .= '<h2 id="getConsoleBannerHTML">'.validHtmlStr(ZM_WEB_CONSOLE_BANNER).'</h2>';
} }
return $result; return $result;