ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,146 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

948 Commits

Author SHA1 Message Date
Isaac Connor 1d673a0b8c move header into a function in functions.php. Move event population into console.php 2016-05-06 14:30:32 -04:00
Isaac Connor 7df2685223 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 12:51:40 -04:00
Isaac Connor e87a35b04d Merge branch 'always_show_ptz' into storageareas 2016-05-06 12:51:15 -04:00
Isaac Connor c9f1614e32 If the camera has no centering control, don't make it look like it does. This also removes a logged error 2016-05-06 12:51:03 -04:00
Isaac Connor d5f1519829 Can't externally reference .js.php, they have to be inline js 2016-05-06 12:40:23 -04:00
Isaac Connor b333b8ebee Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 12:06:47 -04:00
Isaac Connor ee015ee674 whitespace/codestyle. Also remove duplicate form iput runState which I think is left over from it being a popup 2016-05-06 12:06:13 -04:00
Isaac Connor 44e5b566b8 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 11:56:24 -04:00
Isaac Connor 8405db4750 Move running=daemonCheck from header to index.php so that it is defined early and can be used everywhere 2016-05-06 11:56:03 -04:00
Isaac Connor b3b9eaa7d5 better code for deprecate sequpdownarrays 2016-05-06 11:44:13 -04:00
Isaac Connor be4f155160 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 11:42:46 -04:00
Isaac Connor 4784f8b630 deprecate the seqUp and seqDown arrays 2016-05-06 11:36:11 -04:00
Isaac Connor 4b838dc66c deprecate minSequence and maxSequence 2016-05-06 11:29:49 -04:00
Isaac Connor b0e977f8ed Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 11:26:53 -04:00
Isaac Connor 55567b66e9 deprecate minSequence and maxSequence use 2016-05-06 11:04:35 -04:00
Isaac Connor b0a057724a document minSequence use 2016-05-06 11:04:22 -04:00
Isaac Connor 49dc917b2e Merge isaac:ZoneMinder.p1 into storageareas 2016-05-05 15:24:14 -04:00
Isaac Connor 27b928839c deprecate view=image-ffmpeg 2016-05-05 15:04:11 -04:00
Isaac Connor d342b11e64 remove servers references from header, they go in console 2016-05-04 09:07:29 -04:00
Isaac Connor 36f94dddec cleanup merge problems 2016-05-03 14:46:22 -04:00
Isaac Connor d25e75f485 Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console 2016-05-03 14:39:59 -04:00
Isaac Connor c3628a8dfd Merge branch 'updated-console' into storageareas 2016-05-03 14:34:58 -04:00
Isaac Connor 4defe92911 Merge branch 'master' into updated-console 2016-05-03 14:22:37 -04:00
Kyle Johnson 36da4aed88 Push monitor view back to before I messed with it 2016-05-03 13:55:38 -04:00
Kyle Johnson b92c9f9be4 Add state modal to options view 2016-05-03 13:55:38 -04:00
Kyle Johnson 3271d17a3a Remove header from log view 2016-05-03 13:55:38 -04:00
Kyle Johnson bfda50b693 Also don't load additional JS to Log view 
Another issue with mootools & jquery conflicts
 2016-05-03 13:55:38 -04:00
Kyle Johnson dcd6449a9b Don't include extra js libraries for monitor view. 
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
 2016-05-03 13:55:38 -04:00
Kyle Johnson 464db86c53 Revert "Add sidebar and top nav to Monitors popup view" 
This reverts commit 315fb3e857.
 2016-05-03 13:55:38 -04:00
Kyle Johnson 237f1c3a9c Change sidebar to lighter colors 2016-05-03 13:53:30 -04:00
Kyle Johnson 6a48b9041a Revert "Include Chart.js" 
This reverts commit 33d6d311b0.

Didn't mean to add this code in yet.  For a future feature.
 2016-05-03 13:53:30 -04:00
Kyle Johnson 44fbbee152 Major rewrite of states view. Now a modal on every page. 
Read: No longer an HTML popup window.

 * State html is now included toward the bottom of every page
 * The states.js has been rewritten in jquery
 * Applying, deleting or saving a state reloads the page after the POST is done
 2016-05-03 13:53:30 -04:00
