Merge branch 'master' of github.com:ZoneMinder/zoneminder
commit
260c49ba5d
|
@ -810,11 +810,11 @@ function videoEvent() {
|
|||
}
|
||||
|
||||
function eventLive() {
|
||||
window.location.assign("?view=watch&mid='+eventData.MonitorId+'");
|
||||
window.location.assign("?view=watch&mid="+eventData.MonitorId);
|
||||
}
|
||||
|
||||
function eventEdit() {
|
||||
window.location.assign("?view=monitor&mid='+eventData.MonitorId+'");
|
||||
window.location.assign("?view=monitor&mid="+eventData.MonitorId);
|
||||
}
|
||||
|
||||
function viewAllEvents() {
|
||||
|
|
|
@ -899,6 +899,12 @@ function initPage() {
|
|||
$j('#settingsModal').modal('show');
|
||||
});
|
||||
|
||||
// Manage the generate Edit button
|
||||
bindButton('#editBtn', 'click', null, function onEditClick(evt) {
|
||||
evt.preventDefault();
|
||||
window.location.assign("?view=monitor&mid="+monitorId);
|
||||
});
|
||||
|
||||
bindButton('#cyclePlayBtn', 'click', null, cycleStart);
|
||||
bindButton('#cyclePauseBtn', 'click', null, cyclePause);
|
||||
bindButton('#cycleNextBtn', 'click', null, cycleNext);
|
||||
|
|
|
@ -212,6 +212,7 @@ echo getNavBarHTML() ?>
|
|||
<div id="navButtons">
|
||||
<button type="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 type="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>
|
||||
<button type="button" id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Edit') ?>"><i class="fa fa-edit"></i></button>
|
||||
<button type="button" id="settingsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Settings') ?>" disabled><i class="fa fa-sliders"></i></button>
|
||||
<button type="button" id="enableAlmBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('DisableAlarms') ?>" disabled><i class="fa fa-bell"></i></button>
|
||||
<button type="button" id="forceAlmBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ForceAlarm') ?>" disabled><i class="fa fa-exclamation-circle"></i></button>
|
||||
|
|
Loading…
Reference in New Issue