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

4008 Commits

Author SHA1 Message Date
Kyle Johnson e56248ab88 Remove copywrite from console view header 2014-11-28 00:27:55 +00:00
Kyle Johnson cdcf29964b Remove rest of unused php from console view. 2014-11-28 00:27:04 +00:00
Kyle Johnson ff65a701eb Display stills of each monitor, set per-monitor alerts 
This commit displays a still of each monitor at page load time.
The panel surrounding the monitor is context sensitive - if zmc or
zma is not running, the panel is red (well, pink).

Also if either zmc or zma are not running, we add an icon in the
panel's header, explaining what is wrong.
 2014-11-28 00:25:15 +00:00
Kyle Johnson addc985656 Load ui.bootstrap angular module 2014-11-28 00:20:04 +00:00
Kyle Johnson 1d7d53d166 Add ui-bootstrap 0.12 2014-11-27 14:50:31 +00:00
Kyle Johnson b3d1811c43 Add getMonitors factory to angular 2014-11-27 14:35:00 +00:00
Kyle Johnson d9e65e37f9 Add daemonStatus factory to angular. 
Used to query the status of daemons (zmc, zma, etc)
 2014-11-27 14:34:08 +00:00
Kyle Johnson dcde5e16ad Add API function to check daemon status of monitor 
This replaces daemonStatus(), zmcStatus() and zmaStatus() from
the original includes/functions.php.

Can be accessed like:
/api/monitors/daemonStatus/id:2/daemon:zma.json
 2014-11-26 03:38:41 +00:00
Kyle Johnson b0aeea262b Set Monitor model to not be recursive 2014-11-26 03:31:20 +00:00
Kyle Johnson 348564de64 Remove a bunch of unused php in Console view 2014-11-25 17:56:54 +00:00
Kyle Johnson 963e02a0a3 Make all outputImageStill calls have class="img-responsive" 2014-11-25 17:47:28 +00:00
Kyle Johnson 50b1a53369 Put mid into the liveStream ID in console view 2014-11-25 17:45:47 +00:00
Kyle Johnson 929d332ce7 Remove group querystring from Host link 2014-11-25 16:31:40 +00:00
Kyle Johnson f854bf4dcb Move getDiskPercent from Footer to Host factory 2014-11-25 16:30:27 +00:00
Kyle Johnson 9b636c89bc Show disk usage as a chart on the Host view 2014-11-25 16:27:38 +00:00
Kyle Johnson f32cb32da9 Move getLoad to Host factory, and display via chartjs 2014-11-25 16:25:10 +00:00
Kyle Johnson 284b51b73d Update API to return disk usage for all monitors 
This allows us to get back an array of monitor => usage key pairs
 2014-11-25 16:10:34 +00:00
Kyle Johnson e7ab18236a Get load via sys_getloadavg() instead of `uptime` 2014-11-25 16:07:27 +00:00
Kyle Johnson d6a921810c Load the tc chartjs angular module 2014-11-25 15:25:34 +00:00
Kyle Johnson 7dff223aa6 Include Chart.js and tc-angular-chartjs in bootstrap skin 2014-11-25 15:23:06 +00:00
Kyle Johnson 7faace32b9 Initial commit of empty HostController 2014-11-25 15:21:30 +00:00
Kyle Johnson 840ead467b Remove Load and Disk Usage from Footer 2014-11-25 15:19:45 +00:00
Kyle Johnson 3e10ab10ac Added Chart.js v 1.0.1 beta-4 2014-11-24 20:09:22 +00:00
Kyle Johnson c8ab231cef Add Host view to header 2014-11-24 20:03:06 +00:00
Kyle Johnson fe87ca7bd7 Initial commit of Host view 2014-11-24 20:02:59 +00:00
Kyle Johnson d44b89b7fc Allow API to return per-monitor disk usage 
* For monitor 1: api/host/getDiskPercent/1.json
 * For all: api/host/getDiskPercent.json
 2014-11-24 19:56:44 +00:00
Kyle Johnson 941bf3535f Display version in footer via api / angular 2014-11-24 00:56:20 +00:00
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
Isaac Connor 1a74a410c8 Merge pull request #589 from manupap1/fr_lang_fix 
Convert french lang file to UTF-8

Thanks again for your efforts!
 2014-11-21 09:05:46 -05:00
Emmanuel Papin 4e9c3494b8 Convert french lang file to UTF-8 2014-11-20 20:51:49 +01:00
Kyle Johnson f935fa6ca6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into bootstrap-skin 2014-11-20 13:48:12 +00: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
Andrew Bauer 83120e69b1 Merge pull request #584 from ZoneMinder/zmupdatefixes 
Zmupdatefixes
 2014-11-19 13:09:07 -06:00
Isaac Connor cc989dbe19 fix putting the mode back. I merged it to the wrong place 2014-11-19 13:54:10 -05:00
Isaac Connor f8dd2c6eaf Merge branch 'master' into controlversionfixes 2014-11-19 12:53:28 -05:00