Isaac Connor
|
b0eacba0ee
|
use xhtmlFooter
|
2020-09-02 18:14:45 -04:00 |
|
Isaac Connor
|
22a40edd71
|
spacing
|
2020-09-02 18:12:35 -04:00 |
|
Isaac Connor
|
6abad06db2
|
increase width of frames view
|
2020-09-02 18:12:26 -04:00 |
|
Isaac Connor
|
18671b7c19
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:57:32 -04:00 |
|
Isaac Connor
|
69bee20ef5
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:56:30 -04:00 |
|
Isaac Connor
|
5b53289fee
|
fix html structure
|
2020-09-02 17:55:34 -04:00 |
|
Isaac Connor
|
7623733840
|
use xhtmlFooter and fix spacing
|
2020-09-02 17:55:23 -04:00 |
|
Isaac Connor
|
aa4e9600eb
|
Update to use MonitorStream
|
2020-09-02 17:36:01 -04:00 |
|
Isaac Connor
|
e25708ce99
|
use getBodyTopHTML and xhtmlFooter
|
2020-09-02 17:35:46 -04:00 |
|
Isaac Connor
|
fa780c5020
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:35:24 -04:00 |
|
Isaac Connor
|
f38692795e
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:35:13 -04:00 |
|
Isaac Connor
|
cf1f408e96
|
Don't need pauseString and playStream anymore
|
2020-09-02 17:34:09 -04:00 |
|
Isaac Connor
|
c6bc6704b3
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:33:56 -04:00 |
|
Isaac Connor
|
bc710bc826
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:33:09 -04:00 |
|
Isaac Connor
|
a6ad57b393
|
fix html validation errors
|
2020-09-02 17:32:24 -04:00 |
|
Isaac Connor
|
c2760ef768
|
add needed js stuff for streaming
|
2020-09-02 17:28:08 -04:00 |
|
Isaac Connor
|
d243d798ff
|
add needed js stuff for streaming
|
2020-09-02 17:27:59 -04:00 |
|
Isaac Connor
|
5b0123e710
|
Not necessary to specify type=text/css
|
2020-09-02 17:27:31 -04:00 |
|
Isaac Connor
|
0d07f93cd7
|
fix layout of svg
|
2020-09-02 16:37:39 -04:00 |
|
Isaac Connor
|
0cd35518c3
|
Fix id on nav
|
2020-09-02 14:47:07 -04:00 |
|
Isaac Connor
|
ab116a1a6f
|
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
|
2020-09-02 14:47:00 -04:00 |
|
Isaac Connor
|
84bed1b16a
|
include MonitorStream, fix layout of image stream. Update buttons. start with a static image, MonitorStream will start the streaming
|
2020-09-02 14:46:45 -04:00 |
|
Isaac Connor
|
7b4569392c
|
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
|
2020-09-02 14:46:08 -04:00 |
|
Isaac Connor
|
3d3966b1ea
|
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
|
2020-09-02 14:45:40 -04:00 |
|
Isaac Connor
|
5aef5e2312
|
populate monitorData for MonitorStream use
|
2020-09-02 14:45:10 -04:00 |
|
Isaac Connor
|
02d056b277
|
Fix left column positioning
|
2020-09-02 14:44:52 -04:00 |
|
Isaac Connor
|
8d2ced0fbb
|
use MonitorStream to handle the video streaming. update buttons. Add onload event to streaming image so that we redraw the points where they should be. Handle padding in locating points.
|
2020-09-02 14:44:11 -04:00 |
|
Isaac Connor
|
4f90f37f0e
|
add back request queue
|
2020-09-02 14:42:47 -04:00 |
|
Isaac Connor
|
9d84b8bd83
|
remove datetimepickers from static html. They get added later by javascript
|
2020-09-02 14:42:23 -04:00 |
|
Isaac Connor
|
e32d3ba05a
|
Move javascript includes to xhtmlFooter so they don't delay content loading
|
2020-09-02 14:38:38 -04:00 |
|
Isaac Connor
|
5d11644664
|
Fix various sizes and paddings to make zone editing work perfectly
|
2020-09-02 14:38:13 -04:00 |
|
Isaac Connor
|
5544057a8d
|
Merge branch 'master' into improve_zone_editing
|
2020-08-31 18:47:24 -04:00 |
|
Isaac Connor
|
762bea0761
|
Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot.
|
2020-08-31 18:30:05 -04:00 |
|
Isaac Connor
|
e120e21b11
|
fix off-by 1 in limiting results
|
2020-08-31 10:37:35 -04:00 |
|
Isaac Connor
|
0995708b5b
|
Use ajax request instead of webui to delete events. The reason is that the web ui will spit out the events view after performing the action. Without a filter it will try to list every event.
|
2020-08-31 10:37:03 -04:00 |
|
Isaac Connor
|
0b493cd85a
|
add svg circles for the points
|
2020-08-31 10:15:14 -04:00 |
|
Isaac Connor
|
3d5ad4902a
|
zones can now list multiple monitors
|
2020-08-31 10:14:53 -04:00 |
|
Isaac Connor
|
3f4f28f322
|
Move monitor class into js/MonitorStream for use elsewhere
|
2020-08-31 10:13:58 -04:00 |
|
Isaac Connor
|
fa18887f5c
|
zones can now list multiple monitors so populate a listof monitors with json data
|
2020-08-31 10:13:30 -04:00 |
|
Isaac Connor
|
f00f9ead79
|
Move monitor class into js/MonitorStream for use elsewhere
|
2020-08-31 10:12:47 -04:00 |
|
Isaac Connor
|
f5e659f395
|
Change #zones into .zones because we may list zones for multiple monitors now
|
2020-08-31 10:10:50 -04:00 |
|
Isaac Connor
|
af8d7fc3fa
|
Style svg circle point
|
2020-08-31 10:10:21 -04:00 |
|
Isaac Connor
|
3e09840995
|
Merge branch 'master' into improve_zone_editing
|
2020-08-28 17:43:07 -04:00 |
Andrew Bauer
|
990b5bd9dc
|
monitor view - convert links to buttons
|
2020-08-28 15:22:57 -05:00 |
|
Andrew Bauer
|
9c56cd223f
|
move header right to shift pill list up
|
2020-08-28 13:32:46 -05:00 |
|
Andrew Bauer
|
47732e2469
|
right align monitor item names
|
2020-08-28 13:18:01 -05:00 |
|
Andrew Bauer
|
a919be7b2d
|
replace tabs with vert pills
|
2020-08-28 13:09:49 -05:00 |
|
Andrew Bauer
|
d69b3e7f43
|
make cancel go back to console
|
2020-08-28 10:56:09 -05:00 |
|
Isaac Connor
|
04b3f5d294
|
Merge branch 'master' into improve_zone_editing
|
2020-08-28 09:43:48 -04:00 |
|
Andrew Bauer
|
2b6090d8c6
|
console.js - change all createPopup to window.location.assign
|
2020-08-28 07:58:42 -05:00 |