Commit Graph

3402 Commits

Author SHA1 Message Date
Andrew Bauer 72d95275c3 add navbar for frame view 2020-08-20 09:19:04 -05:00
Andrew Bauer 247ace7fa2 process clicks per cell in frames 2020-08-20 09:13:11 -05:00
Andrew Bauer 7175fa3d86 no padding on frames outermost div 2020-08-20 08:19:53 -05:00
Andrew Bauer c9de30d427 click any row to load frame 2020-08-19 17:54:39 -05:00
Andrew Bauer b2a632a3f8 reinit thumbnail ani on click events 2020-08-19 16:16:27 -05:00
Andrew Bauer 8f70ae192d enable thumbnail zoom on frames view 2020-08-19 15:42:35 -05:00
Andrew Bauer a903a885b6 whitepsace 2020-08-19 14:07:00 -05:00
Isaac Connor c2d6b8f493 revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors. 2020-08-19 14:39:15 -04:00
Isaac Connor d0c21995cd Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-19 14:14:32 -04:00
Isaac Connor efec1e7d4f remove debug 2020-08-19 14:13:48 -04:00
Isaac Connor 177df46113 Apply min=0 to filterX and Y so that we don't get negative values 2020-08-19 14:11:16 -04:00
Isaac Connor d366d41297 Update parseFilter to Filter::parse 2020-08-19 14:07:51 -04:00
Andrew Bauer 842efc1574 remove <a> tags from col headers 2020-08-19 12:31:13 -05:00
Andrew Bauer 74b0ad2cb3 get rid of horizontal scrollbar in frames 2020-08-19 12:20:57 -05:00
Andrew Bauer f317bf1722
fix copy/paste typo 2020-08-19 12:07:31 -05:00
Andrew Bauer e38a532b78 rough new frames view 2020-08-19 12:04:08 -05:00
Andrew Bauer ad9b9d91cc disable the back button when new page 2020-08-18 16:57:03 -05:00
Isaac Connor b38c5e98a8 Merge branch 'master' into filter_pre_post 2020-08-18 16:33:04 -04:00
Andrew Bauer 3664a9b42c set the pagination list 2020-08-18 15:12:07 -05:00
Andrew Bauer 1e41bd0823 whitespace 2020-08-18 13:48:18 -05:00
Andrew Bauer 6eb7b6d51c set the right toolbar btn class to match 2020-08-18 13:13:32 -05:00
Andrew Bauer df02d84a56 don't go back if not referred 2020-08-18 13:08:17 -05:00
Andrew Bauer 2c9caeb348 whitespace 2020-08-18 12:40:27 -05:00
Isaac Connor 2d5522df14 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-18 13:25:21 -04:00
Isaac Connor c837a17aea Add a warning about missing EndTime term on UpdateDiskSpace 2020-08-18 13:25:18 -04:00
Andrew Bauer bf63500b08 fix thumbnail animation after user event 2020-08-18 12:00:20 -05:00
Isaac Connor e6d6ee1b67 Merge branch 'filter_warnings' 2020-08-18 11:17:46 -04:00
Isaac Connor 16efa9dbb2 Add extra checks for Deleting without an Archived State term and Running in the background without any actions. 2020-08-18 11:17:22 -04:00
Andrew Bauer 1627b1d0d1 privacy view page formatting 2020-08-18 09:08:26 -05:00
Andrew Bauer 287c585d3d use translated text for delete confirmation 2020-08-18 08:26:45 -05:00
Andrew Bauer b32bcab91f add a delete confirmation modal 2020-08-18 08:06:58 -05:00
Isaac Connor 610f73a835 Merge branch 'release-1.34' 2020-08-17 19:30:32 -04:00
Isaac Connor 0a3ad719cd Merge branch 'master' into filter_pre_post 2020-08-17 18:30:44 -04:00
Andrew Bauer 1dd0b44334 eslint nanny strikes again 2020-08-17 16:59:57 -05:00
Isaac Connor dc451cbc85 Use filter class 2020-08-17 17:42:22 -04:00
Isaac Connor e3fe75f21b fix case on filterQuery 2020-08-17 17:42:03 -04:00
Isaac Connor e5dd10fc04 use filter class instead of parseFilter 2020-08-17 17:41:50 -04:00
Isaac Connor 0f90b999c0 use filter class instead of parseFilter 2020-08-17 17:41:38 -04:00
Isaac Connor 6649a30bbb Use querystring instead of query 2020-08-17 17:41:13 -04:00
Andrew Bauer 80b92573b8 set the icons used in bstable toolbar 2020-08-17 16:18:18 -05:00
Isaac Connor f4594f06d1 Add in pre_condition checks. 2020-08-17 16:58:37 -04:00
Andrew Bauer 3e5bfc445f fix checkbox column disappearing 2020-08-17 12:10:35 -05:00
Isaac Connor e452c23c4d Merge branch 'master' into filter_pre_post 2020-08-17 12:56:43 -04:00
Isaac Connor e4425d7565 Merge branch 'master' into filter_pre_post 2020-08-17 12:56:20 -04:00
Andrew Bauer 11afad5c92 add pagination on/off toggle 2020-08-17 11:02:25 -05:00
Andrew Bauer 9bc1b6a34e change icon color on hover 2020-08-17 08:37:03 -05:00
Andrew Bauer e19d1f507e fix bootstrap-table-cookie correctly 2020-08-17 08:05:50 -05:00
Andrew Bauer 7fed6f9c29 shift thumbnail animation away from edge 2020-08-16 21:08:07 -05:00
Isaac Connor 1a6154752a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-16 20:08:49 -04:00
Isaac Connor a8455d4ecf Add necessary globals 2020-08-16 20:08:42 -04:00
Isaac Connor 2021f561fa Import as a global 2020-08-16 20:08:26 -04:00
Andrew Bauer de0a4a18ee fix checkbox column 2020-08-16 18:00:11 -05:00
Andrew Bauer 5468c0322e appease the eslint nanny 2020-08-16 16:30:35 -05:00
Andrew Bauer 0cbf559821 only hide cols if cookie not exist 2020-08-16 16:02:43 -05:00
Andrew Bauer 33ea9de8cf better spacing archived & emailed tinytext 2020-08-16 15:19:08 -05:00
Andrew Bauer f27f6e6394 fix archive buttons, remove asterisk from event name 2020-08-16 14:46:56 -05:00
Andrew Bauer 94d666b296 tiny text under event name, add emailed column 2020-08-16 14:41:50 -05:00
Andrew Bauer ee31761627 cleanup & consolidate events view buttons 2020-08-16 13:44:18 -05:00
Isaac Connor 77c391fcae Add booleanvalues for operators support 2020-08-16 13:07:42 -04:00
Isaac Connor 77f9f4bffb Add ExistsInFileSystem support in Filters. This also includes limiting operators to IS/IS NOT 2020-08-16 13:07:21 -04:00
Isaac Connor 303154c690 Remove countSQL code that ran the sql query once to get the # of entries returned to be used in pagination. Now that we support POSTSQL Conditions it is no longer useful. Pagination has to happen later. Implement POSTSQLConditions in filtering results. 2020-08-16 13:06:37 -04:00
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 9be63f1d99 reorganize and init eventTable 2020-08-16 11:34:37 -05:00
Andrew Bauer 93475bef7e eslint nanny 2020-08-15 16:08:53 -05:00
Andrew Bauer 252bf7995a eslint nannt 2020-08-15 15:54:58 -05: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 c87886f5a5 Fix v4l2 channel and palette dropdowns allowing the saving of local monitors. 2020-08-15 12:31:30 -04:00
Andrew Bauer 7225281771 enlarge event thumbs on hover 2020-08-13 12:50:59 -05:00
Andrew Bauer b45c4fac1f tighten up event column spacing 2020-08-13 12:33:13 -05:00
Isaac Connor 6550876a92 fix css so that the background colour of the dropdown divs is set 2020-08-13 12:40:11 -04: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
Isaac Connor 047d69ace7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-13 11:28:00 -04:00
Andrew Bauer c4ee4fb307 split start & end times into sep cols & wrap 2020-08-13 09:24:42 -05:00
Andrew Bauer 27c80cedac
set small screen breakpoint on table-responsive
This gets rid of the ugly horizontal scroll bars on the table on larger screens
2020-08-12 10:10:55 -05:00
Isaac Connor 6cbc54ef87 When storage area has been deleted, say so 2020-08-11 14:11:48 -04:00
Isaac Connor 5f0da93c6e turn off debug 2020-08-11 13:47:48 -04:00
Isaac Connor 303cec92f6 Add globals, fixing timeline view 2020-08-11 13:47:37 -04:00
Isaac Connor 0a7df075ae Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-11 11:41:15 -04:00
Isaac Connor d42424d6d8 Merge branch 'release-1.34' 2020-08-11 11:41:11 -04:00
Isaac Connor 355428e93e direct settings view to the monitor that is actually recording the stream 2020-08-10 21:32:23 -04:00
Isaac Connor e8bf2aa386 Update settings view. Were assigning to a function. More work to be done. 2020-08-10 21:20:23 -04:00
Andrew Bauer 4a31ebe045
Update options.php 2020-08-10 15:48:20 -05:00
Andrew Bauer b5553c968b
expand options to full width 2020-08-10 15:41:25 -05:00
Andrew Bauer 4097693b38
appease the eslint nanny 2020-08-10 13:38:53 -05:00
Andrew Bauer 3fa97f2bc1 reogranize state.php 2020-08-10 13:35:12 -05:00
Isaac Connor bafffdb486 Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message 2020-08-10 12:26:37 -04:00
Isaac Connor 5ee086bbfe Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message 2020-08-10 12:25:44 -04:00
Isaac Connor e64e786c5b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-09 22:20:08 -04:00
Isaac Connor f04e1a0ba7 Apply min=0 to filterX and Y so that we don't get negative values 2020-08-09 22:20:06 -04:00
Isaac Connor ec707acdd1 Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-09 22:19:43 -04:00
Andrew Bauer 42fe024681
Update skin.js 2020-08-09 17:43:39 -05:00
Andrew Bauer 9a03a2c7d4
Update skin.js 2020-08-09 17:43:07 -05: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 a6ae4aee01 eslint nanny 2020-08-08 12:26:42 -05:00
Andrew Bauer fd4b9ba4f4 move jquery in functions.php to skin.js 2020-08-08 12:06:57 -05:00
Andrew Bauer b626e0de1c eslint nanny strikes again 2020-08-08 11:19:29 -05:00
Isaac Connor a001c93321 fix zone editing globals and inputs being too big 2020-08-08 11:41:24 -04:00
Andrew Bauer 96bd6397c6 eslint nanny 2020-08-08 10:38:58 -05:00
Isaac Connor 8533ce7018 fix CSP on polygons 2020-08-08 11:38:54 -04:00
Isaac Connor 82357a0675 reapply click function to bandwidth dropdown entries after getNavBar 2020-08-08 11:17:26 -04:00
Andrew Bauer 3792043707 implement bw widget as dropdown 2020-08-08 10:07:26 -05:00
Isaac Connor fc5fabf1c5 fix zone editing globals and inputs being too big 2020-08-06 12:24:51 -04:00
Isaac Connor a19990f4d7 Merge branch 'release-1.34' 2020-08-06 11:57:35 -04:00
Isaac Connor ef2ad12846 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-05 20:00:45 -04:00
Isaac Connor ddeef6f031 Fix globals and a Fatal without ZM\ prefix 2020-08-05 20:00:39 -04:00
Isaac Connor 76e0d155d3 declare globals 2020-08-05 19:15:01 -04:00
Isaac Connor 90671cd4e5 Add missing globals 2020-08-04 18:07:01 -04: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 1ab828c110 Add globals 2020-08-04 17:35:52 -04:00
Isaac Connor dd627d9234 Update cycle monitorlist sidebar to bootstrap4 2020-08-04 17:35:41 -04:00
Isaac Connor ba4d6dff64 Add globals definitions 2020-08-04 17:05:58 -04:00
Isaac Connor 9a06d6cab6 Fix some spacing 2020-08-04 17:05:44 -04:00
Isaac Connor 79c9671ef2 Use &amp; instead of & in urls 2020-08-04 17:05:33 -04:00
Isaac Connor c0f21ab55d Fix globals 2020-08-04 16:36:24 -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
Andrew Bauer ab9a135759
fix inability to stop zm from the web console 2020-08-03 12:10:34 -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 eb1d94345f remove crud 2020-08-03 11:05:58 -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
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 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 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
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 c2ac7ed4a9 spacing and escape sql fields 2020-07-30 17:07:43 -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 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 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
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 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 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