4777808cf0
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-08 13:15:41 -05:00
95cfdb327d
further separate addBtn and cloneBtn, fixes
2018-02-08 13:15:27 -05:00
c47c81b810
title is translated, so we can't use it to determine which page we are on, so use view
2018-02-08 09:29:42 -08:00
058b2be9a7
fix chosen sprites
2018-02-02 13:26:44 -05:00
e8ace6d4dd
include base version of jquery-ui-theme
2018-02-02 12:47:51 -05:00
4b37c6fc42
Change the Group dropdown to a single indented dropdown, and use chosen on it
2018-01-12 11:25:15 -08:00
b013da6b95
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
2018-01-11 13:14:11 -05:00
399907a9f0
Always load a base css style. Only show navbar contents when logged in, so we can use it on the login page
2018-01-11 10:57:07 -05:00
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
c6bf502ee7
only show each Storage area if there are less than 4.
2017-12-22 11:39:27 -08:00
148e21d707
fugro
2017-12-21 21:46:21 -05:00
a091153929
Use seperate structure and theme jquery ui
2017-12-16 20:04:12 -05:00
d7532b0340
Add dateTime picker to filter
2017-12-15 22:57:42 -05:00
c0fcfe6eb6
Combine possible sort inputs to one in sortQuery, output limitQuery
2017-12-15 08:47:08 -05:00
e192d664fd
WIP pass sort and limit
2017-12-15 08:47:07 -05:00
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
6974c847e5
Fix controlcss
...
Missing viewCssFileExtra
2017-12-10 09:37:16 -05:00
7db790ec7b
Fix dom filling up with comments
2017-12-07 12:54:22 -05:00
43bba23735
Fix filteradd complaining
2017-12-06 10:36:37 -05:00
7a188a84f7
Add montagereview filter passing
...
montagereview now accepts any appropriate filters
2017-12-02 12:29:55 -05:00
6d6b4366de
Fix MontageReview filters
2017-12-02 12:29:54 -05:00
1289269e6f
Change filter to work without popup
2017-12-02 12:28:04 -05:00
53f886edc4
Make navbar refresh not change header links
2017-12-01 22:15:29 -05:00
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
09938ef7ee
join the echo's into 1 to also get the line breaks
2017-11-03 09:24:13 -04:00
e6918cd1bd
implement crude cache busting code for .js and .css files
2017-11-01 09:41:19 -04:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
c363b5a190
fix some missing break lines in output
2017-10-17 10:10:20 -07:00
ffc1ac43f5
put back disk space in header, more debug in caching storagea
2017-10-10 14:06:21 -04:00
31e3a2d28d
turn off disk space reporting
2017-10-10 10:41:04 -07:00
3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
d4cf84f7e6
Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
...
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
6c87ed10c1
add a notice when javascript is turned off
2017-10-04 21:51:30 -04:00
ea4b9486aa
alarmCues CSS
...
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
72ca011e2f
fix favicon
2017-10-02 13:05:23 -04:00
351d8ef24d
make the word bandwidth also be part of the link
2017-10-02 12:39:39 -04:00
c7ac854cfd
always include classic.js
2017-10-02 12:30:55 -04:00
b52944258d
use css skin based favicon if it exists.
2017-10-02 11:55:36 -04:00
15ba7d2a35
fixes
2017-10-02 11:25:51 -04:00
eaf29d2024
add a class to the active view link to highlight it
2017-10-02 09:02:57 -04:00
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00
4e16523cff
Say Groups instead of listing the # of monitors in the header
2017-09-23 13:41:52 -04:00
f294acde92
add global and for including the state view
2017-07-13 10:07:23 -04:00
22e957ba46
clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100%
2017-07-12 12:49:01 -04:00
0adc14da4e
fix links to Filter and Devices
2017-07-12 11:17:07 -04:00
5df4494c6c
make Filters a main window view instead of a popup
2017-06-20 09:08:57 -04:00
8145f2bc4c
whitespace
2017-06-15 12:13:40 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
175e6921f9
use version-generic urls to jquery and jquery-ui
2017-06-07 14:13:03 -04:00
b4bdc1fd6b
Merge branch 'master' into dragndrop_monitor_sorting
2017-06-06 20:39:58 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
07835969f1
get rid of viewport line that prevents zooming in and out
2017-06-04 17:31:17 -04:00
ece10d6278
braces and whitspace
2017-05-31 11:16:55 -04:00
e2df0b74d4
remove including state.js.php as it has nothing to do with this pr
2017-05-29 09:51:31 -04:00
7cfa0b12ec
Merge branch 'dragndrop_monitor_sorting' into storageareas
2017-05-25 15:26:04 -04:00
aacfea735e
always include bootstrap, and include jquery
2017-05-25 15:00:44 -04:00
f4008e2c6a
Merge branch 'master' into storageareas
2017-05-19 11:20:33 -04:00
f851daca68
merge code to load video.js etc on Event view
2017-05-18 15:10:13 -04:00
bde887fc9c
remove unneeded ;'s
2017-05-05 17:17:55 -04:00
9482114f95
add db connections to the header
2017-04-28 14:17:09 -04:00
83ba74ad66
work in progress, rough in adding the svg zones to montage
2017-04-24 11:11:54 -04:00
035b464b97
Revert "don't use external hosted video.js or moment.js"
...
This reverts commit fb2f8022a7
2017-04-20 10:45:51 -04:00
fb2f8022a7
don't use external hosted video.js or moment.js
2017-04-20 10:12:47 -04:00
7b73eb350f
update to current.
2017-02-02 12:15:16 -05:00
6f6eacaa72
fixup classic and dark skins
2017-01-30 21:45:48 -05:00
89022fff0c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-30 21:16:26 -05:00
f3378207c0
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
2017-01-30 21:16:21 -05:00
ad2e00166a
use isset
2017-01-30 19:53:08 -05:00
4543b3e1b1
include jquery-ui instead of using a cdn version
2017-01-30 19:17:14 -05:00
19aed3f860
dont check ZM_DIR_EVENTS if it already exists in storageareas
2017-01-30 17:29:15 -05:00
fdd71a826a
implement dragndrop sorting
2017-01-23 10:12:57 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
2adb17ad90
fix type
2016-11-29 15:25:24 -05:00
3b7723ee8f
Merge branch 'master' into storageareas
2016-11-11 22:40:00 -05:00
3916b02a74
Only load bootstrap css in specific views.
...
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
2016-11-10 23:07:52 -07:00
97fb53e95c
Remove extra php tag in functions.php
2016-11-10 21:49:57 -07:00
3e3956f45d
Update doctype to HTML5, add meta tags for mobile browsers
2016-11-10 21:47:53 -07:00
eacf6cd415
Restyle login page, move recaptcha js to <head>
...
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
1607ae1210
Load bootstrap css
2016-11-10 21:45:46 -07:00
cb69d1a693
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2016-11-03 14:57:29 -04:00
2f22eb5a8c
fix error when only 1 monitor is listed
2016-11-03 09:41:54 -04:00
ca69a79bed
fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist.
2016-10-27 17:05:33 -04:00
f153e9b8fb
MontageReview should only be visisble to people who can view events. Fix running state
2016-10-20 13:38:12 -04:00
67e14bd12f
move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me.
2016-10-20 13:16:50 -04:00
b00588b6ff
add back montagereview
2016-10-11 17:35:41 -04:00
5ce2e95fb7
replace getDiskPercent call with code to show percent for all storageareas
2016-09-20 12:18:50 -04:00
c74af40ffb
Had file open with old stuff. Fixed now.
2016-09-17 02:20:17 +10:00
aee6ae956d
Moved '%' to getDiskPercent() where it should have been.
2016-09-17 02:13:33 +10:00
2c21fe80e7
Merge pull request #1626 from bhaal2/storageareas
...
Storageareas
2016-09-15 10:18:11 -04:00
76beaf281a
Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas.
2016-09-15 19:44:13 +10:00
a0eaea00a5
fix relative paths to jquery and bootstrap fixes #1618
2016-09-14 10:06:15 -04:00
0bc50810de
only add the development h3 if it has contents, otherwise it pushes the header size down
2016-09-13 10:25:49 -04:00
09ebcfb7f8
only put in the development h3 tag if the value has been set
2016-08-22 11:42:44 -04:00
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -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
9a1b0b79b9
don't use a dropdown for montage, etc
2016-05-13 11:43:38 -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
ae40dc8b1b
revert to fixed navbar
2016-05-07 18:11:58 -04:00
dcdefac48a
fix styles in header, move footer back into header
2016-05-06 16:08:32 -04:00
52b4e98e5a
fixes
2016-05-06 15:53:19 -04:00
daf10c1b84
make displayMonitors global
2016-05-06 15:44:35 -04:00
fb1b8000ec
fix the use of when specifying a skin
2016-05-06 15:24:20 -04:00
5d8eeb5b56
deprecate header, just the getNavBarHTML function
2016-05-06 15:16:48 -04:00
ed5cb2f3ed
fix global language problems
2016-05-06 14:58:41 -04:00
956b971719
put back maxWidtha nd maxHeight
2016-05-06 14:39:48 -04:00
829202b42a
move more eventcounting stuff to console.php.
2016-05-06 14:38:08 -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
d5f1519829
Can't externally reference .js.php, they have to be inline js
2016-05-06 12:40:23 -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
f2d43de137
Revert "Include Chart.js"
...
This reverts commit 33d6d311b0
2016-04-24 00:52:19 -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
33d6d311b0
Include Chart.js
2016-04-02 00:48:58 -04:00
8fdf3291b4
Load jquery and bootstrap js in classic skin
2016-03-16 00:49:51 -04:00
d01ef25f82
Update doctype to html5, and add additional meta tags
2016-03-16 00:17:05 -04: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
c9441ec8c0
Local copy of bootstrap 3.3.6, included in classic skin.
2016-03-12 01:16:19 -05:00
013009f127
fix the css .js file name
2015-05-01 16:50:29 -04:00
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
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
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
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
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
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
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
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
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
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
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
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
Isaac Connor
Isaac Connor
Isaac Connor
digital-gnome
Isaac Connor
Isaac Connor
Andy Bauer
Isaac Connor
Kyle Johnson
bhaal2
SteveGilvarry
stan