move header right to shift pill list up

pull/3034/head
Andrew Bauer 2020-08-28 13:32:46 -05:00
parent 47732e2469
commit 9c56cd223f
1 changed files with 41 additions and 36 deletions

View File

@ -384,40 +384,9 @@ getBodyTopHTML();
echo getNavBarHTML(); echo getNavBarHTML();
?> ?>
<div id="page" class="container-fluid"> <div id="page" class="container-fluid">
<div class="d-flex flex-row justify-content-between px-3 py-1">
<div class="" id="toolbar" >
<button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
<button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
</div>
<h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor->Name()) ?><?php if ( $monitor->Id() ) { ?> (<?php echo $monitor->Id()?>)<?php } ?></h2>
<?php
if ( canEdit('Monitors') ) {
if ( isset($_REQUEST['dupId']) ) {
?>
<div class="alert alert-info">
Configuration cloned from Monitor: <?php echo validHtmlStr($clonedName) ?>
</div>
<?php
}
?>
<div id="">
<?php echo makeLink('?view=monitorprobe&mid='.$monitor->Id(), translate('Probe')); ?>
<?php
if ( ZM_HAS_ONVIF ) {
echo makeLink('?view=onvifprobe&mid='.$monitor->Id(), translate('OnvifProbe'));
}
?>
<?php echo makeLink('?view=monitorpreset&mid=' . $monitor->Id(), translate('Presets')); ?>
</div>
<?php
} // end if canEdit('Monitors')
?>
</div>
<div id="" class="row flex-nowrap"> <div id="" class="row flex-nowrap">
<nav id=""> <nav id=""> <!-- BEGIN PILL LIST -->
<ul class="pillList nav nav-pills flex-column h-100"> <ul class="pillList nav nav-pills flex-column h-100">
<?php <?php
$tabs = array(); $tabs = array();
@ -447,8 +416,43 @@ foreach ( $tabs as $name=>$value ) {
} }
?> ?>
</ul> </ul>
</nav> </nav> <!-- END PILL LIST -->
<div class="container-fluid col-sm-offset-2 pr-0">
<div class="d-flex flex-column col-sm-offset-2 container-fluid">
<!-- BEGIN MINI HEADER -->
<div class="d-flex flex-row justify-content-between px-3 py-1">
<div class="" id="toolbar" >
<button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
<button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
</div>
<h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor->Name()) ?><?php if ( $monitor->Id() ) { ?> (<?php echo $monitor->Id()?>)<?php } ?></h2>
<?php
if ( canEdit('Monitors') ) {
if ( isset($_REQUEST['dupId']) ) {
?>
<div class="alert alert-info">
Configuration cloned from Monitor: <?php echo validHtmlStr($clonedName) ?>
</div>
<?php
}
?>
<div id="">
<?php echo makeLink('?view=monitorprobe&mid='.$monitor->Id(), translate('Probe')); ?>
<?php
if ( ZM_HAS_ONVIF ) {
echo makeLink('?view=onvifprobe&mid='.$monitor->Id(), translate('OnvifProbe'));
}
?>
<?php echo makeLink('?view=monitorpreset&mid=' . $monitor->Id(), translate('Presets')); ?>
</div>
<?php
} // end if canEdit('Monitors')
?>
</div>
<!-- BEGIN ITEM LIST -->
<div class="d-flex flex-row container-fluid pr-0">
<form name="contentForm" id="contentForm" method="post" action="?"> <form name="contentForm" id="contentForm" method="post" action="?">
<input type="hidden" name="view" value="<?php echo $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="tab" value="<?php echo $tab ?>"/> <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
@ -1286,7 +1290,7 @@ echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnL
?> ?>
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons" class="pr-3">
<button type="submit" value="Save"<?php echo canEdit('Monitors') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button> <button type="submit" value="Save"<?php echo canEdit('Monitors') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
<button type="button" id="cancelBtn"><?php echo translate('Cancel') ?></button> <button type="button" id="cancelBtn"><?php echo translate('Cancel') ?></button>
</div> </div>
@ -1294,5 +1298,6 @@ echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnL
</div> </div>
</div> </div>
</div> </div>
</div>
</body> </body>
</html> </html>