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/2487/head
Isaac Connor 2019-02-05 12:35:15 -05:00
parent c54fe7e89a cab77d7c17
commit a40cd144fa
2 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/js/base.js
View File

@ -65,7 +65,7 @@ var popupSizes = {
'storage': {'width': 600, 'height': 405}, 'storage': {'width': 600, 'height': 405},
'timeline': {'width': 760, 'height': 540}, 'timeline': {'width': 760, 'height': 540},
'user': {'width': 460, 'height': 720}, 'user': {'width': 460, 'height': 720},
'version': {'width': 360, 'height': 185}, 'version': {'width': 360, 'height': 210},
'video': {'width': 420, 'height': 360}, 'video': {'width': 420, 'height': 360},
'videoview': {'addWidth': 48, 'addHeight': 80}, 'videoview': {'addWidth': 48, 'addHeight': 80},
'watch': {'addWidth': 96, 'minWidth': 420, 'addHeight': 384}, 'watch': {'addWidth': 96, 'minWidth': 420, 'addHeight': 384},

60
web/skins/classic/views/version.php
View File

@ -18,29 +18,28 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
// //
if ( !canEdit( 'System' ) ) if ( !canView('System') ) {
{ $view = 'error';
$view = "error"; return;
return;
} }
$options = array( $options = array(
"go" => translate('GoToZoneMinder') 'go' => translate('GoToZoneMinder')
); );
if ( verNum( ZM_DYN_CURR_VERSION ) != verNum( ZM_DYN_LAST_VERSION ) ) if ( verNum(ZM_DYN_CURR_VERSION) != verNum(ZM_DYN_LAST_VERSION) and canEdit('System') ) {
{ $options = array_merge( $options, array(
$options = array_merge( $options, array( 'ignore' => translate('VersionIgnore'),
"ignore" => translate('VersionIgnore'), 'hour' => translate('VersionRemindHour'),
"hour" => translate('VersionRemindHour'), 'day' => translate('VersionRemindDay'),
"day" => translate('VersionRemindDay'), 'week' => translate('VersionRemindWeek'),
"week" => translate('VersionRemindWeek'), 'never' => translate('VersionRemindNever')
"never" => translate('VersionRemindNever') ) );
) );
} }
$focusWindow = true; $focusWindow = true;
xhtmlHeaders(__FILE__, translate('Version') ); xhtmlHeaders(__FILE__, translate('Version'));
?> ?>
<body> <body>
<div id="page"> <div id="page">
@ -49,29 +48,20 @@ xhtmlHeaders(__FILE__, translate('Version') );
</div> </div>
<div id="content"> <div id="content">
<?php <?php
if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) ) if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) ) {
{
?> ?>
<p class="errorText"><?php echo sprintf( $CLANG['VersionMismatch'], ZM_VERSION, ZM_DYN_DB_VERSION ) ?></p> <p class="errorText"><?php echo sprintf( $CLANG['VersionMismatch'], ZM_VERSION, ZM_DYN_DB_VERSION ) ?></p>
<p><?php echo translate('RunLocalUpdate') ?></p> <p><?php echo translate('RunLocalUpdate') ?></p>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" value="<?php echo translate('Close') ?>" data-on-click="closeWindow"/>
</div>
<?php <?php
} } else if ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) ) {
elseif ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) )
{
?> ?>
<p><?php echo sprintf( $CLANG['RunningRecentVer'], ZM_VERSION ) ?></p> <p><?php echo sprintf($CLANG['RunningRecentVer'], ZM_VERSION) ?></p>
<p><?php echo translate('UpdateNotNecessary') ?></p> <p><?php echo translate('UpdateNotNecessary') ?></p>
<p><input type="button" value="<?php echo translate('GoToZoneMinder') ?>" data-on-click="zmWindow"/></p>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" value="<?php echo translate('Close') ?>" data-on-click="closeWindow"/> <button type="button" data-on-click="zmWindow"><?php echo translate('GoToZoneMinder') ?></button>
</div>
<?php <?php
} } else {
else
{
?> ?>
<form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
@ -80,13 +70,17 @@ else
<p><?php echo sprintf( $CLANG['LatestRelease'], ZM_DYN_LAST_VERSION, ZM_VERSION ) ?></p> <p><?php echo sprintf( $CLANG['LatestRelease'], ZM_DYN_LAST_VERSION, ZM_VERSION ) ?></p>
<p><?php echo buildSelect( "option", $options ); ?></p> <p><?php echo buildSelect( "option", $options ); ?></p>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?php echo translate('Apply') ?>" data-on-click-this="submitForm"/>
<input type="button" value="<?php echo translate('Close') ?>" data-on-click="closeWindow"/>
</div>
</form>
<?php <?php
if ( canEdit('System') ) {
?>
<button type="submit" data-on-click-this="submitForm" value="Apply"><?php echo translate('Apply') ?></button>
<?php
}
} }
?> ?>
<button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
</div>
</form>
</div> </div>
</div> </div>
</body> </body>