diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index 47201689d..9bc05ed9f 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -170,9 +170,6 @@ function manageFunctionModal() { function initPage() { reloadWindow.periodical(consoleRefreshTimeout); - if ( showVersionPopup ) { - window.location.assign('?view=version'); - } if ( showDonatePopup ) { $j.getJSON(thisUrl + '?request=modal&modal=donate') .done(function(data) { @@ -228,4 +225,4 @@ function applySort(event, ui) { ajax.send(); } // end function applySort(event,ui) -window.addEventListener( 'DOMContentLoaded', initPage ); +$j(document).ready(initPage ); diff --git a/web/skins/classic/views/js/console.js.php b/web/skins/classic/views/js/console.js.php index 6ef6c199c..9f5355dc6 100644 --- a/web/skins/classic/views/js/console.js.php +++ b/web/skins/classic/views/js/console.js.php @@ -1,26 +1,15 @@ var consoleRefreshTimeout = ; 0 ) { - if ( ZM_DYN_DONATE_REMINDER_TIME < time() ) { - $showDonatePopup = true; - } - } else { - $nextReminder = time() + 30*24*60*60; - dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'"); - } +if ( canEdit('System') && ZM_DYN_SHOW_DONATE_REMINDER ) { + if ( ZM_DYN_DONATE_REMINDER_TIME > 0 ) { + if ( ZM_DYN_DONATE_REMINDER_TIME < time() ) $showDonatePopup = true; + } else { + $nextReminder = time() + 30*24*60*60; + dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'"); } -} // end if canEdit('System') +} ?> -var showVersionPopup = ; var showDonatePopup = ; var monitors = new Array(); ; diff --git a/web/skins/classic/views/version.php b/web/skins/classic/views/version.php deleted file mode 100644 index 6552c4cd5..000000000 --- a/web/skins/classic/views/version.php +++ /dev/null @@ -1,88 +0,0 @@ - translate('GoToZoneMinder') -); - -if ( verNum(ZM_DYN_CURR_VERSION) != verNum(ZM_DYN_LAST_VERSION) and canEdit('System') ) { - $options = array_merge( $options, array( - 'ignore' => translate('VersionIgnore'), - 'hour' => translate('VersionRemindHour'), - 'day' => translate('VersionRemindDay'), - 'week' => translate('VersionRemindWeek'), - 'month' => translate('VersionRemindMonth'), - 'never' => translate('VersionRemindNever') - ) ); -} - -$focusWindow = true; - -xhtmlHeaders(__FILE__, translate('Version')); -?> -
-