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

add 4CIF aspect ratio padding. Fixes #2738

Browse Source
This commit is contained in:
Isaac Connor
2019-10-23 09:50:49 -04:00
parent 35ae81d985
commit 77118d55b2
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web/skins/classic/css/base/views/timeline.css.php
View File

@@ -17,20 +17,24 @@
}
.imageHeight {
min-height:
<?php
switch($max_aspect_ratio){
switch ( $max_aspect_ratio ) {
case 1:
echo 'padding-top: 100%;'; break;
case 1.78:
echo 'padding-top: 56.25%;'; break;
case 1.33:
case 1.33: // 4:3
echo 'padding-top: 75%;'; break;
case 1.5:
case 1.47:
echo 'padding-top: 68.18%;'; break;
case 1.5: // 3:2
echo 'padding-top: 66.66%'; break;
case 1.6:
case 1.6: // 8:5
echo 'padding-top: 62.5%'; break;
case 1.78: // 16:9
echo 'padding-top: 56.25%;'; break;
default:
ZM\Error("Unknown aspect ratio $max_aspect_ratio");
echo 'padding-top: 100%;';
}
?>
}
@@ -47,7 +51,7 @@ switch($max_aspect_ratio){
height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
}
<?php
if ( $mode == "overlay" ) {
if ( $mode == 'overlay' ) {
foreach ( array_keys($monitors) as $monitorId ) {
?>
#chartPanel .eventsPos<?php echo $monitorId ?> {
@@ -55,7 +59,7 @@ if ( $mode == "overlay" ) {
}
<?php
}
} else if ( $mode == "split" ) {
} else if ( $mode == 'split' ) {
foreach ( array_keys($monitors) as $monitorId ) {
?>
#chartPanel .activityPos<?php echo $monitorId ?> {

10
web/skins/classic/views/timeline.php
View File

@@ -248,11 +248,11 @@ $scales = array(
array( 'name'=>'month', 'factor'=>60*60*24*30, 'align'=>1, 'zoomout'=>12, 'label'=>STRF_TL_AXIS_LABEL_MONTH ),
array( 'name'=>'week', 'factor'=>60*60*24*7, 'align'=>1, 'zoomout'=>4.25, 'label'=>STRF_TL_AXIS_LABEL_WEEK, 'labelCheck'=>'%W' ),
array( 'name'=>'day', 'factor'=>60*60*24, 'align'=>1, 'zoomout'=>7, 'label'=>STRF_TL_AXIS_LABEL_DAY ),
array( 'name'=>"hour4", 'factor'=>60*60, 'align'=>4, 'zoomout'=>6, 'label'=>STRF_TL_AXIS_LABEL_4HOUR, 'labelCheck'=>'%H' ),
array( 'name'=>'hour4', 'factor'=>60*60, 'align'=>4, 'zoomout'=>6, 'label'=>STRF_TL_AXIS_LABEL_4HOUR, 'labelCheck'=>'%H' ),
array( 'name'=>'hour', 'factor'=>60*60, 'align'=>1, 'zoomout'=>4, 'label'=>STRF_TL_AXIS_LABEL_HOUR, 'labelCheck'=>'%H' ),
array( 'name'=>"minute10", 'factor'=>60, 'align'=>10, 'zoomout'=>6, 'label'=>STRF_TL_AXIS_LABEL_10MINUTE, 'labelCheck'=>'%M' ),
array( 'name'=>'minute10', 'factor'=>60, 'align'=>10, 'zoomout'=>6, 'label'=>STRF_TL_AXIS_LABEL_10MINUTE, 'labelCheck'=>'%M' ),
array( 'name'=>'minute', 'factor'=>60, 'align'=>1, 'zoomout'=>10, 'label'=>STRF_TL_AXIS_LABEL_MINUTE, 'labelCheck'=>'%M' ),
array( 'name'=>"second10", 'factor'=>1, 'align'=>10, 'zoomout'=>6, 'label'=>STRF_TL_AXIS_LABEL_10SECOND ),
array( 'name'=>'second10', 'factor'=>1, 'align'=>10, 'zoomout'=>6, 'label'=>STRF_TL_AXIS_LABEL_10SECOND ),
array( 'name'=>'second', 'factor'=>1, 'align'=>1, 'zoomout'=>10, 'label'=>STRF_TL_AXIS_LABEL_SECOND ),
);
@@ -632,7 +632,7 @@ function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomCl
?>
</div>
<?php
return( ob_get_clean() );
return ob_get_clean();
} # end function drawXGrid
function drawYGrid( $chart, $scale, $labelClass, $tickClass, $gridClass ) {
@@ -662,7 +662,7 @@ function drawYGrid( $chart, $scale, $labelClass, $tickClass, $gridClass ) {
?>
</div>
<?php
return( ob_get_clean() );
return ob_get_clean();
} # end function drawYGrid
$focusWindow = true;