Commit Graph

239 Commits

Author SHA1 Message Date
Isaac Connor 0937bfdf84 consoleTableBody needs to be an id in order for dragndrop sorting to work 2018-06-06 13:37:12 -04:00
Isaac Connor 3fd953a4eb Move code to generate Source from console into Monitor Object 2018-05-04 06:46:46 -07:00
Isaac Connor e64de07560 spacing 2018-05-03 09:39:09 -07:00
Isaac Connor 8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
Andrew Bauer 86b2f6a12e New Monitor Type - Website (#2065)
* implement website monitor

* don't check certain fields when using website monitor

* continue to fix javascript errors for website monitors

* check $monitor, not $new_monitor here

* add website monitor documentation

was somehow left out of the initial commit

* fix corruption of functions.php

* add missing comma

* remove errors by testing for existence of key.  If it's a new monitor, then none of the keys will be valid

* If the monitor type is WebSite, then default Status to Running.

* put back start function that got lost in merge.  Don't start StreamCmd's if it's a WebSite

* Add midding comma

* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite

* Don't show control or any of the status fields for WebSite type monitors

* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor 5b4d160710 add total bandwidth at bottom and move buttons to top 2018-04-24 14:18:41 -04:00
Isaac Connor 20f6985dff implement capturing bandwidth 2018-04-24 14:11:27 -04:00
Isaac Connor 3560c0d610 fix displayed tbale header twice 2018-04-21 10:35:36 -04:00
Isaac Connor fb44619a66 output the initial table head 2018-04-19 14:33:05 -04:00
Isaac Connor 5b5cd3f330 fix broken table when no monitors to display 2018-04-19 14:16:30 -04:00
Isaac Connor fcaac016b5 Merge ../ZoneMinder.connortechnology 2018-04-18 21:12:14 -04:00
Isaac Connor d31207dd53 use find_one instead of new Group so that caching will happen 2018-04-18 12:30:47 -04:00
Isaac Connor dc098b5299 put the status into the function column 2018-04-16 14:51:10 -04:00
Isaac Connor f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor 4adebfce1d Add Monitor Status breakdown to console 2018-04-05 09:53:53 -07:00
Isaac Connor 66920eb5b8 fix status colour when not capturing 2018-04-03 12:31:54 -07:00
Isaac Connor 7346a8c733 add select button 2018-04-03 10:36:58 -07:00
Isaac Connor 4d68f9a757 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-03-27 13:24:57 -07:00
Pliable Pixels caffe5f7c9 dot should be red when either fclass or source_class is red 2018-03-27 08:55:15 -04:00
Pliable Pixels 1b5d802890 dot should be red when either fclass or source_class is red 2018-03-27 08:43:58 -04:00
Pliable Pixels 1179b6ddc4 rounded top for tables and highlights 2018-03-25 11:43:34 -04:00
Pliable Pixels 14f638e009 replaced ionic fonts with material design icons 2018-03-25 09:28:00 -04:00
Pliable Pixels 10aedb51a6 reduced size of totals 2nd row 2018-03-24 18:30:50 -04:00
Pliable Pixels a68cc79437 using MIT licensed ion-icons, its smaller than FA, replaced some text with icons 2018-03-24 18:25:39 -04:00
Pliable Pixels 0b31cc4d3d 2nd level header tweak 2018-03-24 17:34:46 -04:00
Pliable Pixels b8f6c2277f clone icons 2018-03-24 10:21:59 -04:00
Pliable Pixels 140217bef6 icons, muted colors, text tightening 2018-03-24 09:59:39 -04:00
Isaac Connor 85c757d2b1 Include group in parents list display 2018-03-23 13:35:02 -07:00
Isaac Connor 7e628bc3fd add showing groups under Monitor Name on console 2018-03-01 19:23:46 -08:00
Isaac Connor 6518311022 Use Status and CaptureFPS and AnalysisFPS to do status coloration 2018-02-09 07:31:03 -08:00
Isaac Connor 2a00cf852a Set a type on the buttons so that they act right 2018-02-08 10:50:22 -08:00
Isaac Connor babae4629a Update and fix console buttons. Use a separate button for clone 2018-02-08 09:47:16 -05:00
Isaac Connor 7c3efc02cd put back old add monitor popup 2018-01-31 11:56:57 -05:00
Isaac Connor b1f2b677c3 remove path from source 2018-01-30 10:09:12 -05:00
Isaac Connor b9a98d34bf strip query and scheme from source 2018-01-29 19:03:16 -05:00
Isaac Connor fb50f6f996 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-24 17:14:42 -08:00
Isaac Connor 50fc4a2d94 Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table. 2018-01-24 11:51:11 -05:00
Isaac Connor 181a94de82 test for existence of port in url_parts 2018-01-21 11:10:34 -05:00
Isaac Connor e26747b5cc show port when it's not the standard port 2018-01-19 12:15:26 -05:00
Isaac Connor 95f054c1e6 Show entire path for ffmpeg monitors. Strip out username/password though 2018-01-18 12:40:41 -08:00
Isaac Connor ecd5e01b92 Show port when using Remote Method and Port is non-standard 2018-01-18 10:21:05 -08:00
Isaac Connor ace66cf977 show port in source column 2018-01-17 13:33:22 -08:00
Isaac Connor 494d080740 show port in source column 2018-01-17 13:27:44 -08:00
Isaac Connor 95c3c26eda cleanup old Add Monitr button 2018-01-12 08:11:07 -08:00
Isaac Connor b219f76588 add togglebuttons to select all checbox 2017-12-23 12:58:48 -08:00
digital-gnome 8bfdb73d24 Fix missing change to StartDateTime
Fixes filter loading from events if clicked from last hour link.
2017-12-20 15:46:03 -05:00
digital-gnome f02cd2e615 Remove watch popup 2017-12-02 12:28:04 -05:00
digital-gnome adc1b924da Remove events popup 2017-12-02 12:25:53 -05:00
Isaac Connor 4fbdacef05 fix event counts 2017-11-26 17:03:36 -05:00
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00