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

1103 Commits

Author SHA1 Message Date
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
Isaac Connor 6c8e8368e1 rtsp should be lower case 2016-04-04 16:56:54 -04:00
Isaac Connor 564f189416 Merge branch 'always_show_ptz' into storageareas 2016-04-04 16:45:54 -04:00
Isaac Connor 6c92c0e3f7 Merge branch 'reload_stream_on_scale' into storageareas 2016-04-04 16:13:35 -04:00
Isaac Connor 98fce7c3c6 Merge branch 'reload_stream_on_error' into storageareas 2016-04-04 16:13:26 -04:00
Isaac Connor 123a1a898a try to reload the image stream on error. 2016-04-04 15:04:09 -04:00
Isaac Connor 0b13f9d76f reload stream on scale change 2016-04-04 14:58:07 -04:00
Isaac Connor 5f3e7134fb split power out of the Panel box so that I can style it better 2016-04-04 13:22:26 -04:00
Isaac Connor f91ff4503a rework the ptz controls to take up less vertical space, also don't set width of buttons 2016-04-04 13:20:04 -04:00
Isaac Connor b3f0f5d0e8 Merge branch 'updated-console' into storageareas 2016-04-04 11:51:07 -04:00
Isaac Connor 197ae67313 Merge branch 'always_show_ptz' into storageareas 2016-04-04 11:47:29 -04:00
Isaac Connor 3e20e5f21c fix ptz control box size 2016-04-04 11:40:01 -04:00
Isaac Connor 9dfe71ceb8 Always show events and always show ptz controls. Also clean out some commented out cruft 2016-04-04 11:39:12 -04:00
Isaac Connor 2233747fcb add a missing t 2016-04-04 11:38:16 -04:00
Isaac Connor 43e4052dd9 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-04 11:36:03 -04:00
Isaac Connor dd153d8efb add header.php to autotools build 2016-04-04 11:35:51 -04:00
Kyle Johnson 33d6d311b0 Include Chart.js 2016-04-02 00:48:58 -04:00
Kyle Johnson 315fb3e857 Add sidebar and top nav to Monitors popup view 2016-04-01 15:52:52 -04:00
Isaac Connor 96aa20fb79 value should be lower case when checking for rtsp 2016-04-01 15:43:59 -04:00
Kyle Johnson f59ed9cf0d clean up options a bit more 2016-04-01 14:39:15 -04:00
Isaac Connor 5f6d140de5 Load all event fields, so we know we have them deeper in the code. 2016-04-01 14:07:27 -04:00
Kyle Johnson 92e0552f8e Add side tab list to options page, and style it. 2016-04-01 14:02:19 -04:00
Kyle Johnson 8c5d309feb Add header to log view 2016-04-01 13:44:37 -04:00
Kyle Johnson fa3425f2b0 Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console 2016-04-01 13:43:26 -04:00
Isaac Connor 82b32578ec Merge branch 'master' into iconnor_video 2016-04-01 12:54:09 -04:00
Isaac Connor 6816a4c75b Merge branch 'iconnor_video' into storageareas 2016-04-01 11:35:38 -04:00
Isaac Connor a2e228a5ca put quotes aroudn the string 2016-04-01 11:01:16 -04:00
Isaac Connor 3140905d02 whitespace and structure changes to match google coding style. Use new htmlSelect function to build the select dropdowns. Use a monitor object instead of a newMonitor array 2016-04-01 10:35:34 -04:00
Isaac Connor abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Isaac Connor e7ee464a17 Add a RecordAudio setting to the Storage Tab 2016-03-31 15:50:44 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04:00
Isaac Connor ea49dc20d1 Merge branch 'master' into storageareas 2016-03-30 10:58:07 -04:00
Isaac Connor e9c65785e8 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-03-30 10:56:53 -04:00
Isaac Connor 247cb3d0b2 Merge pull request #1360 from schrorg/monitornames-spaces 
Allow spaces in monitor names
 2016-03-30 09:17:57 -04:00
Isaac Connor 0ab6e27259 Use Monitor object 2016-03-29 14:35:12 -04:00
Isaac Connor f0a307e082 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 
Conflicts:
	distros/ubuntu1504_cmake/control
 2016-03-29 11:53:17 -04:00
