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

This commit is contained in:
Isaac Connor 2020-09-25 16:03:00 -04:00
commit cf3f57e925
3 changed files with 5 additions and 8 deletions

View File

@ -36,10 +36,9 @@ $focusWindow = true;
xhtmlHeaders(__FILE__, translate('MonitorPreset') );
?>
<body>
<?php echo getNavBarHTML() ?>
<div id="page">
<div id="header">
<h2><?php echo translate('MonitorPreset') ?></h2>
</div>
<div id="content">
<form name="contentForm" id="contentForm" method="post" action="?">
<input type="hidden" name="view" value="none"/>

View File

@ -321,10 +321,9 @@ $focusWindow = true;
xhtmlHeaders(__FILE__, translate('MonitorProbe') );
?>
<body>
<?php echo getNavBarHTML() ?>
<div id="page">
<div id="header">
<h2><?php echo translate('MonitorProbe') ?></h2>
</div>
<h2><?php echo translate('MonitorProbe') ?></h2>
<div id="content">
<form name="contentForm" id="contentForm" method="post" action="?">
<input type="hidden" name="view" value="none"/>

View File

@ -161,10 +161,9 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
$cameras[0] = translate('NoDetectedCameras');
?>
<?php echo getNavBarHTML() ?>
<div id="page">
<div id="header">
<h2><?php echo translate('MonitorProbe') ?></h2>
</div>
<h2><?php echo translate('MonitorProbe') ?></h2>
<div id="content">
<form name="contentForm" id="contentForm" method="post" action="?">
<input type="hidden" name="view" value="none"/>