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

448 Commits

Author SHA1 Message Date
Kyle Johnson c9b81e07c2 Replace console table css with styles from bootstrap 2016-04-18 15:20:32 -04:00
Kyle Johnson 315fb3e857 Add sidebar and top nav to Monitors popup view 2016-04-01 15:52:52 -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 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
Kyle Johnson dd937f7732 Restyle the header. Full width, dark background, collapseable. 2016-03-16 00:51:13 -04:00
Kyle Johnson 897a0a995c Convert options layout to side-tabs, and improve readability 2016-03-15 15:21:28 -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 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
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 172a4c6bd4 Add montagereview.php to autotools build. 2016-02-16 09:29:49 -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 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 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 273ab6c5c6 Only show Server column when more than 1 Servers are defined 2016-01-04 14:51:24 -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
Isaac Connor 468f997e4c Soft error, with logging when the filter element doesn't exist 2016-01-01 16:36:29 -05:00
Isaac Connor 31ba0221ed Add Server to filters and log results 2015-12-31 10:13:03 -05:00
Isaac Connor 983b47f6dc Add Server columns 2015-12-31 09:09:57 -05:00
Isaac Connor 1aa79c306b Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2015-12-22 09:47:45 -05:00
Isaac Connor dfd7986c01 Merge branch 'master' into multi-server 
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
 2015-12-21 12:57:45 -05:00
Isaac Connor b626712a2f Add ServerId and ServerName to fields that we can filter on 2015-12-21 10:03:48 -05:00
Andy Bauer e5f243a9f8 Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps 2015-12-19 08:16:20 -06:00
Isaac Connor f54b8c27ee upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to 2015-12-02 12:10:32 -05:00
Isaac Connor 34f6590107 upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to 2015-12-02 12:10:26 -05:00
Isaac Connor aa91e69a9b add monitorUrl to be used to target the recording server for the monitor 2015-12-01 15:17:49 -05:00
Isaac Connor 342326e159 append monitorUrl to thsiURL to get access to the recording server for the monitor stream 2015-12-01 15:17:25 -05:00
Isaac Connor 382ad0f390 put () after property names of Monitor object 2015-12-01 14:30:24 -05:00
Isaac Connor fc85ccbf5f Set value for Hostname to avoid php warning. fix save button. Can't use it to pass action value because it gets translated. 2015-11-11 16:43:23 -05:00
Isaac Connor 2237391876 white spacing, and fix loading of Server objects in monitor 2015-10-15 09:28:35 -04:00
Isaac Connor 582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04:00