Isaac Connor 1ea1852476 Do some Storage Areas support 2016-03-29 11:52:25 -04:00
Robin Daermann c8c0586c66 Trim monitor names 2016-03-29 11:40:14 +02:00
Andy Bauer 6eda3eff72 do not set maxfps fields during onvif probe 2016-03-26 08:38:28 -05:00
Robin Daermann 71db9b84e6 Allow spaces in monitor names 2016-03-24 14:37:24 +01:00
Isaac Connor 757740ede5 Move skin and css changing up above the include of header.php so that the set cookie call will work 2016-03-23 16:12:51 -04:00
Isaac Connor dd06db0bf0 remove duplication 2016-03-23 15:54:20 -04:00
Isaac Connor a66e97de09 Merge & fix new console & options 2016-03-23 09:48:57 -04:00
Isaac Connor 3a8352eb6b Merge branch 'master' into storageareas 2016-03-21 10:25:03 -04:00
Kyle Johnson dd937f7732 Restyle the header. Full width, dark background, collapseable. 2016-03-16 00:51:13 -04:00
Kyle Johnson 8fdf3291b4 Load jquery and bootstrap js in classic skin 2016-03-16 00:49:51 -04:00
Kyle Johnson 53d0e1c8df Add local copy of bootstrap.js 3.3.6 2016-03-16 00:45:34 -04:00
Kyle Johnson d01ef25f82 Update doctype to html5, and add additional meta tags 2016-03-16 00:17:05 -04:00
Kyle Johnson 6f409f0bf4 Make the ZM logo in header stand out 2016-03-15 23:53:29 -04:00
Kyle Johnson 897a0a995c Convert options layout to side-tabs, and improve readability 2016-03-15 15:21:28 -04:00
Kyle Johnson 87932002cf Push the options page down a bit to make tab look better 2016-03-15 14:45:40 -04:00
Kyle Johnson 183f58ad17 Restyle options view with horizontal form layout 2016-03-15 14:43:22 -04:00
Kyle Johnson 694ad0b539 Add styling to delete / save / add buttons in options.php 2016-03-15 14:08:01 -04:00
Kyle Johnson bd30d40522 Remove cancel button from options as it no longer makes sense. 2016-03-15 14:03:17 -04:00
Kyle Johnson 0004a1180e Update options.php to use bootstrap container 2016-03-15 13:56:54 -04:00
Kyle Johnson 26748c2de5 Oops. Move Console view outside of canView(system) restriction 2016-03-15 13:52:36 -04:00
Kyle Johnson f05c1548ce Add a link back to console in header 2016-03-15 13:49:14 -04:00
Kyle Johnson 299c61c1ec Make the Options link a standard href (not a popup). 2016-03-15 13:47:31 -04:00
Kyle Johnson 8070bf8700 Move console php code to header as that code is now needed in additional views. 2016-03-15 13:46:03 -04:00
Kyle Johnson 49f46ac927 Move the header into its own file, and include it in options view. 2016-03-15 13:43:49 -04:00
Kyle Johnson 8acfe1b0d8 Update options styling 2016-03-12 22:44:11 -05:00
Kyle Johnson 2378c9a359 Fix state link to do popup like before 2016-03-12 20:44:42 -05:00
Kyle Johnson d202760d82 Additional footer padding 2016-03-12 20:37:07 -05:00
Kyle Johnson f5ba52824a Add styles to additional console buttons 2016-03-12 20:36:39 -05:00
Kyle Johnson a2c2101c48 Remove extra #footer styling 2016-03-12 20:28:16 -05:00
Kyle Johnson f80cbf52df Bump up the default font size 2016-03-12 20:27:51 -05:00
Kyle Johnson bebb1017fd Wrap footer in container-fluid 2016-03-12 20:27:22 -05:00
Kyle Johnson 5e2d4bc325 Restyle of Login page. 2016-03-12 20:11:32 -05:00
Kyle Johnson a403c1db8c 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-03-12 19:14:07 -05:00
Kyle Johnson 71c35e712b Initial major restyle of classic skin. 2016-03-12 03:28:02 -05:00
Kyle Johnson c9441ec8c0 Local copy of bootstrap 3.3.6, included in classic skin. 2016-03-12 01:16:19 -05:00
Andrew Bauer 77f7a3642c remove check for "selected" property 2016-03-09 10:34:06 -06:00
Andrew Bauer 3280aff876 disable save button when nothing slected. fixes #1322 2016-03-09 09:43:44 -06:00
Isaac Connor b06b82f634 widen filter popup, because storage area name or server name might be longer 2016-03-04 15:35:55 -05:00
Isaac Connor 86dbe4fa15 define default for StorageId to prevent error message 2016-03-03 09:22:53 -05:00
Isaac Connor bcb403bf08 Merge branch 'fix_setButtonStates' into storageareas 2016-03-03 09:08:37 -05:00
Isaac Connor c0ed40fd06 fix structure of if/for 2016-03-03 09:06:57 -05:00
Isaac Connor cedc46adf3 Merge branch 'fix_setButtonStates' into storageareas 2016-03-02 09:12:19 -05:00
Isaac Connor bb0dcf3d43 fix setButtonStates. The checkboxes are an array. 2016-03-01 12:19:46 -05:00
SteveGilvarry 3ce620eb89 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-27 19:46:56 +11:00
SteveGilvarry d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
SteveGilvarry 4837585601 Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp. 
Conflicts:
	src/zmstreamer.cpp
 2016-02-26 22:37:23 +11:00
