Commit Graph

385 Commits

Author SHA1 Message Date
Simpler1
94a3632e1b fix(events): Expand/Collapse for navbar-two works when narrow 2024-03-23 11:14:41 -04:00
Simpler1
3df3e57872 fix(): Typo 2024-03-22 10:17:51 -04:00
IgorA100
74a43745d3 Fix: Order of loading css files
Initially, you need to load third-party styles and only then load your own styles.
This way we will get rid of the confusion of styles and the need to use "!important"
2024-03-05 15:20:02 +03:00
IgorA100
610109d569 Feat Entrust management of enabling search in select to the Chosen plugin
On Options page it is necessary to use Chosen plugin for all “selects”, otherwise the design will not be beautiful.
Search disabling is managed by Chosen plugin.
2024-03-05 12:07:45 +03:00
Isaac Connor
8a42594009 Upgrade bootstrap-table to 1.22.3 2024-03-01 11:44:06 -05:00
Isaac Connor
f9a1b6b4f4 Only show cpuUsage if we have an Id 2024-02-22 12:55:35 -05:00
Isaac Connor
1742c03b1a Handle non-multi-server case. Fixes #3836 2024-02-22 10:57:01 -05:00
Isaac Connor
661d8620fd Add Cpu Usage % to header 2024-02-20 13:15:38 -05:00
Isaac Connor
4987ea1b21 Define user before using for viewableMonitorIds 2024-02-01 11:39:09 -05:00
Isaac Connor
8e035f61ac Use viewableMonitorsIds instead of canView(Monitors) when deciding to show the Console or Montage Links 2024-01-31 16:09:33 -05:00
Isaac Connor
0fb71e35f2 Add luxor.js and use it to format datetimes 2024-01-24 16:10:20 -05:00
Isaac Connor
3603aca21c Put navbar brand separate from navbars, remove explicit padding. Increase text size of ZoneMinder in brand, hide Branding on portrait mobile 2024-01-02 14:06:52 -05:00
Isaac Connor
6aa7901066 Use same logic as in LogHTML to apply success class, and hence make the word Log green when there are no errors. 2023-10-30 10:03:17 -04:00
Isaac Connor
b01908e93c Don't include the third nav element for nav banner when there is no banner set so as to take up less space 2023-10-23 17:06:28 -04:00
Charlie Root
da213d8532 Merge branch 'master' into openbsd 2023-09-11 13:42:43 -07:00
Charlie Root
50059e5842 Only show ram info if proc exists. 2023-09-11 13:42:22 -07:00
Isaac Connor
8672e6d64e Fix missing dropdown-item class on warning or danger storage areas. Increase warning to 95% instead of 90% 2023-08-10 11:03:22 -04:00
Isaac Connor
7a21c01f36 Don't show bandwidth options if there are none to choose from 2023-06-07 16:00:02 -04:00
Isaac Connor
e527264182 Hide navbars when not logged in and auth turned on 2023-05-25 13:55:39 -04:00
Isaac Connor
969baa3891 Convert user from an array to a User object 2023-04-23 12:57:29 -04:00
Isaac Connor
94efc5ff73 Add fontfaceobserver.js 2023-02-28 13:58:17 -05:00
Isaac Connor
a2879fb66c Add Map view to header 2023-02-25 12:46:34 -05:00
Isaac Connor
689ae56732 Sync up tags with collapsed header and remove the fixed-top class so that the stick header takes over. 2023-01-29 10:54:47 -05:00
Isaac Connor
d6e3a325aa Remove dropdown class from menu items that aren't dropdowns 2023-01-19 17:07:48 -05:00
Isaac Connor
6fa39d25c1 Separate account status section. 2023-01-19 17:07:48 -05:00
Isaac Connor
4b7680bc43 Use & instead 2023-01-19 17:07:47 -05:00
Isaac Connor
5dc658dd55 add sticky class to body when ZM_WEB_NAVBAR_STICKY is set. Remove it from navbar. 2023-01-16 16:38:35 -05:00
Isaac Connor
0af2a3eb10 Make header navbar sticky, make entire second navbar go away when minmised. 2023-01-16 16:38:35 -05:00
Isaac Connor
df8bc464e3 Fix missing checkbox column on events table. See https://github.com/wenzhixin/bootstrap-table/issues/6522 2023-01-03 11:15:58 -05:00
Isaac Connor
3a6984c820 Move leaflet css loading code to monitor view 2022-11-30 13:23:42 -05:00
ovargasp
6ee083a145 Update functions.php 2022-10-31 11:53:11 -06:00
Isaac Connor
189bf2f687 Update bootstrap-table to 1.21.1 2022-10-25 12:50:01 -04:00
Isaac Connor
42e8698318 Load logger.js before view js so that remote logging routines are available. 2022-10-21 16:20:51 -04:00
Isaac Connor
beec8bb03a Move view-specific includes out of includes/functions. It is far easier to just put those at the bottom of the actual view file. 2022-10-21 10:19:06 -04:00
Isaac Connor
2a1d417511 Remove dark styles from navbar 2022-10-11 16:44:23 -04:00
Isaac Connor
4028c08831 Update jquery-ui to 1.13.2 2022-10-04 10:14:27 -04:00
Isaac Connor
fdbe950640 include video.js for video view as well as event 2022-09-12 13:44:18 -04:00
Isaac Connor
d079439005 Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports 2022-09-12 19:40:27 +02:00
Isaac Connor
4eeb49d09a Merge branch 'master' into reports 2022-08-31 18:38:08 +02:00
Isaac Connor
f9f53dd0d2 When there are less than 3 storage areas, just list them in the header instead of making it a dropdown 2022-08-29 14:12:45 -04:00
Isaac Connor
f6a7698e43 Add Reports menu option 2022-08-04 09:07:46 -04:00
Isaac Connor
7fa3fbfe8b Format the output of getLoad to two decimal places 2022-06-01 13:32:52 -04:00
Isaac Connor
e0decbee2a Deprecate old cycle view in favour of watch view with cycle turned on 2022-05-30 13:38:34 -04:00
Isaac Connor
0fc6ffe359 Use non-minified chosen.js because we made changes. 2022-04-07 13:15:15 -04:00
Isaac Connor
19d823497e Add id's to nav row divs to facilitate styling. Only output third row if it has contents 2022-03-30 13:16:49 -04:00
Isaac Connor
2b8fee80de escape html in Storage names 2022-03-21 16:06:52 -04:00
Isaac Connor
08598ace6b remove space 2022-03-20 19:13:46 -04:00
Isaac Connor
07aa171c04 Output valid html only for Username to prevent XSS 2022-03-10 14:10:04 -05:00
Isaac Connor
cc9306afe3 Change the error message banner to always take up space and be seen. 2022-02-08 13:32:37 -05:00
Isaac Connor
2f5a403fc4 Handle when no swap is configured 2022-02-08 10:04:19 -05:00