Commit Graph

6452 Commits

Author SHA1 Message Date
Isaac Connor 325178a556 convert log filters to responsive bootstrap divs. 2020-08-02 20:25:24 -04:00
Isaac Connor 6f9947b583 Switch to jquery in login.js. We no longer include mootool for login view. 2020-08-02 19:12:07 -04:00
Andrew Bauer 3351a4de56
fix eslint 2020-08-02 15:33:10 -05: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 d6999f5628
iterate through keys in data 2020-08-02 13:33:25 -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 cfa2d13948 set samesite=Strict in session cookie 2020-08-02 12:06:13 -04:00
Isaac Connor 037b696be0 Fix duplicate class attributes on navbar links 2020-08-02 12:05:52 -04:00
Isaac Connor 68b7277784 Fix sizing of option name by removing the non-semantic elements and just specifying the styles
in css/base/views/option.css.  Alsoo apply h-100 to columns to that nav bar fills the vertical space.
2020-08-02 11:20:18 -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 81c4bfa7c2 stop Chrome complaining about bootstrap.min.css.map 2020-08-01 12:22:47 -05:00
Andrew Bauer b746901ee7 close the dropmenu on any click 2020-08-01 10:57:13 -05:00
Andrew Bauer 4851f1f940
remove errant text 2020-08-01 09:50:25 -05:00
Andrew Bauer 889b08519a
Set a small breakpoint on table-responsive
This fixes (ugly) horizontal scroll bars appearing at the bottom of the monitor table on larger screens, without breaking functionality on mobile devices. @roddone please test this on your mobile device
2020-08-01 09:49:27 -05:00
Isaac Connor b46d3b81d6 Update user view to use User class 2020-08-01 10:27:54 -04: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
Isaac Connor 366ce5b3eb Add 100% width to LabelFormat 2020-07-30 19:36:27 -04:00
Isaac Connor 3df58fc9db handle array args in daemonStatus 2020-07-30 19:36:05 -04: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
Isaac Connor 0a782814a7 Don't start filter if the command was execute 2020-07-30 17:13:30 -04:00
Isaac Connor 204086a56d spacing and quotes 2020-07-30 17:12:00 -04:00
Isaac Connor c2ac7ed4a9 spacing and escape sql fields 2020-07-30 17:07:43 -04:00
Isaac Connor 2cfa5fde98 Add missing view tempplates for zone add/edit. Fixes #2986 2020-07-30 16:54:00 -04:00
Isaac Connor d8cd4386cf rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
Use EncoderParams when setting movflags in VideoStore.

Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
Andrew Bauer 23596b142d fix how we finish up getNavBarHTML 2020-07-30 11:55:54 -05:00
Isaac Connor 6a4ce29bce eslint fixes 2020-07-30 12:15:05 -04:00
Andrew Bauer 68dcc05cce
force the options labels small
seems backwards, but the bootstrap 4 docs have <small> and <strong> tags rather than a css class
2020-07-30 09:11:39 -05:00
Andrew Bauer 6b303b67d0 continued adjustment of options view fields 2020-07-30 09:03:03 -05:00
Andrew Bauer 484051a191
adjust column widths on options 2020-07-30 08:23:25 -05:00
Isaac Connor aa3b48e7c0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-29 18:59:50 -04:00
Isaac Connor 5ac4677c02 Add missing view tempplates for zone add/edit. Fixes #2986 2020-07-29 18:59:44 -04:00
Isaac Connor b42eb44a79 handle when [fid] = 0; Fixes #2994 2020-07-29 18:51:11 -04:00
Isaac Connor 8e37efaa7a handle when [fid] = 0; Fixes #2994 2020-07-29 18:50:14 -04:00
Andrew Bauer 4bf7093ff1
align account circle with status button 2020-07-29 15:47:46 -05:00
Isaac Connor c4d4a73c2a json decoding errors shouldnt' be fatal 2020-07-29 16:41:37 -04:00
Isaac Connor 0139d06fcd Fix data-on-input-this using onchange instead of oninput 2020-07-29 16:41:27 -04:00
Isaac Connor 1508b82754 Fix data-on-input-this using onchange instead of oninput 2020-07-29 16:40:57 -04:00
Isaac Connor 4c5a88a822 json decoding errors shouldnt' be fatal 2020-07-29 16:40:31 -04: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 d285f2f998
adjust class name 2020-07-29 14:38:00 -05:00
Andrew Bauer ded0dbc4ae
shrink the vert nav items further 2020-07-29 14:00:44 -05:00
Andrew Bauer 32bbeb556f set the vert navbar bg color in base.css 2020-07-29 13:51:36 -05:00
Andrew Bauer 907063e385
use smaller font in form control item 2020-07-29 13:25:40 -05:00
Andrew Bauer fd5adc6623
remove blockquote from options.php
It makes the vertical navbar font unnaturally large
2020-07-29 12:49:32 -05:00
Andrew Bauer a6005f0b0d fix clor of options nav-pill active 2020-07-28 13:09:54 -05:00
Andrew Bauer 52d88e15fd let options span the full column 2020-07-28 12:45:25 -05:00
Andrew Bauer cf9eb405ee don't wrap the rows on small screens 2020-07-28 12:43:51 -05:00
Andrew Bauer 853a5728f8 align navbar logo and run status vertically 2020-07-28 12:20:18 -05:00
Andrew Bauer aa8662f311
fix copy/paste typo 2020-07-28 10:37:10 -05:00
Andrew Bauer b88f0c3991 display user:port@ip when controladdress is empty 2020-07-28 10:08:24 -05:00
Andrew Bauer 45f88ee04a float web console statusBreakdown left then down 2020-07-28 08:59:28 -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 767f5ebb03 navbar closes the form, and doesn't need to be in the form. 2020-07-27 12:40:46 -04:00
Isaac Connor 5d883d696b give a better error message when submitThisForm fails 2020-07-27 12:40:25 -04: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
Isaac Connor 1e76679820 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-26 22:33:34 -04:00
Isaac Connor 5f9c62f266 spacing and slightly improve nav item code in options 2020-07-26 22:33:29 -04:00
Isaac Connor 31cbfc35b1 fix use of is_callable so that we fix filter saving 2020-07-26 22:32:55 -04:00
Isaac Connor 003abfea29 Update class so that Submit button is hidden under new bootstrap 2020-07-26 22:32:36 -04: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
Andrew Bauer eaed5abcd3 add missing bootstrap.bundle.js.map 2020-07-25 16:56:17 -05:00
Isaac Connor 3ec7952c31 apply cache_busting to bootstrap, overlay anda reset 2020-07-25 15:05:12 -04:00
Isaac Connor c81e4a3bca fix 2020-07-25 14:32:30 -04:00
Isaac Connor 99d7aa0da0 fix 2020-07-25 14:31:57 -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
Isaac Connor e90efa7a7e spacing 2020-07-25 14:28:08 -04:00
Isaac Connor 4c8f96b786 Update saving action to use our ORM methods 2020-07-25 14:28:01 -04:00
Isaac Connor dda630f522 fix filter_regexp to remove trailing / 2020-07-25 14:27:09 -04:00
Isaac Connor 522dfecebe Fix setting values by checking is_callable. Remove debug. Fix filter_regexp 2020-07-25 14:26:49 -04:00
Andrew Bauer c48fa83c6d upgrade to bootstrap 4.5 2020-07-25 13:18:09 -05:00
Isaac Connor fe9db4cfa2 add filtering to Storage->Path() 2020-07-25 13:51:13 -04:00
Isaac Connor a819b73e18 allow filter_regexp to be an array 2020-07-25 13:50:59 -04: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
Isaac Connor 1416bc547e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-22 17:37:52 -04:00
Isaac Connor e746f0babe Use 0 instead of the word auto for scale 2020-07-22 17:28:41 -04:00
Isaac Connor 7fd038d99b spacing and quotes 2020-07-22 17:28:12 -04:00
Andrew Bauer 062ae675c8 partial cleanup of getNavBarHTML 2020-07-22 13:12:59 -05:00
Isaac Connor d5dbebefe5 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-07-21 19:06:38 -04:00
Isaac Connor 495cd56b8b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-21 14:39:51 -04:00
Isaac Connor 64e4363302 update code populating DeviceChannel, DeviceFormat, CapturePalette 2020-07-21 13:40:04 -04:00
Isaac Connor a70b329ce3 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-07-20 18:40:59 -04:00
Isaac Connor e23c6de373 populate monitors with monitor array which will be json-encoded. Fixes failed population of monitor names dropdown 2020-07-20 17:42:25 -04:00
Isaac Connor 03195a8786 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-20 16:25:59 -04:00