90de87da0c
Merge pull request #3926 from IgorA100/patch-49
...
Fix: Changed color sort direction icon in table header for dark theme
2024-03-29 08:18:10 -04:00
6baab49c5a
Added .chosen to <select> on the "Log" page
2024-03-29 15:03:39 +03:00
c8359528d8
Fix: calculating scaleX/Y in handleClick(event) => skins\classic\views\js\watch.js
...
Cannot round to a whole number, otherwise navigation through image to the extreme corners is not possible!
2024-03-29 12:31:44 +03:00
ba61e46967
Fix: Changed color sort direction icon in table header for dark theme
2024-03-29 11:18:28 +03:00
6018b0e627
Update montage.css
2024-03-28 23:53:56 +03:00
0ebe78c412
Fix style for classic skin
2024-03-28 23:49:47 +03:00
c77078d098
Merge branch 'ZoneMinder:master' into patch-6
2024-03-28 23:31:53 +03:00
6d601c4e8b
Report in Console if monitor use ONVIF detection
2024-03-28 21:44:24 +03:00
92610881b2
chore(lint): spacing
2024-03-28 13:49:30 -04:00
bd716789c2
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-28 12:48:53 -04:00
c2b6f6ba17
Detect when a new monitor uses a specified Id and the record exists in a deleted monitor. Automatically Undelete it.
2024-03-28 12:48:48 -04:00
70de139e77
Feat: Ability to download videos on the "Event" page with a multiport configuration
2024-03-28 19:47:53 +03:00
b143435c82
Merge pull request #3910 from IgorA100/patch-43
...
Feat: For <select> set .chosen & apply chosen
2024-03-28 12:35:46 -04:00
9a4168ce96
chore(lint): Remove empty css
2024-03-28 12:20:16 -04:00
0c17ed6b69
Feat: Change scrollbar style for base css
2024-03-28 18:55:13 +03:00
0cfe846e3f
remove istead of comment out
2024-03-28 11:21:53 -04:00
de03037d0e
fix(events): Remove unnecessary and inconsistent left margin
2024-03-28 11:20:43 -04:00
030e6bbf89
Moved applyChosen() function to \skins\classic\js\skin.js
...
cspNonce applied to entire main JS skin file
2024-03-28 18:07:40 +03:00
200815e2c3
Moved applyChosen() function from \skins\classic\includes\functions.php
...
Also moved the call to applyChosen() after loading the document
2024-03-28 17:50:02 +03:00
b7baab3394
Merge pull request #3915 from Simpler1/patch-6
...
chore(lint): $ locations
2024-03-28 10:17:12 -04:00
f624ad08f2
Merge pull request #3913 from Simpler1/patch-5
...
feat(): Term layout
2024-03-28 10:11:43 -04:00
992b729329
chore(lint): $ locations
2024-03-28 09:59:58 -04:00
9716cabe92
feat(): Term layout
2024-03-28 09:41:34 -04:00
99117a37f1
Merge pull request #3908 from IgorA100/patch-41
...
Feat: Change scrollbar style for dark css
2024-03-28 09:41:20 -04:00
c8d9cd02d7
Fix use of int as a function instead of a cast
2024-03-28 09:02:53 -04:00
9068a5be85
Add .chosen for <select>
...
Previously, part of the code was not processed as "chosen" at all, other part of the code was processed by the script in filter.js, which resulted in "chosen" being processed in different places and in different styles.
Now all "chosen" processing happens in:
applyChosen() => \skins\classic\includes\functions.phpfunction
2024-03-28 12:33:59 +03:00
1217932707
Del extra space
2024-03-28 12:23:25 +03:00
5ce2b953e8
Replacing .chosen() with .addClass('chosen').
...
All JS work chosen has been moved to:
applyChosen() => \skins\classic\includes\functions.phpfunction
2024-03-28 12:18:36 +03:00
edb2e6d22f
Add line break
2024-03-28 12:08:03 +03:00
27c4a13726
Add function applyChosen(), add control attributes
...
Control attributes are used as an additional class
.chosen-full-width => width: "100%"
.chosen-auto-width => width: "auto"
Usage example:
<select class="chosen chosen-full-width"></select>
All work with Chosen should only happen in applyChosen(), otherwise things get confusing.
2024-03-28 12:05:09 +03:00
e9a53ce0b7
Add scrollbar change for WEB_NAVBAR_STICKY disabled mode
2024-03-28 01:16:43 +03:00
7ecf33aea4
Removed minimum width restriction for .chosen-container
2024-03-28 01:02:10 +03:00
261d629ee5
Add change style scrollbar for ".chosen-results"
2024-03-28 00:46:20 +03:00
97af155102
Remove extra }. Fixes #3911
2024-03-27 17:36:45 -04:00
9b1ea23792
When deleting a monitor, stop running zmc and zmcontrol processes
2024-03-27 13:03:54 -04:00
21183d332b
Handle when auth is off, _getCredentials returns null so accessing it as an array is bad.
2024-03-27 12:57:12 -04:00
cabb0e93d4
Add .chosen in filter for <select>
2024-03-27 14:55:48 +03:00
e3f96a75fc
For <select> always apply chosen for Montage page
2024-03-27 13:15:10 +03:00
96bc632730
For <select> always apply chosen
...
If more 10 options in <selector>, search is turned on, if less 10 options, the search is not turned on.
This has already been implemented and is working.
The <select> style must be uniform.
2024-03-27 13:01:38 +03:00
dc37a57dbc
Remove debug.
2024-03-26 18:41:32 -04:00
790c69b20a
Fix: Warning if not specify term in FilterTerm
...
Required Term
2024-03-27 01:14:20 +03:00
8b41b37bef
Feat: Change scrollbar style for dark css
2024-03-26 23:41:20 +03:00
ed8ad15161
Merge pull request #3902 from IgorA100/patch-39
...
Fix: css, remove important, add fix style .chosen-choices
2024-03-26 11:53:11 -04:00
ba776478e6
Fix: Text color in the Input field
2024-03-26 17:32:23 +03:00
0f5abeb190
Fix: Russian translation
...
Based on #3888
2024-03-26 14:51:48 +03:00
915c3db91d
Place an arbitrary lower limit on scale value. Have seen scale=1 so I think 10 might be a reasonable value to limit to. Need to figure out how we got to a value of 1.
2024-03-25 19:03:01 -04:00
09838ea605
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-25 19:00:43 -04:00
59500a20f0
Fix: CSS. Added .chosen-container & border of table rows and input, button
2024-03-26 00:32:32 +03:00
16af156365
Important no longer needs to be used. Fix style .chosen-choices
2024-03-26 00:21:57 +03:00
57e0c6a595
Merge pull request #3899 from Simpler1/patch-4
...
fix(): Accommodate commit 6f5d51c
2024-03-25 15:42:25 -04:00
9f2d0f46b9
fix(): Accommodate commit 6f5d51c
2024-03-25 14:55:20 -04:00
2670d2e317
Added a count of the total number of available monitors.
2024-03-25 19:06:10 +03:00
76a412fb32
Fix: Add monitors to the filter only if the filter limit is set
...
My previous PR #3895 did not analyze the Group, Capturing, Analysing, etc. filters, but only took into account the Monitor filter
2024-03-25 18:57:59 +03:00
66fa612d02
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-25 09:53:33 -04:00
4417e24ee7
Feat: Changed monitor filter (in header table) to go from console to list of events
...
Changes are made to transition links to list of events from table header.
If no monitor is selected in console, you should not pass all monitors to filter; you must leave the monitor filter empty.
2024-03-25 13:12:21 +03:00
7f74de5d91
Fix map display
2024-03-24 13:19:53 -04:00
697f8de4f6
Fix: Add "All Events" in array "translate" (View event)
2024-03-24 19:51:24 +03:00
b2ff62fa76
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-24 11:50:05 -04:00
6f5d51c45f
Limit width of datetime inputs. They are bigger than they need to be
2024-03-24 11:50:02 -04:00
eb42ffe833
Merge pull request #3892 from IgorA100/patch-34
...
Fix: Positioning pagination block when height is less than 100% of br…
2024-03-24 10:45:21 -04:00
f233fb39f6
Fix: removed unnecessary parameter
...
Height has already been determined:
html,
body {
height: 100%;
margin: 0;
}
2024-03-24 00:29:53 +03:00
cf835f8850
Fix: Positioning pagination block when height is less than 100% of browser window
2024-03-24 00:21:34 +03:00
fb9debbd9a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-23 13:38:54 -04:00
162b1a7c1d
Log an error when we don't have permission to load the preset edit modal
2024-03-23 13:38:26 -04:00
834a1114ec
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-23 11:56:01 -04:00
dd0b2bcf91
Only load preset modal if we click set. Add auth relay so that it can be loaded.
2024-03-23 11:55:53 -04:00
651ec35012
Merge pull request #3886 from IgorA100/patch-32
...
Fix: Console sticky table header
2024-03-23 11:35:03 -04:00
8e5870a919
Merge pull request #3889 from IgorA100/patch-33
...
Feat: Fixing table header when viewing log
2024-03-23 11:32:38 -04:00
94a3632e1b
fix(events): Expand/Collapse for navbar-two works when narrow
2024-03-23 11:14:41 -04:00
7fcf01f1fa
Update log.css
2024-03-23 16:10:02 +03:00
a1896073f2
Feat: Fixing table header when viewing log
2024-03-23 15:50:21 +03:00
45d4cdaec5
Fix: tab -> space
2024-03-23 15:16:36 +03:00
4f60769413
Fix: Now a single server is recorded in the database as 0, not NULL
2024-03-23 00:56:53 +03:00
3fcbc4741e
Update console.php
2024-03-22 23:38:30 +03:00
5843a8b417
Fix: Console sticky table header
...
At some point it was broken.
2024-03-22 23:34:25 +03:00
06ac65cc38
Missed "Group" in the "narrow" commit
...
This is just to add Group into the previous commit for narrow filter organization for the Events view.
2024-03-22 11:44:42 -04:00
6338f9b0eb
Merge pull request #3884 from Simpler1/patch-1
...
fix(): Typo
2024-03-22 10:24:19 -04:00
3df3e57872
fix(): Typo
2024-03-22 10:17:51 -04:00
c32f4f48fa
Add Tags and Notes filters to montagereview
2024-03-22 10:11:29 -04:00
cbaa2a5287
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-22 09:12:13 -04:00
76e2be6543
Set defaults for ONVIF_EVENTS_PATH and ONVIF_Alarm_Text
2024-03-22 09:12:07 -04:00
2bd081310d
Merge branch 'master' into patch-6
2024-03-22 00:52:20 +03:00
105da2ffc2
Merge pull request #3883 from IgorA100/patch-31
...
Fix: Elimination of jerks for slideToggle on console
2024-03-21 17:21:03 -04:00
c05ca0aef8
Fix space for Eslint
2024-03-21 23:41:17 +03:00
72dd7df15a
Space for Eslint
2024-03-21 23:30:39 +03:00
463f0b736e
Update console.php
2024-03-21 23:27:38 +03:00
bf3555fdcb
Update skin.js
2024-03-21 23:26:38 +03:00
d4aaa3b30b
Update skin.js
2024-03-21 23:01:30 +03:00
165bd012ac
Update skin.js
2024-03-21 22:13:54 +03:00
3a19c04fcf
Set background colour of fullscreen mode
2024-03-21 14:42:58 -04:00
237394fdeb
Fix: Elimination of jerks for slideToggle on console
2024-03-21 20:26:15 +03:00
346e7141da
Merge pull request #3860 from IgorA100/patch-16
...
Feat: Control of collapsing/expanding blocks
2024-03-20 19:17:56 -04:00
44fc3e465c
Merge pull request #3881 from Simpler1/narrow
...
feat(events): Narrow mode layout (mobile portrait)
2024-03-20 19:17:29 -04:00
2b7c607f87
Merge pull request #3878 from IgorA100/patch-30
...
Fix: Location of PTZ Controls buttons when scaling browser less than 100%
2024-03-20 11:53:43 -04:00
c91a66ce0d
Merge pull request #3879 from borozenetsvv/master
...
Update ru_ru.php
2024-03-20 11:53:05 -04:00
ce668c12c0
The actual min value for StartupDelay is 0
2024-03-20 11:35:37 -04:00
168f4ab3dc
Rename zone=>zones. Add a case so that we don't log about an invalid tab. When doing so, log about name instead of tab.
2024-03-20 11:17:22 -04:00
ef5e90d669
Improve logic of DiskSpace pre condition. Implement specific op support, instead of using unsafe eval.
2024-03-20 10:22:15 -04:00
8b94b0774f
feat(events): Narrow mode layout (mobile portrait)
2024-03-20 10:09:01 -04:00
31295744d2
fix space
2024-03-20 11:44:25 +03:00
7042260bbf
Clean code
2024-03-20 11:41:52 +03:00
712cfe5cb8
Control buttons have absolute position
...
This is more correct and beautiful and will not depend on the browser scale
2024-03-20 11:27:53 +03:00
999e5df148
Update ru_ru.php
2024-03-20 12:23:12 +07:00
d41271054a
Fix: Location of PTZ Controls buttons when scaling browser less than 100%
...
Possible fix #3877
2024-03-19 23:12:45 +03:00
51211ce271
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-19 14:59:19 -04:00
1ae7c9c4b1
Add UI for setting StartupDelay
2024-03-19 14:59:04 -04:00
58c1e036c6
Fix: Russian translation
...
Based on #3875
2024-03-19 12:25:24 +03:00
4b58358761
Merge branch 'ZoneMinder:master' into patch-16
2024-03-19 10:29:27 +03:00
20eeb8739d
Merge pull request #3869 from IgorA100/patch-24
...
Add vertical table scroll on Options page
2024-03-18 21:17:19 -04:00
9fe90baea2
Merge pull request #3872 from borozenetsvv/master
...
Update ru_ru.php
2024-03-18 21:15:21 -04:00
c3f5d9c550
Merge pull request #3874 from IgorA100/patch-28
...
Fix: Display according to translation
2024-03-18 21:14:42 -04:00
40a249ef56
fix space
2024-03-18 18:54:43 +03:00
f20ce4627d
Fix: Display according to translation
2024-03-18 18:51:40 +03:00
60cd909bf3
Fix: Tracking the "shift" button press
2024-03-18 18:04:03 +03:00
3a1872633a
Update ru_ru.php
2024-03-18 19:25:15 +07:00
ee27974bd2
Merge branch 'ZoneMinder:master' into patch-16
2024-03-18 00:36:46 +03:00
a42cf7a5c5
Replaced quotes
2024-03-16 15:32:43 +03:00
1b7f3b0ede
Added a button for editing detection zone from monitor settings
2024-03-16 15:23:16 +03:00
ecd0c644c7
Merge branch 'ZoneMinder:master' into patch-24
2024-03-15 23:23:45 +03:00
9dc93389f9
Merge branch 'ZoneMinder:master' into patch-16
2024-03-15 23:22:03 +03:00
95ee9f816d
Merge branch 'ZoneMinder:master' into patch-6
2024-03-15 23:20:35 +03:00
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
1c782529c4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-15 11:42:32 -04:00
8442a1aca4
fixup reversion of bootstrap-table console which shouldn't have been merged yet
2024-03-15 11:42:07 -04:00
cc6acfe3ed
Merge pull request #3868 from IgorA100/patch-23
...
Fix Horizontal scroll bar in live view
2024-03-15 11:41:25 -04:00
a199a4cb8d
Fix button bar as a result of reverting bootstrap-table console
2024-03-15 11:40:20 -04:00
e7795513f5
Moved the <form> block for the "Options-Storage" page to a separate file "_options_storage.php"
2024-03-15 18:15:56 +03:00
320041ed4d
Page "Options-Storage" The buttons are now at the top. Added DIV with .wrapper-scroll-table
...
- The <form> is placed in a separate file for ease of use.
- Necessary for organizing vertical scrolling of a block with a table
2024-03-15 18:12:00 +03:00
8f5e1e3e1a
Page "Options-Servers" The buttons are now at the top. Added DIV with .wrapper-scroll-table
...
Necessary for organizing vertical scrolling of a block with a table
2024-03-15 18:07:50 +03:00
4eb853c90f
Page "Options-Users" The buttons are now at the top. Added DIV with .wrapper-scroll-table
...
Necessary for organizing vertical scrolling of a block with a table
2024-03-15 18:05:11 +03:00
de5d069b5e
Page "Groups" The buttons are now at the top. Added #optionsContainer & #options and DIV with .wrapper-scroll-table
...
Necessary for organizing vertical scrolling of a block with a table
2024-03-15 17:59:11 +03:00
3953ad982f
Added styles for vertical scrolling of the table container
2024-03-15 17:53:36 +03:00
ed9c91c9f3
Revert "Revert "Merge pull request #3864 from IgorA100/patch-19""
...
This reverts commit 00bd09fdc2
2024-03-15 10:53:30 -04:00
95d4458965
Add wrapper fo scroll table & remove padding-top from "form" & add padding to #optionsContainer
...
When sticky mode is enabled, the table must be scrolled vertically if it does not fit on the page.
It may not be the best option, but now it is necessary. For example, for the pages "Servers, Storage, Groups", etc.
Changing the padding-top is necessary to maintain a single style if there are some other elements in front of the form (buttons for example) or there is nothing in front of the form.
2024-03-15 16:26:49 +03:00
00bd09fdc2
Revert "Merge pull request #3864 from IgorA100/patch-19"
...
This reverts commit 305a1485cc736ac7dd33
2024-03-15 09:13:22 -04:00
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
4906bb17a2
add space
2024-03-15 11:28:43 +03:00
2f7287e5ba
Changed "let" to "const", adding spaces & add "const"
2024-03-15 11:25:13 +03:00
f61ea18f77
Removed unused function
2024-03-15 01:13:27 +03:00
2e959124ee
Change ID button
2024-03-15 01:11:22 +03:00
ff0a630aea
Replacing icon "keyboard_arrow" with "filter_alt" in the hide filter button on the console
2024-03-15 01:07:19 +03:00
b70ff30b29
Merge branch 'ZoneMinder:master' into patch-16
2024-03-15 00:56:24 +03:00
f9ea031581
Merge branch 'patch-6' of github.com:IgorA100/zoneminder into IgorA100-patch-6
2024-03-14 17:15:46 -04:00
305a1485cc
Merge pull request #3864 from IgorA100/patch-19
...
Fix page console
2024-03-14 16:44:21 -04:00
736ac7dd33
Merge pull request #3866 from IgorA100/patch-21
...
Eliminate possible duplication of horizontal scrollbar
2024-03-14 16:43:35 -04:00
ae74a19168
remove class "h-100" because interfere with proper scaling
2024-03-14 22:48:58 +03:00
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
0dc54b6adf
Eliminate possible duplication of horizontal scrollbar
...
All management occurs inside the #options & #sidebar containers
2024-03-14 16:01:15 +03:00
6cd5fac11b
For #contentButtons add margin-bottom: 8px;
...
Now the vertical margin will be symmetrical.
2024-03-14 11:58:30 +03:00
e10bb3610a
Fix previous commit
2024-03-14 11:54:50 +03:00
91955b491d
Remove class "pt-2"
...
The ".contentButtons" style will be changed in the CSS
2024-03-14 11:50:51 +03:00
38ae631dbe
Fix space
2024-03-14 00:11:28 +03:00
37756fb5f9
Added DIV to offset vertical scrollbar to left
2024-03-13 20:59:31 +03:00
cf92914c60
Update options.css
2024-03-13 20:51:23 +03:00
b10511fb97
Adjusting the vertical scroll bar when using sticky
2024-03-13 20:50:25 +03:00
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
6b8fe26be6
empty line
2024-03-13 16:26:25 +03:00
510d60e931
Merge branch 'master' into patch-19
2024-03-13 16:24:45 +03:00
ef3245fe2b
Moved class "pt-2" in other DIV
...
Necessary for correct table scrolling
2024-03-13 16:11:21 +03:00
1d81af50b9
Fixing table header when using sticky
2024-03-13 16:07:22 +03:00
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
4d8a357bba
Rough in bootstrap-table for monitor list in console.
2024-03-13 08:47:31 -04:00
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
83d64e8442
Fix style for sticky navbar & sticky table header
2024-03-13 13:49:47 +03:00
fc23cef16a
Code cleaned & added table header background
2024-03-13 13:33:15 +03:00
6ccf0c66a1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-12 21:45:07 -04:00
2ba7369ea8
hack to fix scroll bars in bootstrap table
2024-03-12 21:45:02 -04:00
be202719c3
Appease eslint
2024-03-12 21:22:50 -04:00
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
95d2e0a27c
Fix form not scrolling entirely. Remove top padding. Remove right padding due to bootstrap row.
2024-03-12 17:53:27 -04:00
f926e98283
Temp fix to put scroll bars back
2024-03-12 09:12:53 -04:00
855da2cbc4
Put back scroll bars on console
2024-03-12 08:55:44 -04:00
657cda18ef
Put back style permitting scrolling to work
2024-03-12 08:44:12 -04:00
625e699e32
Fix: video scaling on console
...
Close #3861
2024-03-12 11:44:29 +03:00
65c2331394
Feat: added functions for controlling the visibility of blocks when clicking on the control button
2024-03-10 23:19:19 +03:00
20e1ae2090
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-10 11:04:10 -04:00
3f9bda4f80
FIx arrap_map => array_map. Fixes #3859
2024-03-10 11:03:03 -04:00
3939bcec22
Fix eslint
2024-03-10 11:02:28 -04:00
b647280766
FIx arrap_map to array_map. Don't assume _REQUEST[mids] exists. Fixes #3859
2024-03-10 10:59:56 -04:00
76db26cec1
Merge pull request #3852 from IgorA100/patch-12
...
Fix style in options pages
2024-03-09 11:54:43 -05:00
28fd799bf6
Removed erroneously added style for tag 'a'
2024-03-09 10:26:16 +03:00
4718bff514
Merge pull request #3856 from IgorA100/patch-14
...
Fix design when viewing list of events
2024-03-08 08:24:18 -05:00
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
f27f9bdf95
Fix layout
2024-03-07 16:58:26 +03:00
ab556f3135
Update events.css
2024-03-07 16:16:02 +03:00
4df177208c
Fix design when viewing list of events
...
Layouts & space in code
2024-03-07 16:03:16 +03:00
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
e90340dd2b
Fix: More correct scaling (with padding) during live viewing
2024-03-07 13:30:39 +03:00
f0088e49d7
Remove debug
2024-03-06 16:21:44 -05:00
6124678fb8
Add scaling to zms url
2024-03-06 16:21:19 -05:00
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
ada974ef51
Fix eslint
2024-03-06 14:21:18 -05:00
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
57c993507c
Fix layout
2024-03-06 20:18:15 +03:00
7757eeae1a
Fix layout
2024-03-06 20:14:36 +03:00
151114f778
Fix space
2024-03-06 20:00:08 +03:00
008c864751
Fix style
2024-03-06 19:56:10 +03:00
714a0913e4
Merge branch 'ZoneMinder:master' into patch-12
2024-03-06 19:52:25 +03:00
f94d264407
Fix: Button block location
...
There is no need
2024-03-06 19:01:52 +03:00
c8c731519d
Fix Removing excess styles & specifying a minimum textarea height
2024-03-06 01:23:42 +03:00
c69f6e8908
Fix Removing excess styles & Aligning a form vertically
...
Additional modernization required
2024-03-06 01:14:59 +03:00
696837e22f
Fix Removing excess styles
2024-03-06 01:11:16 +03:00
21cb1c8c29
Fix layout
2024-03-06 01:06:45 +03:00
55df0fd8f7
Only save permissions if passed in POST. We might not be able to see all monitors, so might not exist in POST.
2024-03-05 16:33:41 -05:00
a4ed614763
Fix set chosen width for modal window
...
For the modal window, set the width chosen to 100%
2024-03-06 00:23:11 +03:00
c078cf7bba
Use per-monitor permission on save button
2024-03-05 14:02:20 -05:00
b5e1d5e611
Fix invalid canEditMonitor call, simplify login in canView and canEdit to prefer per-monitor permissions
2024-03-05 14:02:01 -05:00
b4bbff6353
Use per-monitor permissions
2024-03-05 14:00:40 -05:00
5120baa9ee
Implement object permissions vs entity permissions so that we can handle the new group based permissions on Monitors. This fixes status updates when MOnitors=None but there is a per-monitor group based view permission.
2024-03-05 14:00:23 -05:00
302f3ad96d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-05 11:48:16 -05:00
beda6cd66d
Remove unused linked monitor array population. All is done in javascript now
2024-03-05 11:47:39 -05:00
5de9e7800c
Use monitor->canEdit when making source link clickable because it is per-monitor instead of User['Monitors']
2024-03-05 11:47:15 -05:00
4ab1aaa1d0
Fix Linked monitor expression not updating
2024-03-05 11:46:42 -05:00
ed14fc7449
Don't allow linking to ourselves
2024-03-05 11:14:58 -05:00
5c360c2a91
Add mid to available globals
2024-03-05 10:35:07 -05:00
9eee9fcb1e
Lint fixes
2024-03-05 08:14:28 -05:00
634bffea80
Adaptation of Chosen to Bootstrap (Height alignment)
2024-03-05 15:43:01 +03:00
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
8f521a7221
Fix Entrust management of enabling search in select to the Chosen plugin
2024-03-05 14:06:13 +03:00
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
bc16f526ac
Merge pull request #3850 from IgorA100/patch-10
...
Added button for editing the monitor during live viewing.
2024-03-04 17:09:22 -05:00
8902f902ea
Update skin.css
2024-03-05 00:58:05 +03:00
1f6279a00f
Update skin.css
2024-03-05 00:56:59 +03:00
b07ae01e89
Fix cursor for <a>
2024-03-05 00:53:47 +03:00
7482d28af8
Fix Handling a button click
...
For some reason, an old, faulty code was sent..
2024-03-04 23:15:10 +03:00
7920f17c8a
Handling button click
2024-03-04 23:03:42 +03:00
38acd931e4
Added monitor edit button
2024-03-04 21:22:10 +03:00
a370ce19ea
Fix style
2024-03-04 17:28:30 +03:00
f173974f2b
Fix: Scaling
2024-03-04 17:22:32 +03:00
ea17631de9
Fix Control panel
...
At least temporarily.
In general, a lot of work.
2024-03-04 17:07:55 +03:00
074751e068
Fix style
...
Managed by bootstrap
2024-03-04 17:00:20 +03:00
a18167377e
Fix: scaleToFit function
...
It is required to pass an object in parameters
2024-03-04 16:52:04 +03:00
66ff90c8c1
Update watch.js
2024-03-04 16:47:46 +03:00
a05540bd3d
Fix: Responsive design with use bootstrap
2024-03-04 16:30:09 +03:00
89de8b7765
Merge pull request #3845 from IgorA100/patch-8
...
Added a link to live viewing from monitor event viewer
2024-03-03 14:29:57 -05:00
55244441c3
Add processing for clicking on the button to view all events
2024-03-03 18:50:02 +03:00
1793e7813c
Added value "Edit" to "translate" array for translation
2024-03-03 18:20:40 +03:00
45bf972fea
Ref: style
...
Bootstrap is now used more
2024-03-03 18:14:29 +03:00
99779681fb
Fix: style
...
Not required, because now using Bootstrap
2024-03-03 17:27:14 +03:00
21abe20234
Fix: style
...
Not required, because now using Bootstrap
2024-03-03 17:26:09 +03:00
373fa15440
Fix: rem style
...
Not required, because now using Bootstrap
2024-03-03 17:21:30 +03:00
9aa8919fb8
Fix: Button layout
2024-03-03 17:04:59 +03:00
6ea195b8b1
Fix: Button layout
2024-03-03 17:01:50 +03:00
0d5d495bbf
FixL Recalculation of height and width if "padding" is specified for "wrapperEventVideo"
2024-03-03 16:56:50 +03:00
84d8aa9e52
Ref: Responsive design
2024-03-03 16:49:54 +03:00
852dd772ab
Merge branch 'ZoneMinder:master' into patch-6
2024-03-03 00:38:02 +03:00
ccaaf6aaf5
Consistency
2024-03-02 14:12:59 -05:00
d7eca5bb23
fix(event): Keep progressBar from overlapping videojs control.
2024-03-02 14:10:25 -05:00
3d008263e4
fix(tags): Tags were not populated on watch view
2024-03-02 11:30:35 -05:00
d0d47a81d3
Merge pull request #3846 from Simpler1/patch-1
...
Placeholder text for monitor date time format.
2024-03-02 11:12:11 -05:00
19e6e9baf2
Merge pull request #3707 from Simpler1/default_sound
...
feat(sound): Include default alarm sound (again)
2024-03-02 11:11:03 -05:00
7fdc204082
feat(): Custom snapp.ogg sound for ZoneMinder
2024-03-02 10:15:44 -05:00
e1e255393d
typo
2024-03-02 09:55:08 -05:00
6ff4c3f7ec
Added additional parameters
2024-03-02 09:52:55 -05:00
ea0c79d976
Placeholder text for monitor date time format.
...
After spending an hour trying to figure out which date time format to enter here, I thought it would be best to just spell it out for users trying to customize this.
2024-03-01 16:59:17 -05:00
ecab601c21
Use array_values to discard the keys in the array of monitorIds
2024-03-01 16:13:52 -05:00
8a42594009
Upgrade bootstrap-table to 1.22.3
2024-03-01 11:44:06 -05:00
02785fb81d
Merge pull request #3844 from IgorA100/patch-7
...
Adding and correcting Russian translation
2024-02-29 15:22:17 -05:00
9cd048d97b
Only try to set monitor_permissions for non-deleted Monitors
2024-02-29 09:19:19 -05:00
c33ec9833a
Only show non deleted monitors in linked monitors
2024-02-29 08:59:14 -05:00
43cd675d96
Added value "Live" to "translate" array for translation
2024-02-29 15:12:33 +03:00
a6b9ba5a1d
Added a link to live viewing from monitor event viewer
2024-02-29 15:07:41 +03:00
a28df623f2
Fix canEdit is a hash, not a function
2024-02-27 19:18:09 -05:00
0128873ca7
Spacing, some better debug
2024-02-27 18:41:31 -05:00
c48ccd3ce2
Add autocomplete to onvif_username and fix case when local inputs aren't there after switching from non-local to local because Method is now wrong.
2024-02-27 17:39:34 -05:00
ad53ebb8a8
Handle when inputs don't exist.
2024-02-27 17:38:48 -05:00
c1b65185b5
Handle when inputs don't exist.
2024-02-27 17:38:45 -05:00
c51c53c47a
FIx use of inline javascript for the method dropdown on remote type monitors
2024-02-27 16:50:52 -05:00
742a821170
Add 'Decoder' => 'Декодер'
2024-02-28 00:30:43 +03:00
ebe8a26188
Add 'OnMotion' => 'При движении',
2024-02-28 00:26:30 +03:00
881cb5327e
Adding and correcting Russian translation
2024-02-28 00:19:47 +03:00
f89b7461b1
Temp solution: If server ID is "1" we assume that it is NULL in DB
...
To display Stats in Options->Server
2024-02-27 22:06:24 +03:00
5a5a25e6a9
Add ReadStats()
2024-02-27 21:53:25 +03:00
59e4bdd69e
Fix: Losing icons during Ajax update
2024-02-27 19:57:23 +03:00
72674fd0d4
Add function ReadStats()
...
Reading Stats from DB
2024-02-27 18:14:02 +03:00
4529b32a5d
Fix getSysLoadHTML() getCpuUsageHTM()
2024-02-27 18:03:39 +03:00
cd8ffa08dc
Add getCpuUsageHTML()
2024-02-27 16:49:29 +03:00
f18f448a8c
Fix setting frames
2024-02-26 16:22:51 -05:00
58d8cf0adf
Makes the "Events" part of the ONVIF URL configurable
...
as required per some ONVIF version 21.06 cameras
by default sets the Events Path equals to "/Events"
to maintain functionality
2024-02-24 11:05:08 -06:00
989b3b7ba4
Merge pull request #3838 from IgorA100/patch-3
...
Fix: Logging levels coloring for languages other than English
2024-02-23 09:01:19 -05:00
ed64db315b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-23 08:56:32 -05:00
a738f1bc2e
Remove unused EventStartMode. Fixes #3839
2024-02-23 08:56:26 -05:00
78ab72a0d9
Remove EventStartMode stuff
2024-02-22 16:58:14 -05:00
f9a1b6b4f4
Only show cpuUsage if we have an Id
2024-02-22 12:55:35 -05:00
ebad97038e
Implement CpuLoad in Server object
2024-02-22 12:52:49 -05:00
799dcd5f51
Default thisServer to a default server object.
2024-02-22 12:52:39 -05:00
b5096677c7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-22 10:57:18 -05:00
1742c03b1a
Handle non-multi-server case. Fixes #3836
2024-02-22 10:57:01 -05:00
eeb8856157
Ad EventStartMode and EventCLoseMode to monitor
2024-02-22 10:46:36 -05:00
b079281900
Remove second data-click-to-select
2024-02-22 09:33:54 -05:00
0cbce2a8a4
Apply bootstrap table to servers list. Split the servers content into it's own file. Add overflow:auto to the container which for some reason fixes button visibility.
2024-02-22 09:33:32 -05:00
34815e02b9
Fix: Logging levels coloring
...
When getting the index, you cannot use text(), because there may be different meaning depending on the language!
If the value is different from 'Level', lvl_ndx will not be found and coloring will not work.
2024-02-22 11:16:30 +03:00
edcf09882f
Subsitute a 0 when ZM_SERVER_ID is not defined
2024-02-21 16:35:04 -05:00
9783c5a560
Adding an "All Events" Button from Live View
...
Ability to jump to viewing all events from live viewing.
2024-02-21 15:44:51 +03:00
d9cfcfbaa7
Clicking the "All Events" button from Live View
...
When you press the button, we go to view all events.
2024-02-21 15:17:15 +03:00
661d8620fd
Add Cpu Usage % to header
2024-02-20 13:15:38 -05:00
f54f10df72
Add server stats fields
2024-02-20 13:14:23 -05:00
def378fe12
Fix relative path to dms.js
2024-02-17 11:59:09 -05:00
16392fc1fb
removed unnecessary definition in lang file.
2024-02-16 18:09:34 -06:00
78676ac249
On Options -> System , show languages with names not codes/filenames
...
Possible implementation for issue #3694
2024-02-16 18:02:15 -06:00
2fd7c089e3
Update loading the download modal. Include the monitor and events filters, include auth_relay
2024-02-15 16:27:30 -05:00
7e98cf36d6
Remove requirement for id or eids. We can specify by filter now. Fix populating exportIds making sure it is an array.
2024-02-15 16:21:39 -05:00
f339ba5508
When listing option name, remove the ZM_ to be consistent with the options view
2024-02-15 12:54:39 -05:00
4424bab051
Add a resize handler
2024-02-15 09:38:17 -05:00
839f09dba1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-13 13:54:10 -05:00
013f6daaf6
Put back Accept-Ranges as it breaks seeking
2024-02-13 13:54:04 -05:00
0ff48f631e
Implements an option to disable soap_wsa code that doesn't work
...
with some chinese cameras, more common to Latam zone
2024-02-12 19:22:01 -06:00
8ffbc1d6f0
INclude monitor Name in monitors array, because it useful to show monitors by name instead of id
2024-02-11 19:13:48 -05:00
dc556c0f70
Handle user being undefined when not logged in
2024-02-11 19:12:37 -05:00
51020e92a4
Merge pull request #3822 from IgorA100/patch-1
...
Sorting an array of events when merging into a file
2024-02-09 10:35:05 -05:00
8bb368fe13
Fix children MonitorIds not being included due to the use of + instead of array_merge
2024-02-09 10:33:22 -05:00
a204a973f1
Code optimization
2024-02-09 18:09:51 +03:00
d0dc4bcbe1
Sorting an array of events when merging into a file
...
When merging events into a file, they must first be sorted by time and start date of the event.
2024-02-09 17:34:06 +03:00
31af9d905c
Still generate an auth if no password present.
2024-02-08 13:31:21 -05:00
ec20772f98
Use const on bottomLoc
2024-02-08 12:34:33 -05:00
f795fb3c19
fix unexpected this, although according to jquery docs it is totally valid
2024-02-08 12:33:32 -05:00
00f27ca8af
Add autocomplete=off to Montage Layout name
2024-02-08 10:27:39 -05:00
cc7b8fa9d0
Rename DMS2LL to dms2ll to satisfy eslint
2024-02-07 11:14:19 -05:00
b94b454bf9
Rename EventName to Name and Monitor Name to Monitor to take up less space
2024-02-07 11:08:15 -05:00
bd7bfcbdcd
Rename EventName to Name and Monitor Name to Monitor to take up less space
2024-02-07 11:08:11 -05:00
cc5bb8ecec
rename table=>eventStatTable. Apply width and height to map if it is to be displayed
2024-02-07 11:07:12 -05:00
79164993f9
Remove fixed width and height from map, they will be set in js if map is to be displayed
2024-02-07 11:06:47 -05:00
36b4d9a264
Add display: flex to content so that scroll bars work
2024-02-07 11:06:26 -05:00
fcac8ec2f2
Rename zmMap to ZMMap because eslint thinks constructors should always be capitalized.
2024-02-07 10:58:39 -05:00
5f6df6fad7
Make eventVideo div take up available space so that scaleToFit can do it's job
2024-02-07 10:38:17 -05:00
124bbc0295
pass #eventVIdeo as container to scaleToFit so that it fits within available width
2024-02-07 10:37:53 -05:00
3c91a2bcaf
Add px-3 to the flex container for stats and view to handle scroll bar
2024-02-07 10:37:31 -05:00
e6eff5903f
Add container to params for scaleToFit. The container we want to fit width into might not be #content.
2024-02-07 10:37:08 -05:00
57e9cc2b16
In the case where locale = System... properly set locale for the Date*FOrmatter classes
2024-02-05 19:06:16 -05:00
5a866aee0e
Add id's to selects to appease label for= attributes
2024-02-05 18:42:25 -05:00
4107058000
FIx units on warning about timeout
2024-02-05 18:42:05 -05:00
43c3937b87
Fix image proxy broken due to imagecreatefromstream=>imagecreatefromstring
2024-02-02 11:50:03 -05:00
48015e6efd
Remove extra / and urlencode password for Amcrest
2024-02-02 11:49:44 -05:00
aa67e5f6f3
Add range limits to lat&long and don't do anything if empty
2024-02-01 18:01:26 -05:00
314236dea8
Add inputs and code to display and convert to and from decimal degress and dhms for lat&long. Update marker on map when values change.
2024-02-01 17:58:20 -05:00
4987ea1b21
Define user before using for viewableMonitorIds
2024-02-01 11:39:09 -05:00
d47f78b354
Fix for use strict defining monitor_ids
2024-02-01 11:38:38 -05:00
da2744749d
fix vertical alignment and stretching of images on snapshot
2024-02-01 11:38:24 -05:00
9bb9f733a4
Reference the tab that the bad Path or Port is on
2024-01-31 18:24:22 -05:00
8e035f61ac
Use viewableMonitorsIds instead of canView(Monitors) when deciding to show the Console or Montage Links
2024-01-31 16:09:33 -05:00
05d605fe55
change Map to zmMap to prevent name collision with luxor. Add a haversine function to get distance between two lat&long. Start to rough in grouping locations into 1 pin.
2024-01-30 19:57:18 -05:00
18606e78ad
Remove width on p element on monitors view as it is too short for Recording and doesn't seem to be needed
2024-01-30 14:29:41 -05:00
0e88d764f0
Use object methods to load montiors
2024-01-28 16:53:30 -05:00
2c7c928fa6
Use object methods when loading monitors and zones and filter them by Deleted status
2024-01-28 16:53:06 -05:00
b7bc7cef7e
Only load non deleted Monitors
2024-01-28 16:52:36 -05:00
c84e7d4563
Include Monitor.php
2024-01-28 16:52:16 -05:00
512b1ec76d
Only list viewable monitors and zones
2024-01-28 16:51:49 -05:00
ac2cfa5ccb
Add children groups to MonitorIds
2024-01-28 16:32:31 -05:00
648bd77b21
Apply validCardinal to all eids. Remove dead delete code
2024-01-27 18:33:19 -05:00
a5916f01d1
Protect against XSS in server db values
2024-01-25 19:34:46 -05:00
Isaac Connor
IgorA100
Simpler1
Isaac Connor
Simpler1
borozenetsvv
Server