Isaac Connor
|
2451768295
|
Merge branch 'master' into storageareas
|
2016-08-08 18:08:46 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
9a1b0b79b9
|
don't use a dropdown for montage, etc
|
2016-05-13 11:43:38 -04:00 |
Isaac Connor
|
85f950d80a
|
put jquery into no conflict mode so it doesn't overwite mootools use of $
|
2016-05-13 09:45:24 -04:00 |
|
Isaac Connor
|
ae40dc8b1b
|
revert to fixed navbar
|
2016-05-07 18:11:58 -04:00 |
|
Isaac Connor
|
dcdefac48a
|
fix styles in header, move footer back into header
|
2016-05-06 16:08:32 -04:00 |
|
Isaac Connor
|
52b4e98e5a
|
fixes
|
2016-05-06 15:53:19 -04:00 |
|
Isaac Connor
|
daf10c1b84
|
make displayMonitors global
|
2016-05-06 15:44:35 -04:00 |
|
Isaac Connor
|
fb1b8000ec
|
fix the use of when specifying a skin
|
2016-05-06 15:24:20 -04:00 |
|
Isaac Connor
|
5d8eeb5b56
|
deprecate header, just the getNavBarHTML function
|
2016-05-06 15:16:48 -04:00 |
|
Isaac Connor
|
ed5cb2f3ed
|
fix global language problems
|
2016-05-06 14:58:41 -04:00 |
|
Isaac Connor
|
956b971719
|
put back maxWidtha nd maxHeight
|
2016-05-06 14:39:48 -04:00 |
|
Isaac Connor
|
829202b42a
|
move more eventcounting stuff to console.php.
|
2016-05-06 14:38:08 -04:00 |
|
Isaac Connor
|
1d673a0b8c
|
move header into a function in functions.php. Move event population into console.php
|
2016-05-06 14:30:32 -04:00 |
|
Isaac Connor
|
d5f1519829
|
Can't externally reference .js.php, they have to be inline js
|
2016-05-06 12:40:23 -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 |
|
Kyle Johnson
|
f2d43de137
|
Revert "Include Chart.js"
This reverts commit 33d6d311b0.
Didn't mean to add this code in yet. For a future feature.
|
2016-04-24 00:52:19 -04:00 |
|
Kyle Johnson
|
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 |
|
Kyle Johnson
|
33d6d311b0
|
Include Chart.js
|
2016-04-02 00:48:58 -04:00 |
|
Kyle Johnson
|
8fdf3291b4
|
Load jquery and bootstrap js in classic skin
|
2016-03-16 00:49:51 -04:00 |
|
Kyle Johnson
|
d01ef25f82
|
Update doctype to html5, and add additional meta tags
|
2016-03-16 00:17:05 -04:00 |
|
Kyle Johnson
|
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 |
|
Kyle Johnson
|
c9441ec8c0
|
Local copy of bootstrap 3.3.6, included in classic skin.
|
2016-03-12 01:16:19 -05:00 |
|
Isaac Connor
|
013009f127
|
fix the css .js file name
|
2015-05-01 16:50:29 -04:00 |
|
Isaac Connor
|
91737eb28b
|
also reference a js file with the name of the chosen css. This is so that we can use different popup window sizes for flat because it's text and buttons are so much larger.
|
2015-05-01 16:03:40 -04:00 |
SteveGilvarry
|
e87e69fa57
|
Ran script to replace all Short open tags
|
2014-12-05 10:44:23 +11:00 |
|
Isaac Connor
|
53b70d27fb
|
Use the global variable which gets setup in web/index.php to look in a subdirectory of web/skins/classic/css to find the css files.
|
2014-11-26 11:18:03 -05:00 |
stan
|
3a399378b2
|
Fixed problem with link to overlay css file
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3485 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-07-27 16:09:09 +00:00 |
|
stan
|
6ff385e407
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-06-21 09:19:10 +00:00 |
|
stan
|
6fc7acb378
|
Changed query separator to & and added CDATA wrapper.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2981 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-10-16 17:04:44 +00:00 |
|
stan
|
e0801bc216
|
Updated to use mootools 1.2.3
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2978 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-10-14 17:38:13 +00:00 |
|
stan
|
7b4c0fa926
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-03-27 16:01:59 +00:00 |
|
stan
|
ef8f7b85fd
|
Continuing development and bugfixes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-09-26 09:47:20 +00:00 |
|
stan
|
106882c161
|
Updated copyright notices
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-25 09:48:16 +00:00 |
|
stan
|
d83525cf76
|
New paths to mootools and favicon. Reset.css not just screen media.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2557 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-16 13:18:05 +00:00 |
|
stan
|
2824cb7355
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-14 13:54:50 +00:00 |