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
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
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
33d6d311b0
Include Chart.js
2016-04-02 00:48:58 -04:00
315fb3e857
Add sidebar and top nav to Monitors popup view
2016-04-01 15:52:52 -04:00
f59ed9cf0d
clean up options a bit more
2016-04-01 14:39:15 -04:00
92e0552f8e
Add side tab list to options page, and style it.
2016-04-01 14:02:19 -04:00
8c5d309feb
Add header to log view
2016-04-01 13:44:37 -04:00
fa3425f2b0
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
2016-04-01 13:43:26 -04:00
757740ede5
Move skin and css changing up above the include of header.php so that the set cookie call will work
2016-03-23 16:12:51 -04:00
dd06db0bf0
remove duplication
2016-03-23 15:54:20 -04:00
dd937f7732
Restyle the header. Full width, dark background, collapseable.
2016-03-16 00:51:13 -04:00
8fdf3291b4
Load jquery and bootstrap js in classic skin
2016-03-16 00:49:51 -04:00
53d0e1c8df
Add local copy of bootstrap.js 3.3.6
2016-03-16 00:45:34 -04:00
d01ef25f82
Update doctype to html5, and add additional meta tags
2016-03-16 00:17:05 -04:00
6f409f0bf4
Make the ZM logo in header stand out
2016-03-15 23:53:29 -04:00
897a0a995c
Convert options layout to side-tabs, and improve readability
2016-03-15 15:21:28 -04:00
87932002cf
Push the options page down a bit to make tab look better
2016-03-15 14:45:40 -04:00
183f58ad17
Restyle options view with horizontal form layout
2016-03-15 14:43:22 -04:00
694ad0b539
Add styling to delete / save / add buttons in options.php
2016-03-15 14:08:01 -04:00
bd30d40522
Remove cancel button from options as it no longer makes sense.
2016-03-15 14:03:17 -04:00
0004a1180e
Update options.php to use bootstrap container
2016-03-15 13:56:54 -04:00
26748c2de5
Oops. Move Console view outside of canView(system) restriction
2016-03-15 13:52:36 -04:00
f05c1548ce
Add a link back to console in header
2016-03-15 13:49:14 -04:00
299c61c1ec
Make the Options link a standard href (not a popup).
2016-03-15 13:47:31 -04:00
8070bf8700
Move console php code to header as that code is now needed in additional views.
2016-03-15 13:46:03 -04:00
49f46ac927
Move the header into its own file, and include it in options view.
2016-03-15 13:43:49 -04:00
8acfe1b0d8
Update options styling
2016-03-12 22:44:11 -05:00
2378c9a359
Fix state link to do popup like before
2016-03-12 20:44:42 -05:00
d202760d82
Additional footer padding
2016-03-12 20:37:07 -05:00
f5ba52824a
Add styles to additional console buttons
2016-03-12 20:36:39 -05:00
a2c2101c48
Remove extra #footer styling
2016-03-12 20:28:16 -05:00
f80cbf52df
Bump up the default font size
2016-03-12 20:27:51 -05:00
bebb1017fd
Wrap footer in container-fluid
2016-03-12 20:27:22 -05:00
5e2d4bc325
Restyle of Login page.
2016-03-12 20:11:32 -05:00
a403c1db8c
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-03-12 19:14:07 -05:00
71c35e712b
Initial major restyle of classic skin.
2016-03-12 03:28:02 -05:00
c9441ec8c0
Local copy of bootstrap 3.3.6, included in classic skin.
2016-03-12 01:16:19 -05:00
Kyle Johnson
Isaac Connor