9c3509a620
put an mid in imageFeed id so we can use MOnitorStream.js. Use Monitor->getStatusHTML to generate status html
2022-01-20 11:52:54 -05:00
688f505f28
Adds better error handling, changes expected location of janus.js
2022-01-16 19:44:52 -06:00
50c824f3bb
Janus cleanup, adds support to the "watch" view
2022-01-11 21:21:58 -06:00
c081637036
Fixes to specifying width and height of image due to us jquery. Implement changeRate/MaxFPS. Cleanup use of auth_hash in JSON.
2021-12-16 16:38:15 -05:00
5d8db0a320
Merge cycle functionality into watch view. Add period dropdown, countdown timer, toggle the sidebar. Fix auth on statusAjax, and don't use status ajax unless we are in still mode. Apply some min-width to fps so they don't jump around. Only update their content if it has changed (fewer browser renders).
2021-12-10 15:34:35 -05:00
30d4900b45
rough in fullscreen mode in watch view
2021-11-09 17:01:13 -05:00
ee5d5e3cab
wrap fps text in another div to make the title easier to bring up and include the word fps
2021-01-31 10:19:10 -05:00
379538b3db
Make the monitor name at the top a link to monitor edit
2021-01-29 09:53:30 -05:00
8c85c50ce1
Add titles to fps values and only show analysis if doing it
2020-12-15 16:56:53 -05:00
38cf667ee1
report both capture_fps and analysis_fps
2020-12-09 15:03:40 -05:00
ce4d9cd657
put back manual refresh button on watch view
2020-12-03 08:38:28 -06:00
74fe47c4c5
don't autorefresh watch view table
2020-12-03 08:31:52 -06:00
d5df996bca
deploy animated thumbnails on watch view
2020-12-02 19:44:12 -06:00
70689acf8d
remove data-mobile-responsive, use table-responsive-sm instead
2020-12-02 07:47:57 -06:00
93f11bbc82
set responsive breakpoint for small screens on watch & events views
2020-12-01 09:50:32 -06:00
8d8054bc0f
deploy bstable to watch view
2020-11-26 17:00:05 -06:00
1ed160866b
add legacy watch view alarm buttons to toolbar
2020-10-16 15:47:42 -05:00
f98a885ed5
update the watch view header
2020-10-16 08:08:23 -05:00
1643fb686b
convert settings popup to modal
2020-10-03 16:51:25 -05:00
1659bb2116
Add id to scale dropdown
2020-09-06 12:12:26 -04:00
b0eacba0ee
use xhtmlFooter
2020-09-02 18:14:45 -04:00
04b3f5d294
Merge branch 'master' into improve_zone_editing
2020-08-28 09:43:48 -04:00
b5ef7b08b9
settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth.
2020-08-25 12:40:22 -04:00
f22f3e9262
use a scaled svg and replace inline js
2020-07-13 14:51:07 -04:00
8195223a86
merge some php
2020-05-08 17:54:51 -04:00
0085e3d34f
Don't warn about image for WebSite Monitors
2020-05-01 18:15:19 -04:00
1bd340d602
spacing in watch.php
2020-05-01 13:30:00 -04:00
daa08e8740
Always just default to scale from monitor
2020-05-01 13:03:17 -04:00
775b0d1ccd
fix XSS in monitor Name
2020-04-23 18:16:38 -04:00
1cf034ec5f
fix inline js on the back/close button
2019-10-08 18:49:29 -04:00
fdaee75310
Use material icons for buttons. Hide the stop button because it does nothing.
2019-09-26 16:26:18 -04:00
b936fbac6a
Don't import Monitor.php unless we need to
2019-09-25 10:16:16 -04:00
2da9edf0ff
add onchange to scale
2019-09-19 14:57:17 -04:00
b84e3499f4
Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message
2019-07-07 17:25:49 -04:00
268bc2264b
Merge branch 'storageareas'
2019-07-02 10:19:03 -04:00
1161c251fc
Add a warning when the monitor is not capturing in live view
2019-06-28 10:28:53 -04:00
1241761683
Add a title popup telling people about the zoomin/out/pan functions. Add ctrl-click to zoomout
2019-06-11 10:58:54 -04:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
7ea8be3fa8
spacing, remove non html5 elements
2019-01-25 09:22:08 -05:00
f49dd93b6a
Merge branch 'master' into storageareas
2019-01-16 14:39:56 -05:00
d33fec9c3f
Add a CSP script-src policy with nonce-source and convert more inline event handlers ( #2413 )
...
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy
* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'
Only handle ones that don't return a value.
* Use @data-on-click to attach inline click event handlers with no args and no return value
* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument
* Enforce a script-src CSP on views without inline JS
* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
7d90a56561
Merge branch 'master' into storageareas
2018-11-30 14:46:42 -05:00
5e0d742e26
Use history.go(-1) which works on safari
2018-11-29 14:04:35 -05:00
328b804465
spacing and quotes
2018-09-14 16:20:00 -04:00
ba8dc2059d
spacing
2018-07-09 12:33:21 -04:00
d271d8bf1d
Fix my botched change to generateAuthHash
2018-06-25 14:50:54 -04:00
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
61249ccf2a
Show pause/play/stop when no stream buffer
2018-04-18 12:30:18 -04:00
Isaac Connor
Jonathan Bennett
Andrew Bauer
Isaac Connor
Matt N