ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert settings popup to modal

This commit is contained in:
Andrew Bauer 2020-10-03 16:51:25 -05:00
parent 07d0353373
commit 1643fb686b
4 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
web/skins/classic/views/settings.php → web/ajax/modals/settings.php
View File

@ -1,27 +1,6 @@
<?php <?php
// if ( !canView('Control') ) return;
// ZoneMinder web settings view file, $Date$, $Revision$
// Copyright (C) 2001-2008 Philip Coombes
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
//
if ( !canView('Control') ) {
$view = 'error';
return;
}
$monitor = ZM\Monitor::find_one(array('Id'=>$_REQUEST['mid'])); $monitor = ZM\Monitor::find_one(array('Id'=>$_REQUEST['mid']));
$zmuCommand = getZmuCommand(' -m '.escapeshellarg($_REQUEST['mid']).' -B -C -H -O'); $zmuCommand = getZmuCommand(' -m '.escapeshellarg($_REQUEST['mid']).' -B -C -H -O');
@ -35,17 +14,22 @@ if ( $zmuOutput ) {
$monitor->Colour($colour); $monitor->Colour($colour);
} }
$focusWindow = true;
xhtmlHeaders(__FILE__, validHtmlStr($monitor->Name()).' - '.translate('Settings'));
?> ?>
<body> <div class="modal" id="settingsModal" tabindex="-1">
<div id="page"> <div class="modal-dialog">
<div id="header"> <div class="modal-content">
<h2><?php echo validHtmlStr($monitor->Name()) ?> - <?php echo translate('Settings') ?></h2> <div class="modal-header">
</div> <h5 class="modal-title"><?php echo validHtmlStr($monitor->Name()) ?> - <?php echo translate('Settings') ?></h5>
<div id="content"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<form name="contentForm" id="contentForm" method="post" action="?"> <span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form name="contentForm" id="settingsForm" method="post" action="?">
<?php
// We have to manually insert the csrf key into the form when using a modal generated via ajax call
echo getCSRFinputHTML();
?>
<input type="hidden" name="view" value="<?php echo $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="settings"/> <input type="hidden" name="action" value="settings"/>
<input type="hidden" name="mid" value="<?php echo validInt($_REQUEST['mid']) ?>"/> <input type="hidden" name="mid" value="<?php echo validInt($_REQUEST['mid']) ?>"/>
@ -69,11 +53,12 @@ xhtmlHeaders(__FILE__, validHtmlStr($monitor->Name()).' - '.translate('Settings'
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> </div>
<button type="submit" value="Save"<?php echo canView('Control') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button> <div class="modal-footer">
<button type="button" value="Close" data-on-click="closeWindow"/><?php echo translate('Close') ?></button> <button type="submit" class="btn btn-primary" id="settingsSubmitModal" value="Save"<?php echo canView('Control') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
</div> <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</form> </div>
</form>
</div> </div>
</div> </div>
<?php xhtmlFooter() ?> </div>

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

@ -845,9 +845,32 @@ function getCtrlPresetModal() {
.fail(logAjaxFail); .fail(logAjaxFail);
} }
function getSettingsModal() {
$j.getJSON(thisUrl + '?request=modal&modal=settings&mid=' + monitorId)
.done(function(data) {
if ( $j('#settingsModal').length ) {
$j('#settingsModal').replaceWith(data.html);
} else {
$j("body").append(data.html);
}
updatePresetLabels();
// Manage the Save button
$j('#settingsSubmitModal').click(function(evt) {
evt.preventDefault();
$j('#settingsForm').submit();
});
})
.fail(logAjaxFail);
}
function initPage() { function initPage() {
// Load the PTZ Preset modal into the DOM
getCtrlPresetModal(); if ( canViewControl ) {
// Load the PTZ Preset modal into the DOM
getCtrlPresetModal();
// Load the settings modal into the DOM
getSettingsModal();
}
if ( monitorType != 'WebSite' ) { if ( monitorType != 'WebSite' ) {
if ( streamMode == 'single' ) { if ( streamMode == 'single' ) {

1
web/skins/classic/views/js/watch.js.php
View File

@ -68,6 +68,7 @@ var imageRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_IMAGE ?>;
var canEditMonitors = <?php echo canEdit( 'Monitors' )?'true':'false' ?>; var canEditMonitors = <?php echo canEdit( 'Monitors' )?'true':'false' ?>;
var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>; var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
var canViewControl = <?php echo canView( 'Control' )?'true':'false' ?>;
var canPlayPauseAudio = Browser.ie; var canPlayPauseAudio = Browser.ie;

4
web/skins/classic/views/watch.php
View File

@ -67,7 +67,9 @@ xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
<?php <?php
if ( canView('Control') && $monitor->Type() == 'Local' ) { if ( canView('Control') && $monitor->Type() == 'Local' ) {
?> ?>
<div id="settingsControl"><?php echo makePopupLink($monitor->UrlToIndex().'?view=settings&amp;mid='.$monitor->Id().'&amp;'.get_auth_relay(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"') ?></div> <div id="settingsControl">
<button type="button" data-toggle="modal" data-target="#settingsModal"><?php echo translate('Settings') ?></button>
</div>
<?php <?php
} }
?> ?>