Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
This commit is contained in:
commit
65564fa480
|
@ -0,0 +1,3 @@
|
||||||
|
input[type="text"] {
|
||||||
|
width: 100%;
|
||||||
|
}
|
|
@ -70,7 +70,7 @@ xhtmlHeaders(__FILE__, translate('CycleWatch') );
|
||||||
<?php echo $navbar = getNavBarHTML(); ?>
|
<?php echo $navbar = getNavBarHTML(); ?>
|
||||||
<div id="header">
|
<div id="header">
|
||||||
<div id="headerButtons">
|
<div id="headerButtons">
|
||||||
<?php if ( $mode == "stream" ) { ?>
|
<?php if ( $mode == 'stream' ) { ?>
|
||||||
<a href="?view=<?php echo $view ?>&mode=still&mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stills') ?></a>
|
<a href="?view=<?php echo $view ?>&mode=still&mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stills') ?></a>
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
<a href="?view=<?php echo $view ?>&mode=stream&mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stream') ?></a>
|
<a href="?view=<?php echo $view ?>&mode=stream&mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stream') ?></a>
|
||||||
|
|
|
@ -472,7 +472,9 @@ function redrawScreen() {
|
||||||
function outputUpdate(time) {
|
function outputUpdate(time) {
|
||||||
drawSliderOnGraph(time);
|
drawSliderOnGraph(time);
|
||||||
for ( var i=0; i < numMonitors; i++ ) {
|
for ( var i=0; i < numMonitors; i++ ) {
|
||||||
loadImage2Monitor(monitorPtr[i],getImageSource(monitorPtr[i],time));
|
var src = getImageSource(monitorPtr[i],time);
|
||||||
|
console.log("New image src: " + src);
|
||||||
|
loadImage2Monitor(monitorPtr[i],src);
|
||||||
}
|
}
|
||||||
currentTimeSecs = time;
|
currentTimeSecs = time;
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,7 +65,6 @@ foreach ( $layouts as $l ) {
|
||||||
$layoutsById[$l->Id()] = $l;
|
$layoutsById[$l->Id()] = $l;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
session_start();
|
session_start();
|
||||||
|
|
||||||
$layout_id = '';
|
$layout_id = '';
|
||||||
|
@ -102,6 +101,7 @@ if ( $Layout and ( $Layout->Name() != 'Freeform' ) ) {
|
||||||
|
|
||||||
if ( $scale )
|
if ( $scale )
|
||||||
$options['scale'] = $scale;
|
$options['scale'] = $scale;
|
||||||
|
|
||||||
session_write_close();
|
session_write_close();
|
||||||
|
|
||||||
ob_start();
|
ob_start();
|
||||||
|
@ -162,9 +162,18 @@ if ( $showZones ) {
|
||||||
<input type="hidden" name="object" value="MontageLayout"/>
|
<input type="hidden" name="object" value="MontageLayout"/>
|
||||||
<input type="hidden" name="action" value="Save"/>
|
<input type="hidden" name="action" value="Save"/>
|
||||||
|
|
||||||
<span id="widthControl"><label><?php echo translate('Width') ?>:</label><?php echo htmlSelect( 'width', $widths, $options['width'], 'changeSize(this);' ); ?></span>
|
<span id="widthControl">
|
||||||
<span id="heightControl"><label><?php echo translate('Height') ?>:</label><?php echo htmlSelect( 'height', $heights, $options['height'], 'changeSize(this);' ); ?></span>
|
<label><?php echo translate('Width') ?>:</label>
|
||||||
<span id="scaleControl"><label><?php echo translate('Scale') ?>:</label><?php echo htmlSelect( 'scale', $scales, $scale, 'changeScale(this);' ); ?></span>
|
<?php echo htmlSelect('width', $widths, $options['width'], 'changeSize(this);'); ?>
|
||||||
|
</span>
|
||||||
|
<span id="heightControl">
|
||||||
|
<label><?php echo translate('Height') ?>:</label>
|
||||||
|
<?php echo htmlSelect('height', $heights, $options['height'], 'changeSize(this);'); ?>
|
||||||
|
</span>
|
||||||
|
<span id="scaleControl">
|
||||||
|
<label><?php echo translate('Scale') ?>:</label>
|
||||||
|
<?php echo htmlSelect('scale', $scales, $scale, 'changeScale(this);'); ?>
|
||||||
|
</span>
|
||||||
<span id="layoutControl">
|
<span id="layoutControl">
|
||||||
<label for="layout"><?php echo translate('Layout') ?>:</label>
|
<label for="layout"><?php echo translate('Layout') ?>:</label>
|
||||||
<?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('onchange'=>'selectLayout(this);', 'id'=>'zmMontageLayout')); ?>
|
<?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('onchange'=>'selectLayout(this);', 'id'=>'zmMontageLayout')); ?>
|
||||||
|
@ -187,7 +196,10 @@ foreach ( $monitors as $monitor ) {
|
||||||
?>
|
?>
|
||||||
<div id="monitorFrame<?php echo $monitor->Id() ?>" class="monitorFrame" title="<?php echo $monitor->Id() . ' ' .$monitor->Name() ?>" style="<?php echo $options['width'] ? 'width:'.$options['width'].'px;':''?>">
|
<div id="monitorFrame<?php echo $monitor->Id() ?>" class="monitorFrame" title="<?php echo $monitor->Id() . ' ' .$monitor->Name() ?>" style="<?php echo $options['width'] ? 'width:'.$options['width'].'px;':''?>">
|
||||||
<div id="monitor<?php echo $monitor->Id() ?>" class="monitor idle">
|
<div id="monitor<?php echo $monitor->Id() ?>" class="monitor idle">
|
||||||
<div id="imageFeed<?php echo $monitor->Id() ?>" class="imageFeed" onclick="createPopup( '?view=watch&mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo reScale( $monitor->Width(), $monitor->PopupScale() ); ?>, <?php echo reScale( $monitor->Height(), $monitor->PopupScale() ); ?> );">
|
<div
|
||||||
|
id="imageFeed<?php echo $monitor->Id() ?>"
|
||||||
|
class="imageFeed"
|
||||||
|
onclick="createPopup('?view=watch&mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo reScale( $monitor->Width(), $monitor->PopupScale() ); ?>, <?php echo reScale( $monitor->Height(), $monitor->PopupScale() ); ?> );">
|
||||||
<?php
|
<?php
|
||||||
$monitor_options = $options;
|
$monitor_options = $options;
|
||||||
if ( $Positions ) {
|
if ( $Positions ) {
|
||||||
|
@ -204,8 +216,14 @@ foreach ( $monitors as $monitor ) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $monitor->Type() == "WebSite" ) {
|
if ( $monitor->Type() == 'WebSite' ) {
|
||||||
echo getWebSiteUrl( 'liveStream'.$monitor->Id(), $monitor->Path(), reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
|
echo getWebSiteUrl(
|
||||||
|
'liveStream'.$monitor->Id(),
|
||||||
|
$monitor->Path(),
|
||||||
|
reScale($monitor->Width(), $scale),
|
||||||
|
reScale($monitor->Height(), $scale),
|
||||||
|
$monitor->Name()
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
echo getStreamHTML($monitor, $monitor_options);
|
echo getStreamHTML($monitor, $monitor_options);
|
||||||
}
|
}
|
||||||
|
@ -256,7 +274,9 @@ foreach ( $monitors as $monitor ) {
|
||||||
?>
|
?>
|
||||||
Sorry, your browser does not support inline SVG
|
Sorry, your browser does not support inline SVG
|
||||||
</svg>
|
</svg>
|
||||||
<?php } # end if showZones ?>
|
<?php
|
||||||
|
} # end if showZones
|
||||||
|
?>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
if ( (!ZM_WEB_COMPACT_MONTAGE) && ($monitor->Type() != 'WebSite') ) {
|
if ( (!ZM_WEB_COMPACT_MONTAGE) && ($monitor->Type() != 'WebSite') ) {
|
||||||
|
@ -268,7 +288,7 @@ foreach ( $monitors as $monitor ) {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
}
|
} # end foreach monitor
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -37,7 +37,6 @@ if ( ! visibleMonitor($mid) ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$monitor = new Monitor($mid);
|
$monitor = new Monitor($mid);
|
||||||
|
|
||||||
#Whether to show the controls button
|
#Whether to show the controls button
|
||||||
|
|
Loading…
Reference in New Issue