Commit Graph

1597 Commits

Author SHA1 Message Date
Kyle Johnson 40dcca2084 Add API function to get ZM version 2014-11-24 00:52:27 +00:00
Kyle Johnson 7ba971806f Removed a console.log() 2014-11-21 22:17:01 +00:00
Kyle Johnson 1f74d1cd60 Get the diskPercent from angular, via the API 2014-11-21 22:16:19 +00:00
Kyle Johnson 055a494fe4 Add getDiskPercent function to the api
Returns the amount of space used
2014-11-21 22:15:32 +00:00
Kyle Johnson ffaa24d108 daemonCheck finds zmdc.pl via Configure::read 2014-11-21 21:42:21 +00:00
Kyle Johnson 0108f43cab Add function for making vars in zm.conf global in api
This loops throgh zm.conf and sets each variable in it
as global in CakePHP via Configure::write.  The vars
can then later be read withing CakePHP via Configure::read
2014-11-21 21:40:31 +00:00
Kyle Johnson 4da50a8199 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into bootstrap-skin 2014-11-21 21:06:32 +00:00
Kyle Johnson 403ece33bd Tell cmake to configure zm version and config path in cakephp 2014-11-21 21:04:46 +00:00
Kyle Johnson e541976b77 Grab system load from API and set with angular 2014-11-21 20:06:59 +00:00
Kyle Johnson 345f152181 Add function for returning system load via api 2014-11-21 19:49:03 +00:00
Emmanuel Papin 4e9c3494b8 Convert french lang file to UTF-8 2014-11-20 20:51:49 +01:00
Kyle Johnson 9dd1a2261f Output a real snapshot of the camera in console view 2014-11-20 13:47:41 +00:00
Kyle Johnson 2ae1880006 Initial commit of general purpose API event search 2014-11-20 13:46:49 +00:00
Kyle Johnson 4364c73143 Remake Options view with angular. Uses API. 2014-11-20 04:11:33 +00:00
Kyle Johnson ad65fa1820 Make Config table options available to angular 2014-11-20 04:10:01 +00:00
Kyle Johnson 92bfac0aad Add angular directive allowing elements to bind to html 2014-11-20 04:05:22 +00:00
Kyle Johnson 408c6111b8 Return specific configs as an HTML <form> in API 2014-11-20 04:04:23 +00:00
Kyle Johnson 4298d4a498 Fix <form> location in state.php 2014-11-20 03:40:15 +00:00
Kyle Johnson c8a3cb9df9 Initial refactor of console view to use api & angular
* Move eventCounts to the API and bind with angular
 * Display the console as a grid, rather than a table
 * Show only information we want to see
