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

Merge branch 'master' of github.com:ZoneMinder/zoneminder

Browse Source
This commit is contained in:
Isaac Connor
2023-03-28 16:34:05 -04:00
parent ca0f04f3a7 aff04e3230
commit 06cad49b80
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,7 +251,13 @@ body.sticky #content {
flex-flow: column;
*/
overflow: hidden;
height: 100%;
height: 100%;
}
#inner-content {
overflow: auto;
height: 100%;
width: 100%;
}
/*

6
web/skins/classic/views/event.php
View File

@@ -149,6 +149,7 @@ getBodyTopHTML();
?>
<div id="page">
<?php echo getNavBarHTML() ?>
<div id="content">
<?php
if ( !$Event->Id() ) {
echo '<div class="error">Event was not found.</div>';
@@ -207,7 +208,7 @@ if ( $Event->Id() and !file_exists($Event->Path()) )
</div>
<?php if ( $Event->Id() ) { ?>
<!-- BEGIN VIDEO CONTENT ROW -->
<div id="content">
<div id="inner-content">
<div class="d-flex flex-row">
<div class="eventStats">
<!-- VIDEO STATISTICS TABLE -->
@@ -233,7 +234,7 @@ if (file_exists($Event->Path().'/snapshot.jpg')) {
}
if (file_exists($Event->Path().'/objdetect.jpg')) {
echo '
<a href="?view=image&eid='. $Event->Id().'&amp;fid=objdetect&width='.ZM_WEB_LIST_THUMB_WIDTH.'">
<a href="?view=image&eid='. $Event->Id().'&amp;fid=objdetect">
<img src="?view=image&eid='. $Event->Id().'&amp;fid=objdetect" width="'.ZM_WEB_LIST_THUMB_WIDTH.'" alt="Detected Objects"/>
</a>
';
@@ -359,6 +360,7 @@ if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
<?php
} // end if Event exists
?>
</div><!--inner-content-->
</div><!--content-->
</div><!--page-->