Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console

.gitignore

@@ -67,3 +67,92 @@ src/zmu
 web/includes/config.php
 zm.conf
 zmconfgen.pl
+scripts/ZoneMinder/cmake_install.cmake
+scripts/ZoneMinder/output/
+scripts/cmake_install.cmake
+scripts/zmtelemetry.pl
+scripts/zoneminder-zmaudit.pl.8
+scripts/zoneminder-zmaudit.pl.8.gz
+scripts/zoneminder-zmcamtool.pl.8
+scripts/zoneminder-zmcamtool.pl.8.gz
+scripts/zoneminder-zmcontrol.pl.8
+scripts/zoneminder-zmcontrol.pl.8.gz
+scripts/zoneminder-zmdc.pl.8
+scripts/zoneminder-zmdc.pl.8.gz
+scripts/zoneminder-zmfilter.pl.8
+scripts/zoneminder-zmfilter.pl.8.gz
+scripts/zoneminder-zmpkg.pl.8
+scripts/zoneminder-zmpkg.pl.8.gz
+scripts/zoneminder-zmsystemctl.pl.8
+scripts/zoneminder-zmsystemctl.pl.8.gz
+scripts/zoneminder-zmtelemetry.pl.8
+scripts/zoneminder-zmtelemetry.pl.8.gz
+scripts/zoneminder-zmtrack.pl.8
+scripts/zoneminder-zmtrack.pl.8.gz
+scripts/zoneminder-zmtrigger.pl.8
+scripts/zoneminder-zmtrigger.pl.8.gz
+scripts/zoneminder-zmupdate.pl.8
+scripts/zoneminder-zmupdate.pl.8.gz
+scripts/zoneminder-zmvideo.pl.8
+scripts/zoneminder-zmvideo.pl.8.gz
+scripts/zoneminder-zmwatch.pl.8
+scripts/zoneminder-zmwatch.pl.8.gz
+scripts/zoneminder-zmx10.pl.8
+scripts/zoneminder-zmx10.pl.8.gz
+src/CMakeFiles/
+src/cmake_install.cmake
+src/libzm.a
+src/nph-zms
+src/zoneminder-zma.8
+src/zoneminder-zma.8.gz
+src/zoneminder-zmc.8
+src/zoneminder-zmc.8.gz
+src/zoneminder-zmf.8
+src/zoneminder-zmf.8.gz
+src/zoneminder-zmstreamer.8
+src/zoneminder-zmstreamer.8.gz
+src/zoneminder-zmu.8
+src/zoneminder-zmu.8.gz
+web/CMakeFiles/
+web/api/CMakeFiles/
+web/api/app/Config/bootstrap.php
+web/api/app/Config/core.php
+web/api/cmake_install.cmake
+web/cgi-bin/
+web/cmake_install.cmake
+web/events/
+web/images/
+web/tools/mootools/CMakeFiles/
+web/tools/mootools/cmake_install.cmake
+web/tools/mootools/mootools-core.js
+web/tools/mootools/mootools-more.js
+web/undef.log
+zmlinkcontent.sh
+CMakeCache.txt
+CMakeFiles/
+cmake/cmake_uninstall.cmake
+cmake_install.cmake
+db/CMakeFiles/
+db/cmake_install.cmake
+install_manifest.txt
+misc/CMakeFiles/
+misc/cmake_install.cmake
+misc/zoneminder-tmpfiles.conf
+misc/zoneminder.service
+onvif/CMakeFiles/
+onvif/cmake_install.cmake
+onvif/modules/CMakeFiles/
+onvif/modules/MakefilePerl
+onvif/modules/cmake_install.cmake
+onvif/modules/output/
+onvif/modules/pm_to_blib
+onvif/proxy/CMakeFiles/
+onvif/proxy/MakefilePerl
+onvif/proxy/cmake_install.cmake
+onvif/proxy/output/
+onvif/proxy/pm_to_blib
+onvif/scripts/CMakeFiles/
+onvif/scripts/cmake_install.cmake
+scripts/CMakeFiles/
+scripts/ZoneMinder/CMakeFiles/
+scripts/ZoneMinder/MakefilePerl

web/skins/classic/views/console.php

@@ -119,10 +119,14 @@ if ( canEdit('Monitors') )
         <tfoot>
           <tr>
             <td class="colLeftButtons" colspan="<?php echo count($servers) ? 4 : 3 ?>">
+<<<<<<< HEAD
               <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
               <input type="button" class="btn btn-primary" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
               <!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
               <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
+=======
+              <input type="button" class="btn btn-primary" value="<?php echo translate('AddNewMonitor'); ?>" onclick="createPopup( '?view=monitor', 'zmMonitor0', 'monitor' ); return( false );"></input>
+>>>>>>> 59d0de4313f489f52cee2f2538b5f78bd1de505d
             </td>
 <?php
 for ( $i = 0; $i < count($eventCounts); $i++ )