Skip to content

Fix: Minor HTML layout issues #4722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IgorA100 wants to merge 7 commits into
base: master
Choose a base branch
from
+11 −6
Open

Fix: Minor HTML layout issues #4722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
66e5ddb
Fix: Removed extra space and extra slash (functions.php)
IgorA100 Mar 27, 2026
cb647be
Remove extra space (functions.php)
IgorA100 Mar 27, 2026
0d66ac0
Added missing UL tag (functions.php)
IgorA100 Mar 27, 2026
8482123
SPAN tag replaced with DIV tag (functions.php)
IgorA100 Mar 27, 2026
15ba8ae
SPAN tag replaced with DIV tag (watch.php)
IgorA100 Mar 27, 2026
5ca7dc2
Set style for "div.volume" (skin.css)
IgorA100 Mar 27, 2026
6583f46
Merge branch 'ZoneMinder:master' into patch-674015
IgorA100 Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions web/skins/classic/css/base/skin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,9 @@ noUi-target {
[id^="volumeControls"].disabled {
opacity: 0.4;
}
div.volume {
display: inline-block;
}
/* --- Volume control --- */

.rightInFlexContainer {
Expand Down
10 changes: 6 additions & 4 deletions web/skins/classic/includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function xhtmlHeadersStart($file, $title) {
<?php #Chosen can't be cache-busted because it loads sprites by relative path ?>
<link rel="stylesheet" href="skins/classic/js/chosen/chosen.min.css" type="text/css"/>
<?php
echo output_link_if_exists(array('js/noUiSlider-15.8.1/dist/nouislider.min.css?'), false, $param = ['global', 'stylesheet', ' type="text/css"/']);
echo output_link_if_exists(array('js/noUiSlider-15.8.1/dist/nouislider.min.css?'), false, $param = ['global', 'stylesheet', ' type="text/css"']);
echo output_link_if_exists(array(
'js/dateTimePicker/jquery-ui-timepicker-addon.css',
'js/jquery-ui-1.13.2/jquery-ui.structure.min.css',
Expand Down Expand Up @@ -396,7 +396,7 @@ function getSidebarTopHTML() {
$blockExtruder = '
<div id="extruderLeft">
<div id="contextExtruderLeft" class="text">
<! -- Pull-out panel FILLED VIA JS -->
<!-- Pull-out panel FILLED VIA JS -->
</div>
</div>
';
Expand Down Expand Up @@ -427,14 +427,16 @@ function getSidebarTopHTML() {
<div class="sidebar-footer hidden-for-collapsed">
<div class="footer-box">
<div>
<ul>
' . getAccountCircleHTML($skin, $user, $forLeftBar = true) . '
</ul>
</div>
<div style="padding: 0 10px">
<span style="display: block; margin-bottom: 10px">
<div style="margin-bottom: 10px">
<ul id="versionSidebar">
' . getZMVersionHTML() . '
</ul>
</span>
</div>
<ul id="statusSidebar">
' . getStatusBtnHTML(runtimeStatus($running)) . '
</ul>
Expand Down
4 changes: 2 additions & 2 deletions web/skins/classic/views/watch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,10 +461,10 @@
((isset($_COOKIE['zmWatchMuted']) and $_COOKIE['zmWatchMuted'] == 'true') ? true : false);
ZM\Debug("Muted $muted");
?>
<span id="volumeControls<?php echo $mid; ?>" class="volume disabled">
<div id="volumeControls<?php echo $mid; ?>" class="volume disabled">
<div id="volumeSlider<?php echo $mid; ?>" data-volume="<?php echo $volume; ?>" data-muted="<?php echo $muted ? 'true' : 'false'; ?>" class="volumeSlider noUi-horizontal noUi-base noUi-round"></div>
<i id="controlMute<?php echo $mid; ?>" class="audio-control-mute material-icons md-22"></i>
</span>
</div>
</div><!-- id="extButton" --></div><!-- id="bottomBlock" -->
</div><!-- id="wrapperMonitor" -->

Expand Down
Loading