Commit Graph

23582 Commits (add_startup_delay)

Author SHA1 Message Date
IgorA100 66364c7c32
Fis style in Options page
* Why extra padding at top? 
  padding-top: 2rem;
  */

I don't know the answer, because... I didn't add it :)
Before my edit, it was generally “4rem”; it seemed like a lot to me, so I halved it.
I didn’t clean it up completely because I was careful not to break something completely.

I understood why. If the <form> does not have buttons at the top, then there will be no padding between the form and the "id="optionsContainer" (for example the "Storage" section).
For now, so be it.
2024-03-13 19:13:52 +03:00
IgorA100 6b8fe26be6
empty line 2024-03-13 16:26:25 +03:00
IgorA100 510d60e931
Merge branch 'master' into patch-19 2024-03-13 16:24:45 +03:00
IgorA100 ef3245fe2b
Moved class "pt-2" in other DIV
Necessary for correct table scrolling
2024-03-13 16:11:21 +03:00
IgorA100 1d81af50b9
Fixing table header when using sticky 2024-03-13 16:07:22 +03:00
IgorA100 452576ad5e
Fix: change class "table-responsive-sm-2" to "table-responsive"
And always specify the object ID before its class
2024-03-13 15:57:44 +03:00
Isaac Connor 649b459630 Rough in bootstrap-table for monitor list in console. 2024-03-13 08:48:24 -04:00
Isaac Connor 4d8a357bba Rough in bootstrap-table for monitor list in console. 2024-03-13 08:47:31 -04:00
Isaac Connor 538db9946a
Merge pull request #3863 from IgorA100/patch-18
Code cleaned & added table header background in events
2024-03-13 08:44:22 -04:00
IgorA100 6a20a3a482
Fix scrool bar
You should not hardcode "overflow-y: scroll;" because if the table contains few rows, then we do not need a scroll bar.
Also, the scroll bar must be used only in case of stickiness, otherwise there will be duplication of scroll bars in the absence of stickiness.
2024-03-13 15:38:47 +03:00
IgorA100 83d64e8442
Fix style for sticky navbar & sticky table header 2024-03-13 13:49:47 +03:00
IgorA100 fc23cef16a
Code cleaned & added table header background 2024-03-13 13:33:15 +03:00
Isaac Connor 6ccf0c66a1 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-12 21:45:07 -04:00
Isaac Connor 2ba7369ea8 hack to fix scroll bars in bootstrap table 2024-03-12 21:45:02 -04:00
Isaac Connor 07153f6773 Don't set snap score when skipping frames. Don't exit alarms when we havn't done motion detection. As a result, alarm_frame_count shouldn't cause immediate alarm anymore and because we aren't clearing prealarm frames, event recording should start 2024-03-12 21:22:58 -04:00
Isaac Connor be202719c3 Appease eslint 2024-03-12 21:22:50 -04:00
Isaac Connor bc044f38d9 Only put scrollbar on console contents if needed. Fixes double scroll bar when not sticky navbar 2024-03-12 17:57:50 -04:00
Isaac Connor 95d2e0a27c Fix form not scrolling entirely. Remove top padding. Remove right padding due to bootstrap row. 2024-03-12 17:53:27 -04:00
Isaac Connor f926e98283 Temp fix to put scroll bars back 2024-03-12 09:12:53 -04:00
Isaac Connor 855da2cbc4 Put back scroll bars on console 2024-03-12 08:55:44 -04:00
Isaac Connor 657cda18ef Put back style permitting scrolling to work 2024-03-12 08:44:12 -04:00
Isaac Connor ae20617c53
Merge pull request #3862 from IgorA100/patch-17
Fix: video scaling on console
2024-03-12 08:18:07 -04:00
IgorA100 625e699e32
Fix: video scaling on console
Close #3861
2024-03-12 11:44:29 +03:00
Isaac Connor 20e1ae2090 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-10 11:04:10 -04:00
Isaac Connor 3f9bda4f80 FIx arrap_map => array_map. Fixes #3859 2024-03-10 11:03:03 -04:00
Isaac Connor 3939bcec22 Fix eslint 2024-03-10 11:02:28 -04:00
Isaac Connor b647280766 FIx arrap_map to array_map. Don't assume _REQUEST[mids] exists. Fixes #3859 2024-03-10 10:59:56 -04:00
Isaac Connor 76db26cec1
Merge pull request #3852 from IgorA100/patch-12
Fix style in options pages
2024-03-09 11:54:43 -05:00
IgorA100 28fd799bf6
Removed erroneously added style for tag 'a' 2024-03-09 10:26:16 +03:00
Isaac Connor 4718bff514
Merge pull request #3856 from IgorA100/patch-14
Fix design when viewing list of events
2024-03-08 08:24:18 -05:00
Isaac Connor d815b77245
Merge pull request #3857 from IgorA100/patch-15
Fix "overflow-y" for "#monitorList" in console
2024-03-08 08:20:47 -05:00
IgorA100 e576e9b756
Fix "overflow-y" for "#monitorList" in console
For "#monitorList" there is no need to set "overflow-y: scroll;"
Otherwise, scrolling will always be displayed.
2024-03-07 21:39:33 +03:00
IgorA100 f27f9bdf95
Fix layout 2024-03-07 16:58:26 +03:00
IgorA100 ab556f3135
Update events.css 2024-03-07 16:16:02 +03:00
IgorA100 4df177208c
Fix design when viewing list of events
Layouts & space in code
2024-03-07 16:03:16 +03:00
Isaac Connor 1f3f06636b
Merge pull request #3855 from IgorA100/patch-13
Fix: More correct scaling (with padding) during live viewing
2024-03-07 06:51:22 -05:00
IgorA100 7e4cd163f5
Fix: remove right padding as unnecessary
Slightly shifts the video at some screen and video aspect ratios
2024-03-07 13:49:50 +03:00
IgorA100 e90340dd2b
Fix: More correct scaling (with padding) during live viewing 2024-03-07 13:30:39 +03:00
Isaac Connor f0088e49d7 Remove debug 2024-03-06 16:21:44 -05:00
Isaac Connor 6124678fb8 Add scaling to zms url 2024-03-06 16:21:19 -05:00
Isaac Connor 32dc9cff2f Remove use strict to appease eslint for now. Use a zms url instead of view=image 2024-03-06 16:02:50 -05:00
Isaac Connor ada974ef51 Fix eslint 2024-03-06 14:21:18 -05:00
Isaac Connor 1278613832 Merge fixes in findEventByTime and fineFrameByTime with better debugging. Turn on use strict. Update when datetimepickers close instead of onchange 2024-03-06 13:31:36 -05:00
IgorA100 57c993507c
Fix layout 2024-03-06 20:18:15 +03:00
IgorA100 7757eeae1a
Fix layout 2024-03-06 20:14:36 +03:00
IgorA100 151114f778
Fix space 2024-03-06 20:00:08 +03:00
IgorA100 008c864751
Fix style 2024-03-06 19:56:10 +03:00
IgorA100 714a0913e4
Merge branch 'ZoneMinder:master' into patch-12 2024-03-06 19:52:25 +03:00
IgorA100 f94d264407
Fix: Button block location
There is no need
2024-03-06 19:01:52 +03:00
IgorA100 c8c731519d
Fix Removing excess styles & specifying a minimum textarea height 2024-03-06 01:23:42 +03:00