9d65ef3bb2
Merge pull request #1556 from knnniggett/banner
...
custom banner text on web console
2016-08-06 10:59:53 -04:00
382896dc0d
Merge pull request #1498 from josh4trunks/mysql_port_socket
...
Add support for MySQL Port / Unix Socket
2016-08-06 09:32:32 -05:00
6a0c6cd4f2
Merge branch 'show_other_zones' into storageareas
2016-08-02 13:54:01 -04:00
aa78b403a1
zmaControl can take an id #, so need to move the check for local server test down.
2016-08-02 12:33:41 -04:00
8093470a2e
make only the editing polygon have a border. Set default for Type when creating a new zone
2016-08-02 12:19:55 -04:00
b522371080
include polygons for the other zones.
2016-08-02 12:02:07 -04:00
c58c3efcf5
fix to
2016-07-25 15:34:53 -04:00
b9bba6bde5
fix to
2016-07-25 15:32:57 -04:00
b9a15d1465
fix missed to conversion
2016-07-23 13:37:00 -04:00
4c1c95e3a5
only include the state if canEdit(system) otherwise it gives an auth error
2016-07-22 16:04:42 -04:00
32f9b2755e
add more height to the logout popup
2016-07-22 16:04:18 -04:00
8194876454
always put popup links in a, even if it is disabled
2016-07-22 16:03:57 -04:00
6d1f85bcd6
fix spacing and code style, and when logging in, change view to console
2016-07-22 16:03:39 -04:00
9262d9d14e
remove debug messages on css changing
2016-07-22 16:02:55 -04:00
3504c1d8f5
Add Id to the title for each monitor
2016-07-21 15:02:01 -04:00
440f8fafdd
implement object based versions of getImageSrc and creatListThumbnail
2016-07-20 15:21:23 -04:00
8c8461a88e
Update to use Event object and object based createListThumbnail function
2016-07-20 15:20:51 -04:00
b1d0223c30
implement human_filesize
2016-07-20 15:20:21 -04:00
bce7369984
Merge branch 'disk_space_in_events' into storageareas
2016-07-19 17:36:15 -04:00
cd43d1fa7a
Rough in Event disk space reporting
2016-07-19 17:34:01 -04:00
4caa20821a
fix
2016-07-14 11:57:06 -04:00
eb0ddc4e32
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
2016-07-14 11:55:27 -04:00
b6c02b563b
turn off host validation
2016-07-14 10:22:09 -04:00
a30610fbda
Merge branch 'master' into storageareas
2016-07-12 10:31:10 -04:00
410e154b7f
code style
2016-07-12 10:29:40 -04:00
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
3eccdcd3e2
Merge pull request #1524 from ZoneMinder/add_api_auth
...
if user=&pass= are in request, use them for auth in api
2016-06-29 21:47:44 +10:00
f3779d543c
Merge pull request #1521 from ZoneMinder/fix_zone_edit
...
update area when points move
2016-06-29 21:46:28 +10:00
bdd0790106
Merge pull request #1522 from ZoneMinder/video_session
...
Move the session start down to where it is actually needed so that we…
2016-06-29 21:45:12 +10:00
9f00971e6b
Use Debug for debug output instead of Error
2016-06-27 10:27:26 -04:00
4fc68c0aa0
Use a subquery instead of a join to fix group by errors when sql_mode=only_full_group_by
2016-06-27 10:26:37 -04:00
6ab2b33e95
fix merge
2016-06-27 09:10:35 -04:00
6e4c8fa224
need to set the Id when duping
2016-06-24 10:31:15 -04:00
791c8fb3d5
add setting of object property
2016-06-24 10:30:56 -04:00
d732d9a49a
fix merge
2016-06-24 10:02:20 -04:00
c1f30480e3
fix merge
2016-06-23 12:49:27 -04:00
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
6a8db582ff
whitespacing updates
2016-06-21 12:21:18 -04:00
31a5252afa
apply btn and btn-primary styles to remaining buttons on console
2016-06-21 09:22:32 -04:00
513de21260
Merge branch 'add_api_auth' into storageareas
2016-06-21 09:10:06 -04:00
b4aec41d3d
fix warnings and move User import up higher to where it needs to be
2016-06-21 09:09:58 -04:00
4230bd1bd5
move the control_fields into the class so that it is available.
2016-06-20 12:46:23 -04:00
9c7b22086f
introduce a hash to define the fields and default values of the control table. Primarily this is to prevent method warnings when a monitor is not controllable
2016-06-20 12:41:14 -04:00
1d1cedce95
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
2016-06-20 12:40:33 -04:00
26bba58c56
Merge branch 'master' into feature-h264-videostorage
2016-06-17 11:09:47 -04:00
3914e0b394
:Merge branch 'fix_zone_edit' into storageareas
2016-06-16 12:04:18 -04:00
0c82e82ae2
Don't update x in updateY and don't update y in updateX as they are not defined.
2016-06-16 12:00:00 -04:00
d0e08b32f5
Merge pull request #1506 from Disassembler0/master
...
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-06-17 00:01:08 +10:00
8e7665d397
use getStreamHTML instead of duplicated code
2016-06-14 12:40:18 -04:00
d5d48bef8a
clean out unused variables and don't scale the popup window. The contents of it won't be scaled.
2016-06-14 12:39:51 -04:00
bfa46e26ee
Use monitor Id instead of the array index. Id is unique, so just use it.
2016-06-14 12:39:15 -04:00
acba5bccf1
Always include the monitor Id in the tag id for the videostream
2016-06-14 12:38:37 -04:00
0f1a1a6294
log invalid calls to Monitor Object
2016-06-14 12:38:17 -04:00
f804f7739d
Adjust download file path to swap path to match the file generated.
2016-06-14 20:49:38 +10:00
abad7cbf9f
Merge branch 'fix_zone_edit' into storageareas
2016-06-13 09:43:03 -04:00
83ac4cd061
change the input handler from onchange to oninput. Disable form submit when hitting enter
2016-06-13 09:40:04 -04:00
632ec38d7d
Put back in neccessary callt o updateArea
2016-06-12 16:10:24 -04:00
4f2e0edb44
remove unnecssary updateAreas
...
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
c3043c1487
cleanups, remove unneccessary updateArea calls
2016-06-07 21:22:22 -04:00
4fbab64368
Merge branch 'add_api_auth' into storageareas
2016-06-07 16:33:50 -04:00
dbdd1ae51e
remove debug logging
2016-06-07 16:26:58 -04:00
f26c9168c4
if user=&pass= are in request, use them for auth
2016-06-07 16:25:35 -04:00
94174a1fe2
use user= and pass= instead of auth hash
2016-06-07 15:47:59 -04:00
5f76cc8677
accept user=&pass= in url for auth
2016-06-07 15:14:47 -04:00
086d435712
send zmcCommand to api on server
2016-06-07 14:39:59 -04:00
b2dfdea66e
Merge branch 'fix_zone_edit' into storageareas
2016-06-07 11:45:50 -04:00
593fe2b0c5
update area when points move
2016-06-07 11:40:53 -04:00
1930b18100
Move the session start down to where it is actually needed so that we don't hold it open while generating videos
2016-06-07 10:38:37 -04:00
bb6adc3012
fix missing space
2016-06-07 09:37:05 -04:00
f0ec2a65ee
Merge branch 'fix_errors_when_event_not_found' into storageareas
2016-06-03 10:47:47 -04:00
380b86614f
put quotes around integer values that will be empty strings if the event is not found
2016-06-03 10:46:21 -04:00
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
060988c05c
set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding
2016-05-31 16:02:37 -04:00
a57a3d3186
Merge pull request #1501 from ZoneMinder/fix_zone_edit
...
Fix zone edit
2016-05-31 10:33:31 -05:00
883b323528
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-05-29 22:16:00 +02:00
1add5a954a
Merge branch 'fix_filter_actions' into storageareas
2016-05-29 11:37:08 -04:00
9f6f5100fe
also copy Name from the request on update and only show delete button if it has a name
2016-05-29 11:32:18 -04:00
7725109917
Merge branch 'fix_filter_actions' into storageareas
2016-05-27 12:47:32 -04:00
101c93d422
When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object
2016-05-27 12:45:36 -04:00
c4e5299943
sync up auto to Auto
2016-05-27 12:45:04 -04:00
c25b680799
Merge branch 'fix_filter_actions' into storageareas
2016-05-27 11:12:18 -04:00
65e33d6c19
synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter
2016-05-27 11:11:30 -04:00
d52a6f9a95
Merge branch 'improve_filter' into storageareas
2016-05-27 09:57:05 -04:00
3058dd9463
Merge branch 'id_on_console' into storageareas
2016-05-26 12:19:33 -04:00
f461bc1e80
get rid of extra )
2016-05-26 12:18:58 -04:00
05709f3084
Merge branch 'id_on_console' into storageareas
2016-05-26 11:17:41 -04:00
f969186abb
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
2016-05-26 11:15:13 -04:00
730abc9789
make zones unclickable when zm is not running
2016-05-26 09:35:36 -05:00
1972c4116b
Merge pull request #1486 from connortechnology/update_image_view
...
Update image view
2016-05-26 09:05:14 -05:00
0d08c50199
change quotes
2016-09-29 12:22:01 -04:00
ab8b58ba48
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:44:30 -04:00
5c867aa5f5
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:10:38 -04:00
ceaacf91bf
Merge pull request #1470 from connortechnology/api_improvements
...
Api improvements
2016-05-25 12:45:03 -05:00
7a08d4620f
Merge branch 'master' into storageareas
2016-05-25 10:17:46 -04:00
575f8ec265
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
...
Hide rtspdescribe
2016-05-25 08:44:17 -05:00
8f1596d683
use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr
2016-05-25 09:08:28 -04:00
7cfa2a5eaa
Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone
2016-05-24 16:46:34 -04:00
277fdafa85
Remove entry for Server Name, making Server Id just say Server. The filters will be populated with a dropdown, so no need to go by Id or Name
2016-05-24 16:45:55 -04:00
8fabeb78d3
Merge branch 'fix_zone_edit' into storageareas
2016-05-24 15:55:49 -04:00
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
89f58daf89
Merge branch 'master' into fix_zone_edit
2016-05-24 15:30:56 -04:00
ae1eb94f27
fix getStreamHTML when using helper
2016-05-24 15:10:37 -04:00
0052bb080c
unlink only if file exists
2016-05-24 12:13:17 -05:00
00abd36af8
fix the other case of the wrong case of rtsp
2016-05-24 12:19:31 -04:00
056eed6df9
fix to show RTSP describe option when switching back to rtsp
2016-05-24 12:15:59 -04:00
bc49aa6aa6
add missing ; and remove extra )
2016-05-24 09:34:36 -04:00
5eac0559e2
Merge branch 'master' into hide_rtspdescribe
2016-05-24 09:32:41 -04:00
bec14bf111
Merge pull request #1478 from ZoneMinder/fix_montage_server_refs
...
pass in the server url into the monitor object to use instead of the …
2016-05-23 20:14:35 -05:00
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
4018cab743
don't pass partial data to daemoncontrol
2016-05-19 14:53:16 -04:00
fff54e4086
update export to use event object, which automatically fixes storage path issues. Include mp4's in the list of video files to include
2016-05-18 09:02:14 -04:00
e62ea454ba
Merge branch 'master' into storageareas
2016-05-17 10:48:52 -04:00
20c4d07a00
Merge branch 'master' into hide_rtspdescribe
2016-05-16 14:40:04 -04:00
0faa28d058
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-05-16 14:38:49 -04:00
6084e2d00f
improve error message. The unrecognized action error happens above, so this error should just mention permissions
2016-05-16 14:38:40 -04:00
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
aba80f0935
introduce htmlselect as an alternative to buildselect
2016-05-12 09:43:37 -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
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
Steve Gilvarry
Isaac Connor
Disassembler
Andrew Bauer
Isaac Connor
josh4trunks
arjunrc
Kyle Johnson