941c074a8e
add carriage returns to generated html for readability
2020-07-26 10:50:32 -05:00
6486f59383
fix colorization of navbar widgets
2020-07-26 10:41:05 -05:00
3ec7952c31
apply cache_busting to bootstrap, overlay anda reset
2020-07-25 15:05:12 -04:00
4af343e833
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-25 14:28:32 -04:00
e3b339e72e
add missing globals
2020-07-25 14:28:26 -04:00
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -05:00
bda7e1a2b7
minor cleanup of getNavBarHTML
2020-07-23 12:52:21 -05:00
e9323f96a5
additional cleanup of getNavBarHTML
2020-07-23 10:52:12 -05:00
062ae675c8
partial cleanup of getNavBarHTML
2020-07-22 13:12:59 -05:00
23900cbf01
fix
2020-05-21 13:34:09 -04:00
59c08410c1
Put the size of SHM in the title of the shm space used element
2020-05-21 13:32:33 -04:00
cf3785aebf
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-04-24 12:23:48 -04:00
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
543628d0ee
cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail
2020-04-21 09:20:04 -04:00
3e8de7dd6c
Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918
2020-04-21 08:30:42 -04:00
ac00ca0ad8
Only list enabled Storage Areas
2020-03-04 10:46:59 -05:00
d0a8d241d2
Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849
2020-02-24 13:13:54 -05:00
137bdb1f24
Make shm have error or warning class if full
2020-02-10 14:20:46 -05:00
6c7f003198
revert bogus change not including skin.js
2020-01-18 16:08:55 -05:00
5b8e5eb349
don't output duplicated js when css=base
2020-01-17 14:51:02 -05:00
2f1b725ee4
quote SQL for mysql8
2020-01-07 11:01:02 -05:00
18ed90d147
remove second hit to db to load storage areas with no serverid
2019-12-13 17:47:51 -05:00
d39193cb6b
convert flip to material icons
2019-12-02 12:33:13 -05:00
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
38a09bbd18
Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas
2019-08-08 15:34:07 -04:00
46032385fe
fix viewport on mobile. Fix duplicated css when selected css is base
2019-06-22 14:10:55 -04:00
1749a7a4f9
fix extra closing button tag in shutdown button. Add a newline after each Storage group to make the code easier to read
2019-06-10 15:57:53 -04:00
7445f5588f
show storage when there are 4 areas. Used to only do it for < 4
2019-05-31 11:01:09 -04:00
07d4310466
Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path
2019-05-29 08:40:48 -04:00
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
6a250d61e3
cache_bust logger.js and overlay.js
2019-04-26 10:25:32 -04:00
7b98dcbb94
but the shutdown icon in a navbar-txt
2019-04-12 13:08:58 -04:00
d7747b3385
add a shutdown power button to the navbar
2019-04-12 09:37:14 -04:00
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
c7e09e03d3
add cache busting to base.js
2019-03-25 16:24:46 -04:00
ad059f985e
spacing
2019-03-20 14:27:23 -04:00
fa124eb29a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-03-05 14:35:15 -05:00
7b7a58b2f1
remove old xhtml-isms
2019-03-05 14:33:03 -05:00
ff8c5c5db8
remove debug
2019-03-01 17:28:00 -05:00
2d75ab50af
Implement deleting from Logs based on line count instead of interval
2019-02-28 16:12:34 -05:00
a1f1c19c0f
fix missing ZM namepsace
2019-02-27 11:07:52 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
34873d5636
We must leave ZM_HOME_CONTENT unescaped so that we can insert actual html like image tags
2019-02-16 11:50:09 -05:00
b6a0e704d2
whitespace, remove xhtml cruft
2019-02-12 16:41:08 -05:00
2f301cf5fe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-02-12 13:18:08 -05:00
5b9bb93703
fix navbar auth
2019-02-12 13:17:55 -05:00
f95e9c0363
Fix comment about hiding navbar ( #2521 )
...
Fixes #2520
2019-02-11 17:14:33 -05:00
40e0019267
fix all the nav missing when a users Monitors Permission is None
2019-02-11 14:15:24 -05:00
6af2c4ad0e
Escape output of WEB_TITLE, HOME_URL, HOME_CONTENT, & WEB_CONSOLE_BANNER. Fixes #2468
2019-02-09 18:06:21 -08:00
604dbf8776
fix state changing/etc
2019-01-30 14:36:46 -05:00
a1a42345e3
More eslint fixes; eslint in php; add eslint to travis ( #2419 )
...
* Add eslint to travis.yml
* Update eslint package versions and apply new indent rules
* Enable the brace-style and block-style eslint rules
* Enable the 'curly' eslint rule
* Enable the 'keyword-spacing' eslint rule
* Enable the 'key-spacing' eslint rule
* Enable the 'object-curly-spacing' eslint rule
* Enable the 'no-new-object' eslint rule
* Only disable the no-caller eslint rule in the one affected file
* Enable the 'no-unused-vars' eslint rule for local variables
* Add linting of JS in .php files
2019-01-19 10:32:40 -05:00
d33fec9c3f
Add a CSP script-src policy with nonce-source and convert more inline event handlers ( #2413 )
...
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy
* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'
Only handle ones that don't return a value.
* Use @data-on-click to attach inline click event handlers with no args and no return value
* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument
* Enforce a script-src CSP on views without inline JS
* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
083f284599
Replace onclick inline event handlers for createPopup ( #2410 )
...
* Move <script> before </body>
* Change makePopupLink to not use onclick
* Change makePopupButton to not use onclick
* Use .popup-link in control_functions.php
* Use makePopupButton in controlcaps.php
* Prevent double-encoding in makePopup*
* Use makePopupButton in devices.php
* Use makePopupButton in logout.php
* Use makePopupLink in monitor.php
* Use makePopupLink and .popup-link in montage.php
* Use makePopupButton in options.php
* Use makePopupButton, makePopupLink, and .popup-link in zones.php
2019-01-15 09:01:58 -05:00
4d7e98475f
Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML
...
Introduce get body top html
2018-12-11 09:35:54 -06:00
9ffd77428a
fix paths to jquery-ui-theme components, thereby upgrading them to the proper version. This fixes the datetime filters not being shown on skins that don't specify a custom theme for jquery-ui
2018-12-05 09:05:10 -05:00
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
d76d6bb9d1
include overlay.js when viewing the log, so that export works
2018-11-12 15:09:15 -05:00
702143e51b
Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top.
...
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.
This is a pretty quick, crude implementation.
2018-11-07 12:33:54 -05:00
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
031c96c71d
Merge branch 'master' into turn_off_navbar
2018-10-10 14:04:29 -04:00
a1ab0855db
if navbar=0 is given in the url, don't output the navbar
2018-10-10 14:02:46 -04:00
48e805c09f
Make header flips perisisent based on cookie
2018-10-10 13:11:27 -04:00
c5b23807a4
put back overlay.js for log view.
2018-09-23 10:51:46 -04:00
c66dd25ebb
implement collapsible headers ( #2203 )
2018-09-11 17:39:40 -04:00
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
ebe55cf6a4
Include new Server.js
2018-07-09 14:10:06 -04:00
015013f247
Center WEB_CONSOLE_BANNER
...
Center WEB_CONSOLE_BANNER under the server stats
2018-07-06 15:59:10 -05:00
db6bd67f59
just fix structure/spacing
2018-06-06 11:40:38 -04:00
acd6b5f4a9
limit the # of log lines deleted to 100 to limit the time spent there.
2018-04-30 14:33:41 -04:00
10a191ae5b
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
2018-04-17 14:14:40 -07:00
92cb7dabd5
merge some fixes from other branches
2018-04-17 08:48:59 -07:00
bb924ee078
add report_event_audit
2018-04-10 13:06:01 -07:00
2c85e5e4c6
remove unneccessary type tags.
2018-04-06 11:43:19 -04:00
bf57b65ebb
reduced 2nd row of navbar text
2018-03-25 09:56:41 -04:00
809e58fae6
acct icon to material
2018-03-25 09:44:30 -04:00
14f638e009
replaced ionic fonts with material design icons
2018-03-25 09:28:00 -04:00
a68cc79437
using MIT licensed ion-icons, its smaller than FA, replaced some text with icons
2018-03-24 18:25:39 -04:00
ad1b9699f1
Remove CssFileExtra
2018-02-11 14:18:40 -05:00
1ed8af8aac
upgrade jquery-ui to 1.12.1
2018-02-08 13:19:16 -05:00
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
Andrew Bauer
Isaac Connor
Andrew Bauer
Isaac Connor
timwsuqld
Matthew Noorenberghe
Andrew Bauer
Isaac Connor
Pliable Pixels
Isaac Connor
digital-gnome
Isaac Connor