Kyle Johnson 800378b095 Add state view's js and php to all pages as it is now part of header 2016-05-03 13:53:30 -04:00
Kyle Johnson 2e2cc3d9ab Change 'marked' row style to bootstrap 'danger' and find it with jquery 2016-05-03 13:53:30 -04:00
Kyle Johnson 62fc4dff7e Change class of delete button to be red 2016-05-03 13:53:30 -04:00
Kyle Johnson 0f5089bbf8 Fix button alignment on console page, and add button styling 2016-05-03 13:53:30 -04:00
Kyle Johnson f305a6ffc8 Replace console table css with styles from bootstrap 2016-05-03 13:53:30 -04:00
Kyle Johnson 8b5693129b Include Chart.js 2016-05-03 13:53:30 -04:00
Kyle Johnson 0bb08a6256 clean up options a bit more 2016-05-03 13:51:54 -04:00
Kyle Johnson 291179d3b1 Add side tab list to options page, and style it. 2016-05-03 13:51:54 -04:00
Kyle Johnson cf6f36b0e5 Add header to log view 2016-05-03 13:51:54 -04:00
Isaac Connor 3e51429fb0 Move skin and css changing up above the include of header.php so that the set cookie call will work 2016-05-03 13:51:54 -04:00
Isaac Connor e435b3ebed remove duplication 2016-05-03 13:51:54 -04:00
Kyle Johnson d698f2af14 Restyle the header. Full width, dark background, collapseable. 2016-05-03 13:51:54 -04:00
Kyle Johnson 6c1f53cbdc Load jquery and bootstrap js in classic skin 2016-05-03 13:51:54 -04:00
Kyle Johnson 27c9d06aee Add local copy of bootstrap.js 3.3.6 2016-05-03 13:51:54 -04:00
Kyle Johnson eb443e371f Update doctype to html5, and add additional meta tags 2016-05-03 13:51:54 -04:00
Kyle Johnson ff15fdb6d9 Make the ZM logo in header stand out 2016-05-03 13:51:54 -04:00
Kyle Johnson 7a6dae69f0 Convert options layout to side-tabs, and improve readability 2016-05-03 13:51:54 -04:00
Kyle Johnson d95cf8dae5 Push the options page down a bit to make tab look better 2016-05-03 13:51:54 -04:00
Kyle Johnson d12fc95ad1 Restyle options view with horizontal form layout 2016-05-03 13:51:54 -04:00
Kyle Johnson 2214cb6389 Add styling to delete / save / add buttons in options.php 2016-05-03 13:51:54 -04:00
Kyle Johnson b317797a6c Remove cancel button from options as it no longer makes sense. 2016-05-03 13:51:54 -04:00
Kyle Johnson 2a9b10e80e Update options.php to use bootstrap container 2016-05-03 13:51:54 -04:00
Kyle Johnson be8385535d Oops. Move Console view outside of canView(system) restriction 2016-05-03 13:51:54 -04:00
Kyle Johnson 858845e3a1 Add a link back to console in header 2016-05-03 13:51:54 -04:00
Kyle Johnson a8c7ec250d Make the Options link a standard href (not a popup). 2016-05-03 13:51:54 -04:00
Kyle Johnson 25c9328187 Move console php code to header as that code is now needed in additional views. 2016-05-03 13:51:54 -04:00
Kyle Johnson cd8e8d9685 Move the header into its own file, and include it in options view. 2016-05-03 13:51:34 -04:00
Kyle Johnson a4e07e9a73 Update options styling 2016-05-03 13:51:34 -04:00
Kyle Johnson 2fff9a6a8b Fix state link to do popup like before 2016-05-03 13:51:34 -04:00
Kyle Johnson 3e59aca739 Additional footer padding 2016-05-03 13:51:34 -04:00
Kyle Johnson d6b0b637ea Add styles to additional console buttons 2016-05-03 13:51:34 -04:00
Kyle Johnson daef9eb40b Remove extra #footer styling 2016-05-03 13:51:34 -04:00
Kyle Johnson ea0c61d482 Bump up the default font size 2016-05-03 13:51:34 -04:00
Kyle Johnson c3cc5d46bd Wrap footer in container-fluid 2016-05-03 13:51:34 -04:00
Kyle Johnson d7f471f41f Restyle of Login page. 2016-05-03 13:51:34 -04:00
Kyle Johnson 03c188db89 Move recaptcha javascript to actual <head> tag 
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
 2016-05-03 13:51:34 -04:00
Kyle Johnson aa3c99fc68 Initial major restyle of classic skin. 2016-05-03 13:51:34 -04:00
Kyle Johnson c4c9b6c494 Local copy of bootstrap 3.3.6, included in classic skin. 2016-05-03 13:51:06 -04:00
Isaac Connor 516bacdfd3 Merge branch 'updated-console' into storageareas 2016-05-03 13:38:57 -04:00
Kyle Johnson a1b4869ee6 Add state modal to options view 2016-05-03 13:33:22 -04:00
Kyle Johnson 0a77da8a2f Remove header from log view 2016-05-03 13:33:08 -04:00
Kyle Johnson c2fd3dd84a Also don't load additional JS to Log view 
Another issue with mootools & jquery conflicts
 2016-05-03 13:25:39 -04:00