2014-11-19 15:53:07 +00:00
Kyle Johnson a0f12575fe Add API function to return event counts for console view 2014-11-19 15:49:38 +00:00
Kyle Johnson 64122b3b98 Set the logState in header via angular 2014-11-16 00:35:10 +00:00
Kyle Johnson 175e7d3e22 Initial commit of Host MVC.
Used for daemonCheck, getLoad, etc
2014-11-16 00:21:55 +00:00
Kyle Johnson f1a70076d0 Convert some of event view to angularjs 2014-11-15 23:51:31 +00:00
Kyle Johnson 5b4dfce34a Add Event controller and factory 2014-11-15 23:50:46 +00:00
Kyle Johnson 519a5e1612 Setup html5mode to enabled 2014-11-15 23:50:04 +00:00
Kyle Johnson 47770bffe4 Add <base> element to <head> so I can use $location.search 2014-11-15 23:49:18 +00:00
Kyle Johnson 1fc26c01ac Merge remote-tracking branch 'origin/master' into bootstrap-skin 2014-11-15 21:47:01 +00:00
Kyle Johnson 2db5d66134 Include state js and php in all pages.
As we can now start / stop the software from any page, via a modal,
we need the state's php and js files to do so.
2014-11-15 19:48:04 +00:00
Kyle Johnson f38a9c9f06 Add jquery 2014-11-15 19:46:34 +00:00
Kyle Johnson 36ebaaff33 Add HeaderController to the header nav 2014-11-15 19:45:18 +00:00
Kyle Johnson 58fbc6c833 Wrap pagination links in <li> instead of <p> 2014-11-15 19:38:45 +00:00
Kyle Johnson 4c0e2dc743 Include initial angularjs files 2014-11-15 19:34:00 +00:00
Kyle Johnson 35530c627a Initial commit of Logs MVC 2014-11-15 19:03:40 +00:00
Kyle Johnson 0129ca5f74 Rework the ConfigParser component. 2014-11-15 19:03:10 +00:00
Kyle Johnson e7d726bf75 Don't print out the Config string to the file system. 2014-11-15 19:02:54 +00:00
Kyle Johnson fcaa67e3c3 Slight refactor of ConfigParser Component. Needs more work. 2014-11-15 19:02:18 +00:00
Kyle Johnson cf3d0f962c Add view for Configs Edit 2014-11-15 19:02:03 +00:00
Kyle Johnson 9f80a7d5f5 Show a list of Config Key:Value pairs 2014-11-15 19:01:32 +00:00
Kyle Johnson 9268c503af Do not display the "hidden" config category 2014-11-15 19:01:19 +00:00
Kyle Johnson b9f54056da Add component for dumping Config table as HTML 2014-11-15 18:59:58 +00:00
Kyle Johnson de631075d3 Return possible source types ni DB via API 2014-11-15 18:59:24 +00:00
Kyle Johnson 0d57306790 Find category configs only when $category is not null. API 2014-11-15 18:58:58 +00:00
Kyle Johnson 9f150c4e46 Revert "Find category configs only when $category is not null. API"
This reverts commit efbbcadc7dad9aa52a7aab0483546eab48840ae6.
2014-11-15 18:58:51 +00:00
Kyle Johnson b88febeaee Find category configs only when $category is not null. API 2014-11-15 18:58:43 +00:00
Kyle Johnson 0a7ba112ab API support for querying config categories.
Either return a list of distinct categories, or all configs under a
certain category
2014-11-15 18:55:20 +00:00
Kyle Johnson b04d970132 Add charset and other meta tags to head 2014-11-15 17:34:51 +00:00
Kyle Johnson 6911b99271 Move groups link to the console sidebar 2014-11-15 16:51:39 +00:00
Kyle Johnson a6027ccdca Make the ZoneMinder text a link to the console 2014-11-15 16:49:44 +00:00
Kyle Johnson e359a1cf97 Move 'state' to header, as on/off btn, in a modal 2014-11-15 16:47:42 +00:00
Kyle Johnson 08d2cf801e Move header outside of form in console 2014-11-15 16:34:45 +00:00
Isaac Connor 9c30b806f2 don't require SystemView to view/select groups.
Change the way the groups ine is displayed to give people some idea that it might have something to do with grouping
use _POST instead of _REQUEST
2014-11-13 10:38:20 -05:00
Isaac Connor ebe35c2135 handle empty [file] to prevent logzilla 2014-11-13 09:17:54 -05:00
Kyle Johnson 7b4effc3ed Remove Chart.js 2014-11-11 16:49:56 +00:00
Kyle Johnson 7f83eeafbf Do not text-align center everything 2014-11-11 14:56:45 +00:00
Kyle Johnson 942c65f1e2 Remove the existing #header from timeline 2014-11-11 14:34:34 +00:00
Kyle Johnson 1c046a7afd Added header to the timeline view 2014-11-11 14:33:35 +00:00
Kyle Johnson 09282045c6 Align the Events control buttons vertically 2014-11-11 14:31:43 +00:00
Kyle Johnson 487cd20b18 Fix typo in class name 2014-11-11 14:23:21 +00:00
Kyle Johnson 02cc5d0a6c Move Events controls to sidebar 2014-11-11 14:21:13 +00:00
Kyle Johnson 1e04e341e4 Link to paginated Events in Header 2014-11-11 14:20:03 +00:00
Kyle Johnson ea782d46b2 Move timeline link from Events to Header 2014-11-11 14:19:15 +00:00
Andrew Bauer 26c9a77590 Update skin.js
Fix issue caused by a previous merge
2014-11-10 12:12:54 -06:00
Kyle Johnson dfc3d70584 Remove Filters from the header 2014-11-03 13:49:48 +00:00
Kyle Johnson e8b93f0a20 Revert "Remove Filters from the header"
This reverts commit 4b6cf9ca04.
2014-11-03 13:49:36 +00:00
Kyle Johnson 4b6cf9ca04 Remove Filters from the header 2014-11-03 13:49:06 +00:00
Kyle Johnson 28a4de809b Show log state color in header 2014-11-02 14:54:08 +00:00
Kyle Johnson ee2e0a5aec Add Events to main nav 2014-11-02 12:42:40 +00:00
Kyle Johnson f847ad548a Added ZoneMinder logo to header 2014-11-02 12:41:40 +00:00
Kyle Johnson 91af0992bd Remove unused elements from the sidebar 2014-11-02 00:51:56 +00:00
Kyle Johnson dfa246bbf6 Add header to log and rearrange filter elements 2014-11-02 00:51:24 +00:00
Kyle Johnson 1f8d2d3b77 Add header to monitor view 2014-11-02 00:48:21 +00:00
Kyle Johnson 23b367614b Use <a> elements intead of makePopupLink() in header 2014-11-02 00:47:32 +00:00
Kyle Johnson 1436414ddc Add header to main views 2014-11-02 00:47:14 +00:00
Kyle Johnson 79e41dbb1b Fix bug where on / off icon didn't have class if not console view 2014-11-02 00:40:26 +00:00
Kyle Johnson 6435fe24c0 Add console link to header 2014-11-01 16:04:15 +00:00
Kyle Johnson c892e72ae8 Display cycle and montage as <a> element, only if running 2014-11-01 16:01:30 +00:00
Kyle Johnson bcbd73fe44 Split nav / header out into own file 2014-11-01 15:39:11 +00:00
Kyle Johnson 1a83b3053e More work on cosole - split into sep. files, create sidebar 2014-11-01 15:26:19 +00:00
Kyle Johnson 8ec86ae255 Convert most of console to bootstrap theme 2014-10-31 20:55:19 +00:00
Kyle Johnson 1c400f0966 Remove font-size:10px from <body> 2014-10-31 20:32:50 +00:00
Kyle Johnson a4fbde9e3f Add Chart.js to bootstrap skin 2014-10-31 20:24:25 +00:00
Kyle Johnson 896b258ad0 Use bootstrap .container-fluid instead of #page 2014-10-31 18:55:32 +00:00
Kyle Johnson c11f4eb0bb Use HTML5 doctype 2014-10-31 18:53:15 +00:00
Kyle Johnson c066d9bdbc Load the bootstrap css and js files 2014-10-31 18:50:07 +00:00
Kyle Johnson 7e89df842c Check in of bootstrap 3.3.0 files to bootstrap skin 2014-10-31 18:47:46 +00:00
Kyle Johnson bb465f0250 Initial commit of bootstrap-based skin 2014-10-31 18:46:37 +00:00
Isaac Connor 2f32c3895b Merge branch 'release-1.28'
Conflicts:
	web/skins/flat/js/skin.js
