8f7d0c7d9e
Chore: Eslint
2024-04-09 00:08:55 +03:00
0458272d54
Added a border around the monitor in layer editing mode
...
+ Added grid 2x2 for drag & resize monitor
+ Clear css style for monitor when selecting Layout
2024-04-08 23:54:52 +03:00
5838368203
Fix (Montage): Vertical alignment of monitors to top
...
This fixes the monitor block height issue
+ Added a border around monitor in layer editing mode.
2024-04-08 23:44:17 +03:00
ab106aaf8f
Merge pull request #3957 from IgorA100/patch-69
...
Fix: If Select has no Options, don't try to select 1 Option in Filter page
2024-04-08 12:32:56 -04:00
51bf4bcbb8
Chore: Replace Tabs to Space
2024-04-08 19:21:30 +03:00
464f31c4f2
Disabled "reset new row to default"
2024-04-08 17:58:19 +03:00
a8d1f39005
Chore Replace Tabs to Space
2024-04-08 12:50:29 +03:00
f610001543
Fix: If Select has no Options, don't try to select 1 Option in Filter page
...
Because selecting an option that does not exist results in an error.
For example, when cloning a Tags filter string when there are no tags.
2024-04-08 12:47:46 +03:00
1b9dc86869
% in frame statistics should be rounded to a decimal place.
...
When setting up analysis of small objects, it is useful to know the % value more precisely
2024-04-07 22:59:01 +03:00
a720292025
Merge branch 'ZoneMinder:master' into patch-6
2024-04-07 20:45:21 +03:00
6bf61ae2bb
Fix justification on sortTable
2024-04-07 11:35:01 -04:00
fc980eb453
Merge pull request #3953 from IgorA100/patch-65
...
Fix: Allow Chosen leave empty value in Select
2024-04-07 10:17:18 -04:00
3c71c3a970
Merge pull request #3954 from IgorA100/patch-66
...
Fix: For ".chosen" do not show blocks when loading document
2024-04-07 10:16:50 -04:00
bec19f39e6
Fix comparison to True instead of true. Fixes #3952
2024-04-07 10:12:12 -04:00
4989d8aac2
Fix: For ".chosen" do not show blocks when loading document
...
Prevents blocks from appearing before apply "Chosen"
2024-04-07 00:35:01 +03:00
9c47e5ceda
Fix use of undefined variables
2024-04-06 17:28:28 -04:00
5cb12b844e
Fix: Chosen style (moved a little to the right X clearing)
2024-04-07 00:14:30 +03:00
38abcfa7a4
Fix: Allow Chosen leave empty value in Select
2024-04-07 00:01:29 +03:00
84e0cb081b
Merge branch 'ZoneMinder:master' into patch-64
2024-04-06 00:55:13 +03:00
b2dcf39936
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-04-05 17:29:37 -04:00
7151771177
Disable delete button on click so that we can't double click it.
2024-04-05 17:29:31 -04:00
49704656b8
Merge branch 'ZoneMinder:master' into patch-6
2024-04-05 22:58:55 +03:00
68172e54a9
Feat: Added the ability to zoom in/out image of each monitor separately on the "Montage" page
2024-04-05 19:44:19 +03:00
972a9e03af
Merge pull request #3920 from IgorA100/patch-45
...
Feat: Ability to download videos on Event view page with a multiport configuration
2024-04-05 09:47:16 -04:00
35ce814712
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-04-05 09:23:37 -04:00
45c8828f3d
Feat: Mouse moving an enlarged video frame during Event viewing
2024-04-05 14:45:27 +03:00
78d68bed0d
Chore: add space
2024-04-04 20:45:50 +03:00
693e2c16f6
Preventing jerking when collapsing/expanding a block
2024-04-04 20:36:33 +03:00
efa34f455f
Changed the chevron icon to a filter icon on "Montage" page
2024-04-04 20:30:24 +03:00
dd8ef6b786
Changed the chevron icon to a filter icon on "Montage review" page
2024-04-04 20:21:29 +03:00
4702224dce
Update watch.php
2024-04-04 20:11:15 +03:00
3c30ef8506
Add style for ".hidden-shift"
2024-04-04 20:08:41 +03:00
c02310e6a6
Changing the algorithm for collapsing/expanding a block
...
Add class 'hidden-shift' to prevent jerking when running the "Chosen" script, it is necessary to make the block visible to JS, but invisible to humans!
Added processing of the "data-flip-control-run-after-complete-func" attribute to launch the function AFTER COMPLETING the work "slideToggle"
Disabled (with subsequent probable deletion)
$j("#mfbflip").click(function()
Minor fixes
2024-04-04 19:36:29 +03:00
5c33f4bbb5
Fix: Moved the hide/show filter block button away from the right border
2024-04-04 12:01:20 +03:00
4ea208f7d9
Fix: css for header form Watch page
2024-04-04 11:57:20 +03:00
f2aed5fc21
Chore: Adjust spaces, tabs, newlines
2024-04-03 22:58:21 +03:00
ad3558a9b1
Merge pull request #3938 from IgorA100/patch-56
...
Feat: Added a button to hide/show the timeline panel on the "Montage Review" page
2024-04-03 14:08:17 -04:00
8a522c70b7
The "#mfbpanel" style is now in the main CSS file
2024-04-03 21:03:46 +03:00
79c4dd0466
The "#mfbpanel" style is now in the main CSS file
2024-04-03 21:03:15 +03:00
25bc22e871
Moved the "#mfbpanel" style to the main CSS file
2024-04-03 21:02:01 +03:00
542f3a72af
Leave the bootstrap style (padding right & left) for "#mfbpanel"
2024-04-03 20:55:14 +03:00
c68b6696d1
Fix: Jerking of the "#mfbpanel" panel when collapsing and expanding on the "Montage review" page
2024-04-03 20:53:07 +03:00
522f29c5b1
Fix: Jerking of the "#mfbpanel" panel when collapsing and expanding on the "Montage" page
2024-04-03 20:44:25 +03:00
cf23f3aa37
Added a check for the presence of the changeScale() function.
2024-04-03 20:11:30 +03:00
8c875a1cce
Merge pull request #3934 from IgorA100/patch-54
...
Feat: Mouse moving an enlarged video frame during live viewing
2024-04-03 12:52:46 -04:00
7ace3d775b
Merge pull request #3922 from IgorA100/patch-46
...
Report in Console if monitor use ONVIF detection
2024-04-03 12:43:43 -04:00
c3101104f0
Merge pull request #3940 from IgorA100/patch-57
...
Fix: Apply .wrapper-scroll-table only to body.sticky
2024-04-03 12:42:16 -04:00
31fb569f6d
Merge pull request #3941 from IgorA100/patch-58
...
Fix: background color when viewing alarm frames for an event
2024-04-03 11:48:35 -04:00
ee521308b6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-04-03 11:45:29 -04:00
1e25e45206
Merge pull request #3942 from IgorA100/patch-59
...
Fix: Offset zoom frame in console table and viewing alarm frames table
2024-04-03 11:45:18 -04:00
c185ca6bf6
Fix: Cursor style for moving along the timeline when viewing a recorded event
...
1. Changed the cursor style to "pointer", because the cursor could take on two different styles, which doesn’t look nice.
2. Changed the width of the vertical blue stripe +1 pixel.
3. When the cursor was in the extreme right position, a horizontal scroll bar previously appeared, because "#indicator" went beyond "#progressBar".
2024-04-03 17:04:42 +03:00
09e7d68eff
Merge pull request #3939 from Simpler1/patch-13
...
feat(logs): Consistent spacing for terms and buttons
2024-04-03 09:14:13 -04:00
bad852db0b
Merge pull request #3933 from borozenetsvv/master
...
Update ru_ru.php
2024-04-03 09:06:44 -04:00
4cee61ad35
Fix: Offset zoom frame in console table and viewing alarm frames table
...
1. Vertical offset = 0, because otherwise, the topmost frame in the table will be cut off at the top. The bottommost frame will create a vertical scroll bar and will therefore be fully viewable.
2. If the frame is on the right in the table, then its right position must be = 0, otherwise it will also go beyond the right border and will not be visible.
2024-04-03 16:01:19 +03:00
26254bf86d
Fix: background color when viewing alarm frames for an event
2024-04-03 13:11:32 +03:00
da62c5b65a
Fix: When Zooming out of a video frame, do not apply updatePrevCoordinatFrame()
2024-04-02 14:37:29 +03:00
ec090374ba
Fix: Apply .wrapper-scroll-table only to body.sticky for entire Groups page
2024-04-02 12:22:46 +03:00
0e319c2453
Fix: Apply .wrapper-scroll-table only to body.sticky for entire Options page
2024-04-02 12:20:44 +03:00
55d75a2410
fix(events): spacing
2024-04-01 13:09:02 -04:00
02b1258bb5
fix(logs): spacing
2024-04-01 12:36:27 -04:00
6415a4c911
Fix: Lost semicolon
2024-04-01 19:35:43 +03:00
649632dd4c
Chore: eslint format
2024-04-01 19:31:53 +03:00
c4220132e0
feat(logs): Consistent spacing for terms and buttons
2024-04-01 12:30:31 -04:00
6a3071a5fa
Added a button to hide/show the timeline panel
2024-04-01 19:15:01 +03:00
5372129b28
Feat: Added the ability to execute a function BEFORE or AFTER the hide/show event of a DOM element block
...
DOM element block hiding/showing events
In addition to the implementation in PR #3860
2024-04-01 18:54:55 +03:00
40f666129c
Show console in navbar when there are no monitors yet defined.
2024-04-01 09:23:20 -04:00
c370cd56cf
Merge pull request #3929 from IgorA100/patch-52
...
Feat: Allow "chosen" in <select> to use full text search
2024-04-01 09:21:34 -04:00
09d8a1d50c
Merge pull request #3935 from IgorA100/patch-55
...
Fix: Event table coloring in dark css in live view
2024-04-01 09:20:45 -04:00
1184ecf567
fix(events): Allow changing weekday after using filter
2024-04-01 08:24:31 -04:00
6fe6d137c7
Fix(events): spacing below buttons
2024-04-01 08:22:48 -04:00
ce19339a41
Changed the table row background color for the currently active event in live view
2024-04-01 14:55:05 +03:00
5e26785f97
Add variable "--alarmBG: #352424;"
2024-04-01 14:53:23 +03:00
4a88710622
Fix: Event table header coloring in live view
2024-04-01 14:35:57 +03:00
131a33ef38
Chore: Code Cleanup
2024-04-01 14:04:57 +03:00
dcc0ff071a
Chore: eslint format
2024-04-01 13:53:10 +03:00
0c2713e53a
Update watch.js
2024-04-01 13:50:31 +03:00
289f7cbe43
Chore: eslint format
2024-04-01 13:45:39 +03:00
ec807a70a4
Fix: Previous code formatting was mistakenly removed.
2024-04-01 13:34:52 +03:00
309809ff9c
Feat: Added functions for moving an enlarged video frame during live viewing
2024-04-01 13:22:43 +03:00
d7ae0d9d23
Feat: Mouse moving an enlarged video frame during live viewing
...
Added mouse movement tracking functions.
2024-04-01 12:56:14 +03:00
82ce0f9f15
Update ru_ru.php
2024-03-31 14:39:33 +07:00
c28c5fd5e4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-30 13:57:38 -04:00
a93b698d4b
FIx eslint
2024-03-30 13:57:26 -04:00
af371e5442
Merge pull request #3930 from Simpler1/patch-10
...
feat(): Term fields spacing for both console and events
2024-03-30 12:15:30 -04:00
868bf988ce
chore(): Code consistency
2024-03-30 11:37:54 -04:00
6dff8760b7
chore(): Code consistency
2024-03-30 11:22:28 -04:00
97191a1ac4
Handle monitor Width being 0
2024-03-29 19:40:06 -04:00
afac5e778c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-29 18:08:27 -04:00
049cb625b8
Fix: sticky header table on console
2024-03-30 00:56:59 +03:00
2557c5093f
fix(): Montage Review minimum width terms
2024-03-29 16:13:30 -04:00
4ba4ab815f
fix(): Views: Montage Review and Audit Events Report
2024-03-29 15:12:42 -04:00
170297db21
feat(): Term spacing on all views
2024-03-29 14:55:22 -04:00
851246ccc2
feat(): Term fields spacing for both console and events
2024-03-29 09:30:38 -04:00
0b227f2c80
Merge pull request #3928 from IgorA100/patch-51
...
Apply "chosen" to <select> on the "Log" page
2024-03-29 08:50:16 -04:00
275e3a8e15
Feat: Allow "chosen" to use full text search
2024-03-29 15:36:25 +03:00
8e6f24a648
Update log.php
2024-03-29 15:32:25 +03:00
b8717f0de7
Merge pull request #3917 from IgorA100/patch-44
...
Feat: Change scrollbar style for base css
2024-03-29 08:22:55 -04:00
64fa079f0d
Merge pull request #3918 from Simpler1/patch-8
...
chore(lint): Remove empty css
2024-03-29 08:22:32 -04:00
3a894db740
Merge pull request #3921 from Simpler1/patch-9
...
chore(lint): spacing
2024-03-29 08:22:06 -04:00
ae82262b50
Merge pull request #3924 from IgorA100/patch-47
...
Fix style for classic skin
2024-03-29 08:20:53 -04:00
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
IgorA100
Isaac Connor
Isaac Connor
Simpler1
borozenetsvv
Simpler1