SteveGilvarry 7c7d7b245c Remove the XML skin folder 2016-02-26 22:30:20 +11:00
SteveGilvarry e6d57da0d4 Remove the mobile skin folder 2016-02-26 22:29:41 +11:00
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am 
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
 2016-02-26 22:19:02 +11:00
Isaac Connor 131d0daefe fix syntax 2016-02-19 11:47:18 -05:00
Isaac Connor afb0cf2a7e Merge branch 'master' into storageareas 2016-02-19 11:09:18 -05:00
Isaac Connor 5a2a4baa89 Must load StorageId as well when loading event 2016-02-19 09:47:19 -05:00
Isaac Connor 68babd783b Merge branch 'master' into storageareas 2016-02-17 09:46:56 -05:00
Dmitry Smirnov 632e9c8e53 Upgrade bundled jQuery (Closes: #1263) 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-18 00:28:30 +11:00
Isaac Connor 172a4c6bd4 Add montagereview.php to autotools build. 2016-02-16 09:29:49 -05:00
Isaac Connor 292e3a141f Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-12 13:53:34 -05:00
Isaac Connor 5da8df45a7 Merge branch 'hide_rtspdescribe' into storageareas 2016-02-12 13:53:09 -05:00
Isaac Connor 5f217b48e0 When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP 2016-02-12 13:52:59 -05:00
Isaac Connor b7256a6891 Merge branch 'master' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	version
 2016-02-10 09:17:40 -05:00
Andrew Bauer 0b2a309014 Merge pull request #961 from Linwood-F/960-montage-review-new-feature 
960 montage review new feature
 2016-02-08 20:40:04 -06:00
Isaac Connor e106a86f5e Add Concurrent 2016-02-05 11:59:05 -05:00
Isaac Connor 0674fa2d7a Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-04 12:21:33 -05:00
Isaac Connor 89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05:00
Isaac Connor d3755611c5 Merge pull request #1247 from bodegard/master 
Corrected DB update version comments, fixed typos, and skin font modification
 2016-02-04 11:54:02 -05:00
Isaac Connor 555904c588 Add Storage column to console 2016-02-03 09:42:50 -05:00
Isaac Connor 48283191ec Merge branch 'master' into storageareas 2016-02-01 15:47:08 -05:00
Isaac Connor cc2c1405ed include Event.php 2016-02-01 14:59:06 -05:00
Isaac Connor 4e9e01836f Use Event->Path instead of ZM_DIR_EVENTS 2016-02-01 13:41:57 -05:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
Andrew Bauer 2f80f26f92 Merge pull request #1232 from ZoneMinder/remove_google_fonts 
remove Google open Sans external import
 2016-01-23 10:24:49 -06:00
Brandon Odegard 54a11175ff Reduce default size of body font in Flat skin 2016-01-22 13:56:41 -06:00
Brandon Odegard 1ca9ace84d Fixed missing semicolons 2016-01-22 13:31:02 -06:00
Isaac Connor f16fb5c5f6 use eid and fid instead of specifying the path to the image 2016-01-14 13:34:12 -05:00
Isaac Connor 02f8fb80da Put the monitor Id in the title so that it appears on mouseover. 2016-01-14 11:05:05 -05:00
Isaac Connor 7ce049dad1 add a title to each monitor with the name so that the mouseover will show it 2016-01-14 10:50:42 -05:00
Isaac Connor ddf7b1ad43 Merge branch 'master' into storageareas 
Conflicts:
	web/skins/classic/js/dark.js
	web/skins/classic/js/flat.js
 2016-01-14 09:41:24 -05:00
Isaac Connor 3ebeaec8ab Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-01-10 20:59:01 -05:00
Isaac Connor 2d86e7713d increase height of logout popup to fit content 2016-01-08 12:14:01 -05:00
Isaac Connor 818cd614eb Merge branch 'multi-server' into storageareas 2016-01-08 10:17:37 -05:00
Isaac Connor 99dfaa97fa User Name instead of ServerName and Hostname instead of ServerHostname 2016-01-08 10:15:21 -05:00
Isaac Connor d13829c6f3 Add Hostname to list of servers, since we have the space for it. 2016-01-08 10:15:06 -05:00
Isaac Connor 53bd342f85 remove Google open Sans external import 2016-01-08 09:46:14 -05:00
Isaac Connor 270c737f40 Merge branch 'master' into storageareas 2016-01-05 09:36:36 -05:00
Isaac Connor 44f3b99d24 change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet 2016-01-04 14:59:04 -05:00
Isaac Connor 75f6da3526 Merge branch 'multi-server' into storageareas 2016-01-04 14:53:52 -05:00
Isaac Connor 273ab6c5c6 Only show Server column when more than 1 Servers are defined 2016-01-04 14:51:24 -05:00
Isaac Connor 5c0e4aa172 Merge branch 'multi-server' into storageareas 2016-01-01 17:11:01 -05:00
Isaac Connor cf7e168872 Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist 2016-01-01 17:10:37 -05:00