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

Merge pull request #3864 from IgorA100/patch-19 

Fix page console
pull/3868/head
Isaac Connor 2024-03-14 16:44:21 -04:00 committed by GitHub
parent 736ac7dd33 6cd5fac11b
commit 305a1485cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/skins/classic/css/base/skin.css
View File

@ -589,6 +589,7 @@ body.sticky #page {
#contentButtons { #contentButtons {
margin-top: 8px; margin-top: 8px;
margin-bottom: 8px;
float: right; float: right;
} }

9
web/skins/classic/css/base/views/console.css
View File

@ -118,7 +118,14 @@ form[name="monitorForm"] {
} }
#monitorList { #monitorList {
flex: 1 1 auto; flex: 1 1 auto;
overflow-y: auto; /* overflow-y: scroll; */
}
body.sticky #monitorList {
overflow: auto;
}
body.sticky #monitorList thead {
position: sticky;
top: -1px;
} }
#toolbar, #toolbar,
#contentButtons { #contentButtons {

4
web/skins/classic/views/console.php
View File

@ -169,7 +169,7 @@ echo $navbar ?>
<?php echo $filterbar ?> <?php echo $filterbar ?>
</div> </div>
<div class="container-fluid pt-2" id="toolbar"> <div id="toolbar" class="container-fluid pt-2">
<div class="statusBreakdown"> <div class="statusBreakdown">
<?php <?php
$html = ''; $html = '';
@ -231,7 +231,7 @@ echo $navbar ?>
<?php <?php
ob_start(); ob_start();
?> ?>
<div class="container-fluid table-responsive-sm pt-2" id="monitorList"> <div id="monitorList" class="container-fluid table-responsive">
<table id="consoleTable" class="table table-striped table-hover table-condensed consoleTable" <table id="consoleTable" class="table table-striped table-hover table-condensed consoleTable"
style="display:none;" style="display:none;"
data-toolbar="#toolbar" data-toolbar="#toolbar"