ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

pull/3023/head
Isaac Connor 2020-08-24 17:42:37 -04:00
parent fe5e005d8e 0879ecf9a5
commit 981439cbd9
4 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distros/redhat/zoneminder.spec
View File

@ -204,7 +204,6 @@ mv -f CakePHP-Enum-Behavior-%{ceb_version} ./web/api/app/Plugin/CakePHP-Enum-Beh
# Change the following default values # Change the following default values
./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR %{_localstatedir}/spool/zoneminder-upload
./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no ./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
@ -399,7 +398,6 @@ EOF
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/cache/zoneminder %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/cache/zoneminder
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
%files nginx %files nginx
%config(noreplace) %attr(640,root,nginx) %{_sysconfdir}/zm/zm.conf %config(noreplace) %attr(640,root,nginx) %{_sysconfdir}/zm/zm.conf
@ -423,7 +421,6 @@ EOF
%dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/temp %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/temp
%dir %attr(755,nginx,nginx) %{_localstatedir}/cache/zoneminder %dir %attr(755,nginx,nginx) %{_localstatedir}/cache/zoneminder
%dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
%changelog %changelog
* Tue Feb 04 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.2-1 * Tue Feb 04 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.2-1

2
web/skins/classic/views/js/frames.js
View File

@ -19,7 +19,7 @@ function initThumbAnimation() {
function processClicks(event, field, value, row, $element) { function processClicks(event, field, value, row, $element) {
if ( field == 'FramesScore' ) { if ( field == 'FramesScore' ) {
window.location.assign('?view=stats&eid='+row.EventId+'&fid='+row.FramesId); window.location.assign('?view=stats&eid='+row.EventId+'&fid='+row.FramesId);
} else { } else {
window.location.assign('?view=frame&eid='+row.EventId+'&fid='+row.FramesId); window.location.assign('?view=frame&eid='+row.EventId+'&fid='+row.FramesId);
} }

27
web/skins/classic/views/js/timeline.js
View File

@ -214,3 +214,30 @@ window.addEventListener('DOMContentLoaded', function() {
}); });
}); });
function initPage() {
var backBtn = $j('#backBtn');
// Don't enable the back button if there is no previous zm page to go back to
backBtn.prop('disabled', !document.referrer.length);
// Manage the BACK button
document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
evt.preventDefault();
window.history.back();
});
// Manage the REFRESH Button
document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
evt.preventDefault();
window.location.reload(true);
});
// Manage the LIST Button
document.getElementById("listBtn").addEventListener("click", function onListClick(evt) {
evt.preventDefault();
window.location.assign('?view=events'+filterQuery);
});
}
$j(document).ready(function() {
initPage();
});

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

@ -673,18 +673,17 @@ $focusWindow = true;
xhtmlHeaders(__FILE__, translate('Timeline')); xhtmlHeaders(__FILE__, translate('Timeline'));
?> ?>
<body> <body>
<div id="page">
<?php echo getNavBarHTML() ?> <?php echo getNavBarHTML() ?>
<div id="header"> <div id="page p-0">
<div id="info"> <div class="d-flex p-1">
<h2><?php echo translate('Timeline') ?></h2> <div class="mr-auto" id="toolbar" >
<a id="refreshLink" href="#" data-on-click="refreshWindow"><?php echo translate('Refresh') ?></a> <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>
</div> <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 id="headerButtons"> <button id="listBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('List') ?>" ><i class="fa fa-list"></i></button>
<a href="#" data-on-click="backWindow"><?php echo translate('Back') ?></a>
<a href="?view=events&amp;page=1<?php echo htmlspecialchars($filterQuery) ?>"><?php echo translate('List') ?></a>
</div> </div>
<h2 class="align-self-end"><?php echo translate('Timeline') ?></h2>
</div> </div>
<div id="content" class="chartSize"> <div id="content" class="chartSize">
<div id="topPanel" class="graphWidth"> <div id="topPanel" class="graphWidth">
<div id="imagePanel"> <div id="imagePanel">