fix clone merge

pull/1480/head
Isaac Connor 2016-04-26 15:02:34 -04:00
parent 0adbaafd98
commit 010f748016
1 changed files with 3 additions and 1 deletions

View File

@ -54,7 +54,9 @@ if ( canEdit('Monitors') )
if ( $show_storage_areas ) { $columns += 1; }
echo $columns;
?>">
<input type="button" class="btn btn-default" value="<?php echo translate('AddNewMonitor'); ?>" onclick="createPopup( '?view=monitor', 'zmMonitor0', 'monitor' ); return( false );"></input>
<input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
<!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
</td>
<?php
for ( $i = 0; $i < count($eventCounts); $i++ )