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

Update and fix console buttons. Use a separate button for clone

pull/2077/head
Isaac Connor 2018-02-08 09:47:16 -05:00
parent f6bb3017ef
commit babae4629a
3 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/skins/classic/views/console.php
View File

@ -291,13 +291,22 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
<tr> <tr>
<td class="colId"><?php echo count($displayMonitors) ?></td> <td class="colId"><?php echo count($displayMonitors) ?></td>
<td class="colLeftButtons" colspan="<?php echo $left_columns -1?>"> <td class="colLeftButtons" colspan="<?php echo $left_columns -1?>">
<input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/> <button name="addBtn" onclick="addMonitor(this);"
<!--<input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor(this);" <?php echo (canEdit('Monitors') && !$user['MonitorIds']) ? '' : ' disabled="disabled"' ?>
<?php echo (canEdit( 'Monitors' ) && !$user['MonitorIds']) ? '' : ' disabled="disabled"' ?> >
/>--> <?php echo translate('AddNewMonitor') ?>
<?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> </button>
<input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/> <button name="cloneBtn" onclick="addMonitor(this);"
<input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/> <?php echo (canEdit('Monitors') && !$user['MonitorIds']) ? '' : ' disabled="disabled"' ?>
style="display:none;">
<?php echo translate('CloneMonitor') ?>
</button>
<button name="editBtn" onclick="editMonitor(this);" disabled="disabled">
<?php echo translate('Edit') ?>
</button>
<button name="deleteBtn" onclick="deleteMonitor(this);" disabled="disabled">
<?php echo translate('Delete') ?>
</button>
</td> </td>
<?php <?php
foreach ( array_keys( $eventCounts ) as $i ) { foreach ( array_keys( $eventCounts ) as $i ) {

36
web/skins/classic/views/js/console.js
View File

@ -1,22 +1,34 @@
var jsTranslatedAddText;
var jsTranslatedCloneText;
function setButtonStates( element ) { function setButtonStates( element ) {
var form = element.form; var form = element.form;
var checked = 0; var checked = 0;
for ( var i = 0; i < form.elements.length; i++ ) { // We want to know if 1 or more monitors are checked
if ( form.elements[i].type == "checkbox" ) { for ( var i=0; i < form.elements.length; i++ ) {
if ( form.elements[i].checked ) { if (
if ( checked++ > 1 ) form.elements[i].type=="checkbox"
break; &&
} form.elements[i].name=="markMids[]"
&&
form.elements[i].checked
) {
if ( checked++ > 1 )
break;
} }
} }
$(element).closest("tr").toggleClass("danger"); $(element).closest("tr").toggleClass("danger");
form.editBtn.disabled = checked ? false : true; if ( checked ) {
form.addBtn.value = (checked==1) ? jsTranslatedCloneText:jsTranslatedAddText; form.editBtn.disabled = false;
form.deleteBtn.disabled = false;
form.deleteBtn.disabled = (checked==0); if ( checked == 1 ) {
$j(form.cloneBtn).css('display','inline');
} else {
form.cloneBtn.hide();
}
} else {
form.cloneBtn.hide();
form.editBtn.disabled = true;
form.deleteBtn.disabled = true;
}
} }
function addMonitor(element) { function addMonitor(element) {

2
web/skins/classic/views/js/console.js.php
View File

@ -18,5 +18,3 @@ if ( ZM_CHECK_FOR_UPDATES && canEdit('System') && ZM_DYN_LAST_VERSION && ( verNu
?> ?>
var showVersionPopup = <?php echo isset($showVersionPopup )?'true':'false' ?>; var showVersionPopup = <?php echo isset($showVersionPopup )?'true':'false' ?>;
var showDonatePopup = <?php echo isset($showDonatePopup )?'true':'false' ?>; var showDonatePopup = <?php echo isset($showDonatePopup )?'true':'false' ?>;
var translatedAddText = "<?php echo translate('AddNewMonitor') ?>";
var translatedCloneText = "<?php echo translate('CloneMonitor') ?>";