Isaac Connor
|
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 |
|
Isaac Connor
|
e435b3ebed
|
remove duplication
|
2016-05-03 13:51:54 -04:00 |
Kyle Johnson
|
d698f2af14
|
Restyle the header. Full width, dark background, collapseable.
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
6c1f53cbdc
|
Load jquery and bootstrap js in classic skin
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
27c9d06aee
|
Add local copy of bootstrap.js 3.3.6
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
eb443e371f
|
Update doctype to html5, and add additional meta tags
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
ff15fdb6d9
|
Make the ZM logo in header stand out
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
7a6dae69f0
|
Convert options layout to side-tabs, and improve readability
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
d95cf8dae5
|
Push the options page down a bit to make tab look better
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
d12fc95ad1
|
Restyle options view with horizontal form layout
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
2214cb6389
|
Add styling to delete / save / add buttons in options.php
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
b317797a6c
|
Remove cancel button from options as it no longer makes sense.
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
2a9b10e80e
|
Update options.php to use bootstrap container
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
be8385535d
|
Oops. Move Console view outside of canView(system) restriction
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
858845e3a1
|
Add a link back to console in header
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
a8c7ec250d
|
Make the Options link a standard href (not a popup).
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
25c9328187
|
Move console php code to header as that code is now needed in additional views.
|
2016-05-03 13:51:54 -04:00 |
|
Kyle Johnson
|
cd8e8d9685
|
Move the header into its own file, and include it in options view.
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
a4e07e9a73
|
Update options styling
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
2fff9a6a8b
|
Fix state link to do popup like before
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
3e59aca739
|
Additional footer padding
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
d6b0b637ea
|
Add styles to additional console buttons
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
daef9eb40b
|
Remove extra #footer styling
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
ea0c61d482
|
Bump up the default font size
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
c3cc5d46bd
|
Wrap footer in container-fluid
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
d7f471f41f
|
Restyle of Login page.
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
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 |
|
Kyle Johnson
|
aa3c99fc68
|
Initial major restyle of classic skin.
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
c4c9b6c494
|
Local copy of bootstrap 3.3.6, included in classic skin.
|
2016-05-03 13:51:06 -04:00 |
|
Isaac Connor
|
516bacdfd3
|
Merge branch 'updated-console' into storageareas
|
2016-05-03 13:38:57 -04:00 |
|
Kyle Johnson
|
a1b4869ee6
|
Add state modal to options view
|
2016-05-03 13:33:22 -04:00 |
|
Kyle Johnson
|
0a77da8a2f
|
Remove header from log view
|
2016-05-03 13:33:08 -04:00 |
|
Kyle Johnson
|
c2fd3dd84a
|
Also don't load additional JS to Log view
Another issue with mootools & jquery conflicts
|
2016-05-03 13:25:39 -04:00 |
|
Kyle Johnson
|
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
|
24bf91707f
|
Database module should really use DBI
|
2016-05-03 10:22:38 -04:00 |
|
Isaac Connor
|
e80db4c433
|
Use zmDbConnect instead of duplicated db connect code
|
2016-05-03 10:22:16 -04:00 |
|
Isaac Connor
|
49e3d3be7a
|
Turn the config loading code from a BEGIN to a function that could be called repeatedly.
|
2016-05-03 10:21:50 -04:00 |
|
Isaac Connor
|
9406a2337f
|
Add a BEGIN section to load things in the correct order.
|
2016-05-03 10:21:01 -04:00 |
|
Isaac Connor
|
2ba18e14fc
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-03 09:05:36 -04:00 |
|
Isaac Connor
|
30f34a6f49
|
instead of code duplication for opening the db, use zmDbConnect everywhere
|
2016-05-03 08:59:40 -04:00 |
|
Isaac Connor
|
55d58a140e
|
instead of code duplication for opening the db, use zmDbConnect everywhere
|
2016-05-03 08:57:51 -04:00 |
Isaac Connor
|
01aa2c9319
|
change permissions to stream permissions for view
|
2016-05-02 19:48:24 -04:00 |
|
Isaac Connor
|
e53bd1292e
|
increase events list width to accomodate thumbnails
|
2016-05-02 14:30:54 -04:00 |
|
Isaac Connor
|
240d08133d
|
implement caching of scaled images.
|
2016-05-02 14:12:30 -04:00 |
|
Isaac Connor
|
fe63e4af80
|
remove extra semi colon
|
2016-05-02 13:42:42 -04:00 |
|
Isaac Connor
|
550fdc9295
|
change thumbnail path to specify eid and fid instead of path to the jpg.
|
2016-05-02 13:42:15 -04:00 |
|
Isaac Connor
|
b8c8ff3807
|
fix if structuring
|
2016-05-02 13:36:19 -04:00 |
Isaac Connor
|
5321fe35bd
|
Merge pull request #1321 from SteveGilvarry/ffmpeg3_deprecation
FFMPEG 3.0 deprecation fixes
|
2016-05-02 12:44:16 -04:00 |
|
Isaac Connor
|
341ebc7b45
|
Merge branch 'master' into bind_fixes
|
2016-05-02 12:39:55 -04:00 |
|
Isaac Connor
|
b38aa60209
|
fix height of function popup
|
2016-05-02 11:56:42 -04:00 |