Kyle Johnson 6768fe5554 Don't include extra js libraries for monitor view. 
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
 2016-05-03 13:06:28 -04:00
Isaac Connor e53bd1292e increase events list width to accomodate thumbnails 2016-05-02 14:30:54 -04:00
Isaac Connor 550fdc9295 change thumbnail path to specify eid and fid instead of path to the jpg. 2016-05-02 13:42:15 -04:00
Isaac Connor b38aa60209 fix height of function popup 2016-05-02 11:56:42 -04:00
Isaac Connor 9d6a7541c8 add Id column to storage areas 2016-05-02 10:40:42 -04:00
Steve Gilvarry da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
Isaac Connor 0044161b9c Merge branch 'fix_zone_edit' into storageareas 2016-04-29 10:46:37 -04:00
Isaac Connor be5f0cd4a9 replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php 2016-04-29 10:44:46 -04:00
Isaac Connor c4410c512a Merge branch 'master' into fix_event_menubars 2016-04-28 09:35:58 -04:00
Isaac Connor 59406fd03a Merge branch 'master' into storageareas 2016-04-28 09:24:36 -04:00
Steve Gilvarry ac5fdb8956 Merge pull request #1421 from connortechnology/fix_events_pagination 
remove the if(pages>1) so that the if  >  line always happens
 2016-04-28 21:43:54 +10:00
Isaac Connor 010f748016 fix clone merge 2016-04-26 15:02:34 -04:00
Isaac Connor 0adbaafd98 Merge branch 'master' into storageareas 2016-04-26 13:10:37 -04:00
Andrew Bauer fe9cb4b7ec Merge pull request #1442 from ZoneMinder/fix_rotate 
Fix rotate
 2016-04-26 09:54:01 -05:00
Isaac Connor 851e8f46ff redo fix_rotate 2016-04-25 15:57:39 -04:00
Isaac Connor b50172fc2e introduce a Frame object. Alter the image view to take just an fid, in which case it is the unique primary key Id of the Frame. 2016-04-25 14:59:55 -04:00
Isaac Connor 85798932ee Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated 2016-04-25 14:10:26 -04:00
Kyle Johnson f3a2f9e223 Revert "Add sidebar and top nav to Monitors popup view" 
This reverts commit 315fb3e857.
 2016-04-24 14:15:42 -04:00
Kyle Johnson 802a8928d0 Revert "Add missing <form> back to monitor view" 
This reverts commit cc08607939.
 2016-04-24 14:15:33 -04:00
Kyle Johnson cc08607939 Add missing <form> back to monitor view 2016-04-24 14:03:04 -04:00
Kyle Johnson b4d8bc6a52 Change sidebar to lighter colors 2016-04-24 13:51:48 -04:00
Kyle Johnson f2d43de137 Revert "Include Chart.js" 
This reverts commit 33d6d311b0.

Didn't mean to add this code in yet.  For a future feature.
 2016-04-24 00:52:19 -04:00
Kyle Johnson 08fb74c992 Major rewrite of states view. Now a modal on every page. 
Read: No longer an HTML popup window.

 * State html is now included toward the bottom of every page
 * The states.js has been rewritten in jquery
 * Applying, deleting or saving a state reloads the page after the POST is done
 2016-04-24 00:48:16 -04:00
Kyle Johnson ca0ba4a5f8 Add state view's js and php to all pages as it is now part of header 2016-04-23 22:59:50 -04:00
Isaac Connor 2ff01b6bcb remove unneeded global 2016-04-22 13:36:12 -04:00
Isaac Connor 30b746c603 Add missing ()'s 2016-04-22 13:35:40 -04:00
Andrew Bauer 81757a0465 Merge pull request #1418 from pliablepixels/1417-clone-monitor 
Clone feature added
 2016-04-20 13:02:10 -05:00
