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
Isaac Connor
Isaac Connor
Kyle Johnson