2014-10-22 15:10:19 -04:00
Isaac Connor c5a1d9ffa9 fix console refresh in this skin too 2014-10-22 10:58:06 -04:00
Andrew Bauer 23ebbf3887 Update skin.js
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-21 17:22:33 -05:00
Isaac Connor 8d225566b1 Move this line down to mitigate the problem where the console doesn't refresh. 2014-10-20 15:32:30 -04:00
Andrew Bauer 7ea003441d Merge pull request #371 from m-bene/resizeWindows
Reduce window size to exclude task bar area
2014-10-09 14:46:46 -05:00
Isaac Connor bec58a6011 fixes WRT to db logging. I believe fixes issue #504 2014-09-26 14:43:58 -04:00
Andrew Bauer aa3803cb0b Update functions.php
A more efficient check for IE >= 11 than the previous commit
2014-09-13 09:47:22 -05:00
Andrew Bauer 91b99b97a5 Update functions.php
Add logic to detect the User Agent string from IE11 (and potentially newer).
2014-09-13 08:19:08 -05:00
Isaac Connor 2018228daf fix V inputs 2014-08-21 11:58:51 -04:00
Isaac Connor 6564c4359b adjust monitor popup height 2014-08-21 11:15:35 -04:00
Isaac Connor 707f2e84db increase monitor popup height to fit v4l settings in 2014-08-21 11:14:48 -04:00
Isaac Connor f93a28f2be fixup multibuffering so it can have a null value which makes it fall back to config table 2014-08-21 11:13:38 -04:00
Isaac Connor 0834e1b61d I see no reason for these to be posts. They retrieve info, that's it. 2014-07-29 16:15:31 -04:00
Isaac Connor 96322dd59c remove v4l tab that I never used 2014-07-29 14:45:02 -04:00