Isaac Connor ba3f9d1b9a Merge branch 'master' into storageareas 2016-04-19 12:03:21 -04:00
Isaac Connor b2d02a64f4 reload stream after error 2016-04-19 12:02:58 -04:00
Kyle Johnson 10589ee913 Change 'marked' row style to bootstrap 'danger' and find it with jquery 2016-04-18 15:38:10 -04:00
Kyle Johnson 2c5e04a9af Change class of delete button to be red 2016-04-18 15:38:01 -04:00
Kyle Johnson 7504d69dea Fix button alignment on console page, and add button styling 2016-04-18 15:25:48 -04:00
Kyle Johnson c9b81e07c2 Replace console table css with styles from bootstrap 2016-04-18 15:20:32 -04:00
Isaac Connor bc99e4c476 whitespace changes 2016-04-17 09:29:14 -04:00
root 479ea17ed5 fix event menubars 2016-04-16 15:13:18 -04:00
Isaac Connor 50f2747bb4 remove the if(pages>1) so that the if > line always happens 2016-04-15 16:11:53 -04:00
Isaac Connor 2b05815bfa remove set height on the menu bars, fixing flow issues 2016-04-15 15:44:35 -04:00
Isaac Connor b57abb4e54 revert 2016-04-15 12:50:51 -04:00
arjunrc 804ac1de81 Clone feature added 2016-04-14 13:53:10 -04:00
Isaac Connor 6ca40966a1 remove teh dropdown-ness of the montage options 2016-04-12 08:52:26 -04:00
Isaac Connor 61bd60184a Merge branch 'random_fixes' into storageareas 2016-04-11 11:28:24 -04:00
Isaac Connor 851a81eff7 Merge pull request #1406 from ZoneMinder/svg_zones 
replace the static zone image with a stream, and use SVG to draw the zones
 2016-04-11 11:14:11 -04:00
Isaac Connor d493ca69a9 Merge branch 'master' into icon_video 2016-04-11 09:31:51 -04:00
Andy Bauer 39a30ff51b refresh parent when cancel is clicked 2016-04-10 15:59:13 -05:00
Andy Bauer e5bf2d245c quit the stream in zones.php when zone.php is called 2016-04-10 15:33:55 -05:00
Andy Bauer fbb2a527e6 remove setButtonState. it is not needed. 2016-04-10 07:55:45 -05:00
Andy Bauer 988d611d03 remove unused code 2016-04-09 21:37:00 -05:00
Andy Bauer e7d35d16bc add monitor alarm state and fps to zone edit view 2016-04-09 21:34:30 -05:00
Isaac Connor 78c6e14e0c Merge branch 'master' into storageareas 2016-04-09 14:52:28 -04:00
Isaac Connor 0c8e0ac220 change quotes to prevent php7 complaint 2016-04-09 11:24:59 -04:00
Isaac Connor 6d27a857aa put a zones class on the svg 2016-04-08 14:38:50 -04:00
Isaac Connor c73e768f1f put in the onclick for the zone to open the edit page 2016-04-08 14:25:19 -04:00
Isaac Connor b10c6ee093 fix Monitor capitalisation 2016-04-08 14:23:44 -04:00
Isaac Connor 758a0341ce convert monitor to object 2016-04-08 14:09:59 -04:00
Isaac Connor 498bceae0a remove styles for svg circles 2016-04-08 13:44:20 -04:00
Isaac Connor 22f207602b add css for the svg zones 2016-04-08 13:43:00 -04:00
Isaac Connor f749ff47ea convert to monitor object 2016-04-08 13:40:32 -04:00
Isaac Connor 0ce85137dc remove points. Don't need them here 2016-04-08 13:39:31 -04:00
Isaac Connor 56a91ed4b2 rename monitor object from Monitor to monitor. Remove points in zone list. 2016-04-08 13:37:29 -04:00
Isaac Connor 8735f1ac73 convert to monitor object 2016-04-08 13:37:01 -04:00
Isaac Connor 11981efad2 add this back 2016-04-08 13:20:26 -04:00
Isaac Connor 6bb95beb9a Merge branch 'svg_zones' into storageareas 2016-04-08 13:20:01 -04:00
Isaac Connor 34bfbb4708 blah 2016-04-08 13:18:13 -04:00
Isaac Connor f20945bf84 update zone points in SVG 2016-04-08 13:13:10 -04:00
Isaac Connor 7da6e1e5a1 use stream for image, add SVG polygon 2016-04-08 12:36:09 -04:00
Isaac Connor 256df08af4 update SVG polygon points on point update 2016-04-08 12:32:26 -04:00
Isaac Connor 45d58c3ad6 convert points to circles, because squares are not centered on the point.. but a circle is 2016-04-08 11:17:16 -04:00
Isaac Connor 79552e5393 use new getStreamHTML 2016-04-08 11:11:09 -04:00
Isaac Connor 3be3a3ada2 convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones 2016-04-08 10:46:51 -04:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
 2016-04-05 22:06:14 +10:00
Andrew Bauer a0e6c004a2 Merge pull request #1388 from ZoneMinder/reload_stream_on_error 
try to reload the image stream on error.
 2016-04-04 20:57:48 -05:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00