mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-08-02 16:27:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4999 from IgorA100/patch-226476

Browse Source 
Fix: Do not hide the control button "#mfbpanel" for filter=inline mode, since this panel, in addition to the filter, has other necessary controls on the Watch & Montage page
This commit is contained in:
Isaac Connor
2026-07-26 17:55:30 -04:00
committed by GitHub
parent 0b27b675b7 2d442f54af
commit fefa2cf146
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web/skins/classic/views/montage.php
View File

@@ -250,19 +250,13 @@ echo getNavBarHTML();
<div id="header"<?php echo (isset($_REQUEST['header']) and ($_REQUEST['header']=='0' or $_REQUEST['header']=='hidden')) ? ' style="display:none;"' : '' ?>>
<?php
$filter_inline = filterSettingsInline();
$html = '';
// In inline mode this flip icon is the only control that hides/shows the
// top filter panel. In sidebar mode the panel lives in the sidebar
// extruder, which has its own show/hide control, so the icon is omitted.
if ($filter_inline) {
$html .= '<a class="flip" href="#"
data-flip-control-object="#mfbpanel"
data-flip-control-run-after-func="applyChosen"
data-flip-control-run-after-complet-func="changeScale">
<i id="mfbflip" class="material-icons md-18" data-icon-visible="filter_alt_off" data-icon-hidden="filter_alt"></i>
</a>'.PHP_EOL;
}
$html .= '<div id="mfbpanel" class="'.($filter_inline ? '' : 'hidden-shift ').'container-fluid">'.PHP_EOL;
$html = '<a class="flip" href="#"
data-flip-control-object="#mfbpanel"
data-flip-control-run-after-func="applyChosen"
data-flip-control-run-after-complet-func="changeScale">
<i id="mfbflip" class="material-icons md-18" data-icon-visible="filter_alt_off" data-icon-hidden="filter_alt"></i>
</a>
<div id="mfbpanel" class="hidden-shift container-fluid">'.PHP_EOL;
echo $html;
?>
<form method="get" name="monitorFiltersForm" id="monitorFiltersForm">

20
web/skins/classic/views/watch.php
View File

@@ -227,19 +227,13 @@ echo getNavBarHTML() ?>
<div id="header">
<?php
$filter_inline = filterSettingsInline();
$html = '';
// In inline mode this flip icon is the only control that hides/shows the
// top filter panel. In sidebar mode the panel lives in the sidebar
// extruder, which has its own show/hide control, so the icon is omitted.
if ($filter_inline) {
$html .= '<a class="flip" href="#"
data-flip-control-object="#mfbpanel"
data-flip-control-run-after-func="applyChosen"
data-flip-control-run-after-complet-func="changeScale">
<i id="mfbflip" class="material-icons md-18" data-icon-visible="filter_alt_off" data-icon-hidden="filter_alt"></i>
</a>'.PHP_EOL;
}
$html .= '<div id="mfbpanel" class="'.($filter_inline ? '' : 'hidden-shift ').'container-fluid">'.PHP_EOL;
$html = '<a class="flip" href="#"
data-flip-control-object="#mfbpanel"
data-flip-control-run-after-func="applyChosen"
data-flip-control-run-after-complet-func="changeScale">
<i id="mfbflip" class="material-icons md-18" data-icon-visible="filter_alt_off" data-icon-hidden="filter_alt"></i>
</a>
<div id="mfbpanel" class="hidden-shift container-fluid">'.PHP_EOL;
echo $html;
?>
<div class="controlHeader">