Commit Graph

483 Commits

Author SHA1 Message Date
Isaac Connor d3cc4d589f Remove the parseFilter etc calls from getNavBarHTML code which was used to populate the filter link with the currently viewed events list. I think we can do this better with saving it to the sesssion or similar. 2020-08-16 13:04:42 -04:00
Andrew Bauer 1c558b66e7 add font-awesome stylesheet 2020-08-15 15:44:54 -05:00
Andrew Bauer 45fde13535 rough in new events view 2020-08-15 15:27:58 -05:00
Isaac Connor c674cb7b55 Move the dropdown id's to the a element where they should be. Remove duplicated id on storage_dropdown. 2020-08-13 12:39:51 -04:00
Andrew Bauer 15005a2f17
fix typo 2020-08-09 14:25:11 -05:00
Andrew Bauer d0e7443a3c rough in update reminder dropdown 2020-08-09 14:18:44 -05:00
Andrew Bauer b22f12dadb rough in new zmversion widget 2020-08-09 12:20:11 -05:00
Andrew Bauer fd4b9ba4f4 move jquery in functions.php to skin.js 2020-08-08 12:06:57 -05:00
Andrew Bauer 96bd6397c6 eslint nanny 2020-08-08 10:38:58 -05:00
Andrew Bauer 3792043707 implement bw widget as dropdown 2020-08-08 10:07:26 -05:00
Isaac Connor 97096d87f9 Add mx-2 classes to be consistent 2020-08-04 18:06:49 -04:00
Isaac Connor 5b8ff10a34 style the storage dropdown better using css. rename it from dropdown01 to dropdown_storage. Put the text-warning class on the a content in the dropdown instead of the dropdown nav-item so that it takes effect. Rename Stor to Storage 2020-08-04 17:53:39 -04:00
Isaac Connor 79c9671ef2 Use & instead of & in urls 2020-08-04 17:05:33 -04:00
Isaac Connor 82542c569c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-04 10:47:41 -04:00
Isaac Connor 6e9559df53 Put xhtmlHeaders in an ob_start ob_get_clean section so that calls to open session in view js php files don't cause a problem. Basically delay output. Fixes problems with logging in redirect. Also need to global cspNonce since we use it. 2020-08-04 10:47:37 -04:00
Andrew Bauer a575b16278
set a target to about menu items 2020-08-03 15:45:27 -05:00
Andrew Bauer 9d88f8ee73 implement zm about menu 2020-08-03 15:22:46 -05:00
Isaac Connor 283d8557e6 remove the extra(globals). There are a LOT of globals. WE don't seem to actually use any in this function. 2020-08-03 12:50:36 -04:00
Andrew Bauer a3e6fe5522 make the eslint nanny happy 2020-08-03 11:47:31 -05:00
Andrew Bauer ce810320a2
bump right margin on storage widget 2020-08-03 11:02:30 -05:00
Andrew Bauer 8a711245f6 fix previous corrupted commit 2020-08-03 10:49:45 -05:00
Andrew Bauer c1f37192b9 implement storage widget as dropdown 2020-08-03 10:43:24 -05:00
Isaac Connor ece625e376 Remove the code that cleans the log on each page request. it was moved to zm_stats.pl. Accessing the log is kinda heavy, so should be done in background tasks, not interactively 2020-08-03 11:16:01 -04:00
Isaac Connor a2958fe288 Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin 2020-08-03 10:57:08 -04:00
Andrew Bauer 0ecb1621ce add colorized log icon to widget bar 2020-08-02 14:49:19 -05:00
Andrew Bauer a937e14899 put the optional banner in its own navbar 2020-08-02 13:48:15 -05:00
Andrew Bauer 2b29a7983a clean up navbar background refresh 2020-08-02 13:01:20 -05:00
Andrew Bauer b746cf6a56
add id and output html string rather than echo
This sets up all the items on the navbar as reconfigurable, via javascript replaceWith
2020-08-02 11:31:36 -05:00
Isaac Connor 037b696be0 Fix duplicate class attributes on navbar links 2020-08-02 12:05:52 -04:00
Andrew Bauer e768beaef2
fix whitespace 2020-08-01 16:20:51 -05:00
Andrew Bauer ad3b5a5aa3 call ob_start and ob_get_clean correctly 2020-08-01 16:16:23 -05:00
Andrew Bauer b746901ee7 close the dropmenu on any click 2020-08-01 10:57:13 -05:00
Andrew Bauer 8b3917d707 reapply navbar reload logic 2020-08-01 09:07:21 -05:00
Andrew Bauer b6c0274b2c implement collapsed navbar 2020-07-31 16:03:37 -05:00
Andrew Bauer cd96994a56 update getZMVersionHTML 2020-07-31 07:31:40 -05:00
Andrew Bauer 2699fa0313
force menubar to the top of the navbar 2020-07-30 16:56:38 -05:00
Andrew Bauer 8bb30bb6d4 add framework for new navbar selection 2020-07-30 16:44:58 -05:00
Andrew Bauer 561c44ece2 add runtimeStatus function 2020-07-30 16:14:41 -05:00
Andrew Bauer 23596b142d fix how we finish up getNavBarHTML 2020-07-30 11:55:54 -05:00
Andrew Bauer 4bf7093ff1
align account circle with status button 2020-07-29 15:47:46 -05:00
Andrew Bauer 1119923c38
Update functions.php 2020-07-29 15:26:07 -05:00
Andrew Bauer 695da2221f
Update functions.php 2020-07-29 15:20:44 -05:00
Andrew Bauer 4c242ef973
what a difference a single space makes 2020-07-29 15:09:47 -05:00
Andrew Bauer 9f1901e413
fix typo 2020-07-29 14:42:06 -05:00
Andrew Bauer 853a5728f8 align navbar logo and run status vertically 2020-07-28 12:20:18 -05:00
Andrew Bauer 85dec6194d when maxmimize, rebuild jqeury chosen fields 2020-07-28 08:38:06 -05:00
Andrew Bauer 47b35e97fb implement minimize chevron for filterbar 2020-07-27 16:14:15 -05:00
Isaac Connor ca07602414 fix html structure when not logged in. Move version class down to where we use it. add parenthesis to quiet php deprecation errors 2020-07-27 12:15:37 -04:00
Andrew Bauer cec5d7ea06 w-100 class not needed 2020-07-27 10:22:23 -05:00
Andrew Bauer ffa3415318 when collapsed, force the menu button to the right 2020-07-27 10:13:02 -05:00
Andrew Bauer bc19ae604a fix alignment of top navbar 2020-07-27 09:18:02 -05:00
Andrew Bauer 941c074a8e add carriage returns to generated html for readability 2020-07-26 10:50:32 -05:00
Andrew Bauer 6486f59383 fix colorization of navbar widgets 2020-07-26 10:41:05 -05:00
Isaac Connor 3ec7952c31 apply cache_busting to bootstrap, overlay anda reset 2020-07-25 15:05:12 -04:00
Isaac Connor 4af343e833 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-25 14:28:32 -04:00
Isaac Connor e3b339e72e add missing globals 2020-07-25 14:28:26 -04:00
Andrew Bauer c48fa83c6d upgrade to bootstrap 4.5 2020-07-25 13:18:09 -05:00
Andrew Bauer bda7e1a2b7 minor cleanup of getNavBarHTML 2020-07-23 12:52:21 -05:00
Andrew Bauer e9323f96a5 additional cleanup of getNavBarHTML 2020-07-23 10:52:12 -05:00
Andrew Bauer 062ae675c8 partial cleanup of getNavBarHTML 2020-07-22 13:12:59 -05:00
Isaac Connor 23900cbf01 fix 2020-05-21 13:34:09 -04:00
Isaac Connor 59c08410c1 Put the size of SHM in the title of the shm space used element 2020-05-21 13:32:33 -04:00
Isaac Connor 6dbc917215 Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha 2020-05-01 13:24:47 -04:00
Isaac Connor e960e638b3 Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets 2020-05-01 13:07:29 -04:00
Isaac Connor bd7475a450 use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working 2020-05-01 13:06:15 -04:00
Isaac Connor 830929a85f Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets 2020-05-01 12:53:47 -04:00
Isaac Connor 0ed6cb7875 Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets 2020-05-01 10:06:41 -04:00
Dvanderploeg 1d618136c0
Merge branch 'master' into camera_control_preset_correction 2020-04-30 22:10:54 -06:00
David van der Ploeg a952984e1c Removed value causing preset not to work
The first value field would not permit the presetGoto
command to be added as a value. The value would then use
the number as the command. Removing it allows the presets to
call the correct command.
2020-04-30 22:05:48 -06:00
Isaac Connor e78b718168 use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working 2020-04-29 16:32:26 -04:00
David van der Ploeg 83b4b6b4db Corrected zoom out button call
The zoom out button wasn't calling the correct function
of "data-on-click-this" causing the request to be ignored.
2020-04-27 21:14:58 -06:00
Isaac Connor 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
Isaac Connor 8be08d942a Scale must be an integer value so use '0' instead of auto 2020-04-23 17:40:42 -04:00
Isaac Connor 96774bd038 fix inline javascript in ptz buttons 2020-04-23 15:39:31 -04:00
Isaac Connor e770be2e13 Merge branch 'release-1.34' 2020-04-23 10:26:16 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 365f0240ad fix inline javascript in ptz buttons 2020-04-10 11:30:30 -04:00
Isaac Connor 571ff260cc Merge branch 'release-1.34' 2020-04-04 16:35:09 -04:00
Isaac Connor 2441ae2924 Improve event export a little bit. Add links to eventFrames and eventDetail html. 2020-04-03 15:34:20 -04:00
Isaac Connor ef9fbac90c Add Noscript warnings. Whitespace, improve some logic 2020-04-02 18:14:14 -04:00
Isaac Connor b482993d33 Merge branch 'release-1.34' 2020-03-06 15:04:48 -05:00
Isaac Connor ac00ca0ad8 Only list enabled Storage Areas 2020-03-04 10:46:59 -05:00
Isaac Connor 76131d1887 Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style. 2020-03-01 11:07:31 -05:00
Isaac Connor 638e333702 Scale must be an integer value so use '0' instead of auto 2020-02-25 11:13:20 -05:00
Isaac Connor 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
zlodag a8615c1c85 fixed bug in control functions where left arrow panStep was inverted 2020-02-16 11:41:14 +13:00
Isaac Connor 137bdb1f24 Make shm have error or warning class if full 2020-02-10 14:20:46 -05:00
Isaac Connor 6c7f003198 revert bogus change not including skin.js 2020-01-18 16:08:55 -05:00
Isaac Connor 5b8e5eb349 don't output duplicated js when css=base 2020-01-17 14:51:02 -05:00
Alex Porosanu 28a4bef6ba fix tar invocation for *BSD platforms
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
2020-01-09 22:03:02 +02:00
Isaac Connor 2f1b725ee4 quote SQL for mysql8 2020-01-07 11:01:02 -05:00
Isaac Connor 2c76c12664 Fix export to include files when using DEEP scheme. Also make it more efficient 2019-12-30 22:18:55 -05:00
Isaac Connor 845f35fe00 Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name() 2019-12-26 15:57:25 -05:00
Isaac Connor 18ed90d147 remove second hit to db to load storage areas with no serverid 2019-12-13 17:47:51 -05:00
Isaac Connor d39193cb6b convert flip to material icons 2019-12-02 12:33:13 -05:00
Isaac Connor d1b086ddc6 fix cases of monitor->CanZoom to control->CanZoom 2019-10-08 18:49:11 -04:00
Isaac Connor 393f0a369c Revamp timeline. Make it handle being full browser width. remove onclicks. 2019-09-28 14:23:23 -04:00
Isaac Connor a8cbe7d10d Turn off debug 2019-09-20 10:36:50 -04:00
Isaac Connor 4c206c2e9a Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions 2019-09-19 14:55:17 -04:00