Isaac Connor
9fe90baea2
Merge pull request #3872 from borozenetsvv/master
...
Update ru_ru.php
2024-03-18 21:15:21 -04:00
Isaac Connor
c3f5d9c550
Merge pull request #3874 from IgorA100/patch-28
...
Fix: Display according to translation
2024-03-18 21:14:42 -04:00
Isaac Connor
8cb4f39593
Merge pull request #3873 from IgorA100/patch-27
...
Fix: Tracking the "shift" button press on live view page
2024-03-18 13:00:14 -04:00
IgorA100
40a249ef56
fix space
2024-03-18 18:54:43 +03:00
IgorA100
f20ce4627d
Fix: Display according to translation
2024-03-18 18:51:40 +03:00
IgorA100
60cd909bf3
Fix: Tracking the "shift" button press
2024-03-18 18:04:03 +03:00
borozenetsvv
3a1872633a
Update ru_ru.php
2024-03-18 19:25:15 +07:00
Isaac Connor
1dbfd36038
Merge pull request #3870 from IgorA100/patch-25
...
Added a button for editing detection zone from monitor settings
2024-03-16 19:06:27 -04:00
IgorA100
a42cf7a5c5
Replaced quotes
2024-03-16 15:32:43 +03:00
IgorA100
1b7f3b0ede
Added a button for editing detection zone from monitor settings
2024-03-16 15:23:16 +03:00
Isaac Connor
9eb3565483
Set reorder_queue size to 2*keyframe interval as 1* does not seem to be enough.
2024-03-15 12:11:22 -04:00
Isaac Connor
1bd94308b1
Make no alarm.jpg a debug instead of error, because continuous events don't have them.
2024-03-15 12:09:31 -04:00
Isaac Connor
1c782529c4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-15 11:42:32 -04:00
Isaac Connor
8442a1aca4
fixup reversion of bootstrap-table console which shouldn't have been merged yet
2024-03-15 11:42:07 -04:00
Isaac Connor
cc6acfe3ed
Merge pull request #3868 from IgorA100/patch-23
...
Fix Horizontal scroll bar in live view
2024-03-15 11:41:25 -04:00
Isaac Connor
a199a4cb8d
Fix button bar as a result of reverting bootstrap-table console
2024-03-15 11:40:20 -04:00
Isaac Connor
ed9c91c9f3
Revert "Revert "Merge pull request #3864 from IgorA100/patch-19""
...
This reverts commit 00bd09fdc2
.
2024-03-15 10:53:30 -04:00
Isaac Connor
00bd09fdc2
Revert "Merge pull request #3864 from IgorA100/patch-19"
...
This reverts commit 305a1485cc
, reversing
changes made to 736ac7dd33
.
2024-03-15 09:13:22 -04:00
IgorA100
da3749389a
Fix Horizontal scroll bar in live view
...
When scaling videos larger than the screen size, the horizontal bar was not visible.
2024-03-15 13:00:57 +03:00
Isaac Connor
305a1485cc
Merge pull request #3864 from IgorA100/patch-19
...
Fix page console
2024-03-14 16:44:21 -04:00
Isaac Connor
736ac7dd33
Merge pull request #3866 from IgorA100/patch-21
...
Eliminate possible duplication of horizontal scrollbar
2024-03-14 16:43:35 -04:00
Isaac Connor
e1baa78ac2
Merge pull request #3867 from IgorA100/patch-22
...
Fix live view style (watch page)
2024-03-14 16:42:47 -04:00
IgorA100
ae74a19168
remove class "h-100" because interfere with proper scaling
2024-03-14 22:48:58 +03:00
IgorA100
60811d43c5
Fix live view style (watch page)
...
A slight violation of style, incl. vertical scroll bar with sticky enabled
2024-03-14 22:30:47 +03:00
Isaac Connor
0c49884956
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-14 12:43:47 -04:00
Isaac Connor
56fcd8472e
Fix motion events having cause continuous. Fixes #3858
2024-03-14 11:54:15 -04:00
Isaac Connor
62ba0bf903
Add duration to hints for EVENT_CLOSE_MODE and use alternate regexp for pattern
2024-03-14 11:54:15 -04:00
IgorA100
0dc54b6adf
Eliminate possible duplication of horizontal scrollbar
...
All management occurs inside the #options & #sidebar containers
2024-03-14 16:01:15 +03:00
IgorA100
6cd5fac11b
For #contentButtons add margin-bottom: 8px;
...
Now the vertical margin will be symmetrical.
2024-03-14 11:58:30 +03:00
IgorA100
e10bb3610a
Fix previous commit
2024-03-14 11:54:50 +03:00
IgorA100
91955b491d
Remove class "pt-2"
...
The ".contentButtons" style will be changed in the CSS
2024-03-14 11:50:51 +03:00
Isaac Connor
dee7a27a97
Merge pull request #3865 from IgorA100/patch-20
...
Fis style in Options page
2024-03-13 17:53:41 -04:00
IgorA100
38ae631dbe
Fix space
2024-03-14 00:11:28 +03:00
IgorA100
37756fb5f9
Added DIV to offset vertical scrollbar to left
2024-03-13 20:59:31 +03:00
IgorA100
cf92914c60
Update options.css
2024-03-13 20:51:23 +03:00
IgorA100
b10511fb97
Adjusting the vertical scroll bar when using sticky
2024-03-13 20:50:25 +03:00
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