5e419e85d7
move logger down, as thisURL gets set in the skin.js and comment out overlay.js
2016-05-16 14:37:35 -04:00
e28cb5b412
fix body padding
2016-05-16 13:29:13 -04:00
9601b30972
Add Width, Height and alt to frame
2016-05-16 13:26:44 -04:00
e4566f2e8e
Merge branch 'update_image_view' into storageareas
2016-05-16 12:23:19 -04:00
df8964c1f9
use eid= & fid= instead of path to frame image. The use of view=image also provides more security.
2016-05-16 10:33:21 -04:00
235095ed5f
fix URL to image view
2016-05-16 10:32:43 -04:00
9a1b0b79b9
don't use a dropdown for montage, etc
2016-05-13 11:43:38 -04:00
a61dade6df
Merge branch 'fix_montage_server_refs' into storageareas
2016-05-13 11:11:27 -04:00
3ed6014f61
Merge branch 'iconnor-updated-console' into storageareas
2016-05-13 11:11:19 -04:00
8cb2692bbb
pass in the server url into the monitor object to use instead of the portal url
2016-05-13 11:09:12 -04:00
e301eaf6e4
use instead of $ to reference jquery
2016-05-13 11:08:04 -04:00
85f950d80a
put jquery into no conflict mode so it doesn't overwite mootools use of $
2016-05-13 09:45:24 -04:00
1ce2e597cf
fix body top padding
2016-05-12 20:00:37 -04:00
ed3e975e5a
take fid and eid as alternate parameters
2016-05-12 11:55:48 -04:00
2144cb7de6
fix body padding only for console and options
2016-05-12 10:45:13 -04:00
1530096560
whitespace/google code style
2016-05-12 10:17:41 -04:00
b513bcef82
icon's gonna kill me
2016-05-10 20:09:41 -04:00
af3cae578e
fixed verbose handling bug for status command on zmu
2016-05-10 20:07:28 -04:00
8d5f2a8e5d
added iconnor's change back
2016-05-10 19:17:09 -04:00
df830a5190
resolved merge conflicts
2016-05-10 19:15:00 -04:00
2888142e68
added status command to retrieve alarmed status of monitor in addition to on/of
2016-05-10 16:55:43 -04:00
e9d8b7925a
Merge branch 'db_reconnect' into storageareas
2016-05-10 11:13:09 -04:00
2af96237b3
increase filter save popup height
2016-05-10 10:02:07 -04:00
c0d3d69bec
Merge pull request #1420 from connortechnology/fix_event_menubars
...
remove set height on the menu bars, fixing flow issues
2016-05-10 16:55:06 +10:00
a8de0bff71
Merge branch 'master' into storageareas
2016-05-09 19:30:02 -04:00
35783f7dc0
Merge branch 'mysql_fixes' into storageareas
2016-05-09 19:27:42 -04:00
b03d2660cb
Merge pull request #1455 from ZoneMinder/api_servers
...
rough in Server object support
2016-05-10 08:00:58 +10:00
cffcbc6357
Merge pull request #1462 from ZoneMinder/merge_storageareas
...
Merge object model classes from storageareas
2016-05-10 07:59:25 +10:00
7f9c70d521
when value to be stored is undefined or '', then set the field=NULL
2016-05-09 13:39:40 -04:00
41776547cb
Merge branch 'master' into fix_zone_edit
2016-05-09 12:33:05 -04:00
beebe74e7b
Merge branch 'merge_db_connects' into storageareas
2016-05-09 12:26:17 -04:00
e12160456b
Support user defined MySQL Port/Socket in API
2016-05-09 00:24:08 -07:00
966a9dcd8d
Merge pull request #1467 from ZoneMinder/api_fixes
...
Don't pass request data as a monitor array to daemonControl
2016-05-07 18:25:35 -04:00
e4171855bb
add padding for nabar to body
2016-05-07 18:12:31 -04:00
ae40dc8b1b
revert to fixed navbar
2016-05-07 18:11:58 -04:00
e35b0a1eb2
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
...
added alarmed frames filter
2016-05-07 17:06:37 -04:00
be329e1e0d
switched to named param format, more flexible, in line with other APIs
2016-05-07 16:28:25 -04:00
8347b69b09
added alarmed frames filter
2016-05-07 14:26:09 -04:00
6d991a1c6c
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
...
added alarm enable/disable
2016-05-07 11:26:49 -04:00
6f9cc0f19f
to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF
2016-05-07 11:01:03 -04:00
654d4d2bee
Merge branch 'api_fixes' into storageareas
2016-05-07 10:56:47 -04:00
15977f1a3c
Don't pass request data as a monitor array to daemonControl
2016-05-07 10:56:38 -04:00
0280ae4dd5
added alarm enable/disable
2016-05-07 10:37:42 -04:00
51e6372362
remove extra hidden fields
2016-05-06 18:20:05 -04:00
dcdefac48a
fix styles in header, move footer back into header
2016-05-06 16:08:32 -04:00
7219e0624b
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:56:07 -04:00
9756f59a2c
still trying to fix eventcounts
2016-05-06 15:56:01 -04:00
97a1d5a648
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:53:48 -04:00
52b4e98e5a
fixes
2016-05-06 15:53:19 -04:00
fc191dfaa5
fixes
2016-05-06 15:52:07 -04:00
38877f802c
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:47:48 -04:00
905b69a394
fix too many {
2016-05-06 15:47:29 -04:00
7c3a7a6fda
fix i to monitor_i in for loop
2016-05-06 15:46:47 -04:00
38e02db9cf
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:46:00 -04:00
daf10c1b84
make displayMonitors global
2016-05-06 15:44:35 -04:00
f8d7f9906d
fixup merging of Event data into the monitor array
2016-05-06 15:44:23 -04:00
2ccefdb23c
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:30:25 -04:00
f4df9e053d
port sidebar css over from classic to flat
2016-05-06 15:30:10 -04:00
fb1b8000ec
fix the use of when specifying a skin
2016-05-06 15:24:20 -04:00
02b5cd6b6c
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:17:10 -04:00
5d8eeb5b56
deprecate header, just the getNavBarHTML function
2016-05-06 15:16:48 -04:00
da97dfd9cf
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:59:10 -04:00
ed5cb2f3ed
fix global language problems
2016-05-06 14:58:41 -04:00
99d9f98244
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:40:08 -04:00
956b971719
put back maxWidtha nd maxHeight
2016-05-06 14:39:48 -04:00
b3b63ec1d9
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:38:17 -04:00
829202b42a
move more eventcounting stuff to console.php.
2016-05-06 14:38:08 -04:00
b67ea65fcb
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:34:02 -04:00
297f27af8c
fix missing {
2016-05-06 14:33:56 -04:00
f1e22f9265
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:32:57 -04:00
7acf6cb694
fix colon to semi colon
2016-05-06 14:32:52 -04:00
01397b6695
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:31:27 -04:00
83795805f2
Move state getting into index.php
2016-05-06 14:30:50 -04:00
1d673a0b8c
move header into a function in functions.php. Move event population into console.php
2016-05-06 14:30:32 -04:00
7df2685223
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 12:51:40 -04:00
e87a35b04d
Merge branch 'always_show_ptz' into storageareas
2016-05-06 12:51:15 -04:00
c9f1614e32
If the camera has no centering control, don't make it look like it does. This also removes a logged error
2016-05-06 12:51:03 -04:00
d5f1519829
Can't externally reference .js.php, they have to be inline js
2016-05-06 12:40:23 -04:00
b333b8ebee
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 12:06:47 -04:00
ee015ee674
whitespace/codestyle. Also remove duplicate form iput runState which I think is left over from it being a popup
2016-05-06 12:06:13 -04:00
44e5b566b8
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 11:56:24 -04:00
8405db4750
Move running=daemonCheck from header to index.php so that it is defined early and can be used everywhere
2016-05-06 11:56:03 -04:00
b3b9eaa7d5
better code for deprecate sequpdownarrays
2016-05-06 11:44:13 -04:00
be4f155160
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 11:42:46 -04:00
4784f8b630
deprecate the seqUp and seqDown arrays
2016-05-06 11:36:11 -04:00
4b838dc66c
deprecate minSequence and maxSequence
2016-05-06 11:29:49 -04:00
b0e977f8ed
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 11:26:53 -04:00
55567b66e9
deprecate minSequence and maxSequence use
2016-05-06 11:04:35 -04:00
b0a057724a
document minSequence use
2016-05-06 11:04:22 -04:00
c050969141
Merge object model classes from storageareas
2016-05-05 15:33:28 -04:00
4b782efd54
Whitespace fixes
2016-05-05 15:30:24 -04:00
49dc917b2e
Merge isaac:ZoneMinder.p1 into storageareas
2016-05-05 15:24:14 -04:00
27b928839c
deprecate view=image-ffmpeg
2016-05-05 15:04:11 -04:00
1f6425b1b7
Fix for SQL to load next and previous event
2016-05-05 14:50:15 -04:00
0e74778dda
add find and find_all functions
2016-05-05 14:49:57 -04:00
df960bb1ea
rework image.php view to properly handle fid being the FrameId instead of fid. Fix scaling.
2016-05-05 14:49:40 -04:00
d342b11e64
remove servers references from header, they go in console
2016-05-04 09:07:29 -04:00
36f94dddec
cleanup merge problems
2016-05-03 14:46:22 -04:00
d25e75f485
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
2016-05-03 14:39:59 -04:00
c3628a8dfd
Merge branch 'updated-console' into storageareas
2016-05-03 14:34:58 -04:00
4defe92911
Merge branch 'master' into updated-console
2016-05-03 14:22:37 -04:00
36da4aed88
Push monitor view back to before I messed with it
2016-05-03 13:55:38 -04:00
b92c9f9be4
Add state modal to options view
2016-05-03 13:55:38 -04:00
3271d17a3a
Remove header from log view
2016-05-03 13:55:38 -04:00
bfda50b693
Also don't load additional JS to Log view
...
Another issue with mootools & jquery conflicts
2016-05-03 13:55:38 -04:00
dcd6449a9b
Don't include extra js libraries for monitor view.
...
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
2016-05-03 13:55:38 -04:00
464db86c53
Revert "Add sidebar and top nav to Monitors popup view"
...
This reverts commit 315fb3e857
2016-05-03 13:55:38 -04:00
237f1c3a9c
Change sidebar to lighter colors
2016-05-03 13:53:30 -04:00
6a48b9041a
Revert "Include Chart.js"
...
This reverts commit 33d6d311b0
2016-05-03 13:53:30 -04:00
44fbbee152
Major rewrite of states view. Now a modal on every page.
...
Read: No longer an HTML popup window.
* State html is now included toward the bottom of every page
* The states.js has been rewritten in jquery
* Applying, deleting or saving a state reloads the page after the POST is done
2016-05-03 13:53:30 -04:00
800378b095
Add state view's js and php to all pages as it is now part of header
2016-05-03 13:53:30 -04:00
2e2cc3d9ab
Change 'marked' row style to bootstrap 'danger' and find it with jquery
2016-05-03 13:53:30 -04:00
62fc4dff7e
Change class of delete button to be red
2016-05-03 13:53:30 -04:00
0f5089bbf8
Fix button alignment on console page, and add button styling
2016-05-03 13:53:30 -04:00
f305a6ffc8
Replace console table css with styles from bootstrap
2016-05-03 13:53:30 -04:00
8b5693129b
Include Chart.js
2016-05-03 13:53:30 -04:00
0bb08a6256
clean up options a bit more
2016-05-03 13:51:54 -04:00
291179d3b1
Add side tab list to options page, and style it.
2016-05-03 13:51:54 -04:00
cf6f36b0e5
Add header to log view
2016-05-03 13:51:54 -04:00
3e51429fb0
Move skin and css changing up above the include of header.php so that the set cookie call will work
2016-05-03 13:51:54 -04:00
e435b3ebed
remove duplication
2016-05-03 13:51:54 -04:00
d698f2af14
Restyle the header. Full width, dark background, collapseable.
2016-05-03 13:51:54 -04:00
6c1f53cbdc
Load jquery and bootstrap js in classic skin
2016-05-03 13:51:54 -04:00
27c9d06aee
Add local copy of bootstrap.js 3.3.6
2016-05-03 13:51:54 -04:00
eb443e371f
Update doctype to html5, and add additional meta tags
2016-05-03 13:51:54 -04:00
ff15fdb6d9
Make the ZM logo in header stand out
2016-05-03 13:51:54 -04:00
7a6dae69f0
Convert options layout to side-tabs, and improve readability
2016-05-03 13:51:54 -04:00
d95cf8dae5
Push the options page down a bit to make tab look better
2016-05-03 13:51:54 -04:00
d12fc95ad1
Restyle options view with horizontal form layout
2016-05-03 13:51:54 -04:00
2214cb6389
Add styling to delete / save / add buttons in options.php
2016-05-03 13:51:54 -04:00
b317797a6c
Remove cancel button from options as it no longer makes sense.
2016-05-03 13:51:54 -04:00
2a9b10e80e
Update options.php to use bootstrap container
2016-05-03 13:51:54 -04:00
be8385535d
Oops. Move Console view outside of canView(system) restriction
2016-05-03 13:51:54 -04:00
858845e3a1
Add a link back to console in header
2016-05-03 13:51:54 -04:00
a8c7ec250d
Make the Options link a standard href (not a popup).
2016-05-03 13:51:54 -04:00
25c9328187
Move console php code to header as that code is now needed in additional views.
2016-05-03 13:51:54 -04:00
cd8e8d9685
Move the header into its own file, and include it in options view.
2016-05-03 13:51:34 -04:00
a4e07e9a73
Update options styling
2016-05-03 13:51:34 -04:00
2fff9a6a8b
Fix state link to do popup like before
2016-05-03 13:51:34 -04:00
3e59aca739
Additional footer padding
2016-05-03 13:51:34 -04:00
d6b0b637ea
Add styles to additional console buttons
2016-05-03 13:51:34 -04:00
daef9eb40b
Remove extra #footer styling
2016-05-03 13:51:34 -04:00
ea0c61d482
Bump up the default font size
2016-05-03 13:51:34 -04:00
c3cc5d46bd
Wrap footer in container-fluid
2016-05-03 13:51:34 -04:00
d7f471f41f
Restyle of Login page.
2016-05-03 13:51:34 -04:00
03c188db89
Move recaptcha javascript to actual <head> tag
...
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
2016-05-03 13:51:34 -04:00
aa3c99fc68
Initial major restyle of classic skin.
2016-05-03 13:51:34 -04:00
c4c9b6c494
Local copy of bootstrap 3.3.6, included in classic skin.
2016-05-03 13:51:06 -04:00
516bacdfd3
Merge branch 'updated-console' into storageareas
2016-05-03 13:38:57 -04:00
a1b4869ee6
Add state modal to options view
2016-05-03 13:33:22 -04:00
0a77da8a2f
Remove header from log view
2016-05-03 13:33:08 -04:00
c2fd3dd84a
Also don't load additional JS to Log view
...
Another issue with mootools & jquery conflicts
2016-05-03 13:25:39 -04:00
6768fe5554
Don't include extra js libraries for monitor view.
...
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
2016-05-03 13:06:28 -04:00
01aa2c9319
change permissions to stream permissions for view
2016-05-02 19:48:24 -04:00
e53bd1292e
increase events list width to accomodate thumbnails
2016-05-02 14:30:54 -04:00
240d08133d
implement caching of scaled images.
2016-05-02 14:12:30 -04:00
fe63e4af80
remove extra semi colon
2016-05-02 13:42:42 -04:00
550fdc9295
change thumbnail path to specify eid and fid instead of path to the jpg.
2016-05-02 13:42:15 -04:00
b8c8ff3807
fix if structuring
2016-05-02 13:36:19 -04:00
b38aa60209
fix height of function popup
2016-05-02 11:56:42 -04:00
75f9fde920
rough in Server object support
2016-05-02 10:41:25 -04:00
9d6a7541c8
add Id column to storage areas
2016-05-02 10:40:42 -04:00
272e1da958
rough in Server object support
2016-05-02 10:37:19 -04:00
4aafd1d417
Make api use zm.conf
2016-04-30 13:50:09 -04:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
ce69f24bdd
use zm.conf values for database connection
2016-04-30 08:11:39 -04:00
532fb77ecb
As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes
2016-04-30 08:09:56 -04:00
0044161b9c
Merge branch 'fix_zone_edit' into storageareas
2016-04-29 10:46:37 -04:00
be5f0cd4a9
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
2016-04-29 10:44:46 -04:00
af66105c37
Merge branch 'master' into storageareas
2016-04-29 08:28:53 -04:00
513d1568d0
Merge pull request #1444 from ZoneMinder/handle_disk_free_space_error
...
handle disk_free_space error
2016-04-29 21:36:29 +10:00
c4410c512a
Merge branch 'master' into fix_event_menubars
2016-04-28 09:35:58 -04:00
5e20831030
Don't return of disk_free_space returns false, just log it.
2016-04-28 09:29:40 -04:00
59406fd03a
Merge branch 'master' into storageareas
2016-04-28 09:24:36 -04:00
ac5fdb8956
Merge pull request #1421 from connortechnology/fix_events_pagination
...
remove the if(pages>1) so that the if > line always happens
2016-04-28 21:43:54 +10:00
010f748016
fix clone merge
2016-04-26 15:02:34 -04:00
d847d66e99
handle disk_free_space error
2016-04-26 14:40:40 -04:00
0adbaafd98
Merge branch 'master' into storageareas
2016-04-26 13:10:37 -04:00
fe9cb4b7ec
Merge pull request #1442 from ZoneMinder/fix_rotate
...
Fix rotate
2016-04-26 09:54:01 -05:00
851e8f46ff
redo fix_rotate
2016-04-25 15:57:39 -04:00
59db5d42e7
include Frame.php
2016-04-25 15:00:27 -04:00
b50172fc2e
introduce a Frame object. Alter the image view to take just an fid, in which case it is the unique primary key Id of the Frame.
2016-04-25 14:59:55 -04:00
85798932ee
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
2016-04-25 14:10:26 -04:00
f3a2f9e223
Revert "Add sidebar and top nav to Monitors popup view"
...
This reverts commit 315fb3e857
2016-04-24 14:15:42 -04:00
802a8928d0
Revert "Add missing <form> back to monitor view"
...
This reverts commit cc08607939
2016-04-24 14:15:33 -04:00
cc08607939
Add missing <form> back to monitor view
2016-04-24 14:03:04 -04:00
b4d8bc6a52
Change sidebar to lighter colors
2016-04-24 13:51:48 -04:00
f2d43de137
Revert "Include Chart.js"
...
This reverts commit 33d6d311b0
2016-04-24 00:52:19 -04:00
08fb74c992
Major rewrite of states view. Now a modal on every page.
...
Read: No longer an HTML popup window.
* State html is now included toward the bottom of every page
* The states.js has been rewritten in jquery
* Applying, deleting or saving a state reloads the page after the POST is done
2016-04-24 00:48:16 -04:00
ca0ba4a5f8
Add state view's js and php to all pages as it is now part of header
2016-04-23 22:59:50 -04:00
2ff01b6bcb
remove unneeded global
2016-04-22 13:36:12 -04:00
30b746c603
Add missing ()'s
2016-04-22 13:35:40 -04:00
81757a0465
Merge pull request #1418 from pliablepixels/1417-clone-monitor
...
Clone feature added
2016-04-20 13:02:10 -05:00
ba3f9d1b9a
Merge branch 'master' into storageareas
2016-04-19 12:03:21 -04:00
b2d02a64f4
reload stream after error
2016-04-19 12:02:58 -04:00
10589ee913
Change 'marked' row style to bootstrap 'danger' and find it with jquery
2016-04-18 15:38:10 -04:00
2c5e04a9af
Change class of delete button to be red
2016-04-18 15:38:01 -04:00
7504d69dea
Fix button alignment on console page, and add button styling
2016-04-18 15:25:48 -04:00
c9b81e07c2
Replace console table css with styles from bootstrap
2016-04-18 15:20:32 -04:00
bc99e4c476
whitespace changes
2016-04-17 09:29:14 -04:00
479ea17ed5
fix event menubars
2016-04-16 15:13:18 -04:00
50f2747bb4
remove the if(pages>1) so that the if > line always happens
2016-04-15 16:11:53 -04:00
2b05815bfa
remove set height on the menu bars, fixing flow issues
2016-04-15 15:44:35 -04:00
4b4add49bd
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
2016-04-15 13:18:35 -04:00
ccb5ea766d
add the toggle for RecordAudio so that the checkbox works to turn off Audio
2016-04-15 13:16:52 -04:00
b57abb4e54
revert
2016-04-15 12:50:51 -04:00
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
6ca40966a1
remove teh dropdown-ness of the montage options
2016-04-12 08:52:26 -04:00
61bd60184a
Merge branch 'random_fixes' into storageareas
2016-04-11 11:28:24 -04:00
851a81eff7
Merge pull request #1406 from ZoneMinder/svg_zones
...
replace the static zone image with a stream, and use SVG to draw the zones
2016-04-11 11:14:11 -04:00
f3673fe4b1
Merge branch 'icon_video' into storageareas
2016-04-11 10:32:07 -04:00
67abf91925
add a view to check auth and just send the video
2016-04-11 10:31:51 -04:00
56c2679afd
Merge branch 'icon_video' into storageareas
2016-04-11 10:30:01 -04:00
d493ca69a9
Merge branch 'master' into icon_video
2016-04-11 09:31:51 -04:00
5542788a45
make cannot write to content dir an error, rather than fatal
2016-04-10 18:45:38 -05:00
39a30ff51b
refresh parent when cancel is clicked
2016-04-10 15:59:13 -05:00
e5bf2d245c
quit the stream in zones.php when zone.php is called
2016-04-10 15:33:55 -05:00
fbb2a527e6
remove setButtonState. it is not needed.
2016-04-10 07:55:45 -05:00
988d611d03
remove unused code
2016-04-09 21:37:00 -05:00
e7d35d16bc
add monitor alarm state and fps to zone edit view
2016-04-09 21:34:30 -05:00
78c6e14e0c
Merge branch 'master' into storageareas
2016-04-09 14:52:28 -04:00
c0c543e029
change quotes to prevent php7 complaint
2016-04-09 11:25:56 -04:00
0c8e0ac220
change quotes to prevent php7 complaint
2016-04-09 11:24:59 -04:00
feb7b36f11
use a local variable to prevent modifying the arguments
2016-04-09 11:23:52 -04:00
ce6f8da098
Use PDO::error_string instead of mysql_error
2016-04-09 11:23:35 -04:00
e90024c0d0
Better Error logging on disk_total_space failure
2016-04-09 09:27:12 -04:00
6d27a857aa
put a zones class on the svg
2016-04-08 14:38:50 -04:00
c73e768f1f
put in the onclick for the zone to open the edit page
2016-04-08 14:25:19 -04:00
b10c6ee093
fix Monitor capitalisation
2016-04-08 14:23:44 -04:00
758a0341ce
convert monitor to object
2016-04-08 14:09:59 -04:00
bbd33cc159
add monitor class so we don't have to everywhere else
2016-04-08 13:56:49 -04:00
498bceae0a
remove styles for svg circles
2016-04-08 13:44:20 -04:00
22f207602b
add css for the svg zones
2016-04-08 13:43:00 -04:00
f749ff47ea
convert to monitor object
2016-04-08 13:40:32 -04:00
0ce85137dc
remove points. Don't need them here
2016-04-08 13:39:31 -04:00
56a91ed4b2
rename monitor object from Monitor to monitor. Remove points in zone list.
2016-04-08 13:37:29 -04:00
8735f1ac73
convert to monitor object
2016-04-08 13:37:01 -04:00
11981efad2
add this back
2016-04-08 13:20:26 -04:00
6bb95beb9a
Merge branch 'svg_zones' into storageareas
2016-04-08 13:20:01 -04:00
34bfbb4708
blah
2016-04-08 13:18:13 -04:00
f20945bf84
update zone points in SVG
2016-04-08 13:13:10 -04:00
7da6e1e5a1
use stream for image, add SVG polygon
2016-04-08 12:36:09 -04:00
256df08af4
update SVG polygon points on point update
2016-04-08 12:32:26 -04:00
45d58c3ad6
convert points to circles, because squares are not centered on the point.. but a circle is
2016-04-08 11:17:16 -04:00
79552e5393
use new getStreamHTML
2016-04-08 11:11:09 -04:00
3056069f3f
introduce getStreamHTML which returns the required HTML to give you a live image
2016-04-08 11:06:34 -04:00
3be3a3ada2
convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones
2016-04-08 10:46:51 -04:00
7491aa4381
fix spelling mistake
2016-04-06 10:55:11 -04:00
45f61b503b
add these back
2016-04-06 10:53:28 -04:00
b4b622668c
fix merge
2016-04-06 08:39:47 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
arjunrc
Steve Gilvarry
Joshua Ruehlig
Isaac Connor
Kyle Johnson
Andrew Bauer
root
Andrew Bauer