Isaac Connor
ea5d19412c
Only include the function modal once at the end as it will get populated with data before being made visible
2020-09-03 18:23:26 -04:00
Isaac Connor
d4d0a971d1
get rid of errant fo
2020-09-03 10:19:59 -04:00
Isaac Connor
dd5e342196
use xhtmlFooter
2020-09-02 18:17:12 -04:00
Isaac Connor
b0eacba0ee
use xhtmlFooter
2020-09-02 18:14:45 -04:00
Isaac Connor
22a40edd71
spacing
2020-09-02 18:12:35 -04:00
Isaac Connor
18671b7c19
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:57:32 -04:00
Isaac Connor
69bee20ef5
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:56:30 -04:00
Isaac Connor
5b53289fee
fix html structure
2020-09-02 17:55:34 -04:00
Isaac Connor
7623733840
use xhtmlFooter and fix spacing
2020-09-02 17:55:23 -04:00
Isaac Connor
aa4e9600eb
Update to use MonitorStream
2020-09-02 17:36:01 -04:00
Isaac Connor
e25708ce99
use getBodyTopHTML and xhtmlFooter
2020-09-02 17:35:46 -04:00
Isaac Connor
fa780c5020
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:35:24 -04:00
Isaac Connor
f38692795e
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:35:13 -04:00
Isaac Connor
cf1f408e96
Don't need pauseString and playStream anymore
2020-09-02 17:34:09 -04:00
Isaac Connor
c6bc6704b3
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:33:56 -04:00
Isaac Connor
bc710bc826
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:33:09 -04:00
Isaac Connor
a6ad57b393
fix html validation errors
2020-09-02 17:32:24 -04:00
Isaac Connor
c2760ef768
add needed js stuff for streaming
2020-09-02 17:28:08 -04:00
Isaac Connor
d243d798ff
add needed js stuff for streaming
2020-09-02 17:27:59 -04:00
Isaac Connor
0cd35518c3
Fix id on nav
2020-09-02 14:47:07 -04:00
Isaac Connor
ab116a1a6f
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:47:00 -04:00
Isaac Connor
84bed1b16a
include MonitorStream, fix layout of image stream. Update buttons. start with a static image, MonitorStream will start the streaming
2020-09-02 14:46:45 -04:00
Isaac Connor
7b4569392c
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:46:08 -04:00
Isaac Connor
3d3966b1ea
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:45:40 -04:00
Isaac Connor
5aef5e2312
populate monitorData for MonitorStream use
2020-09-02 14:45:10 -04:00
Isaac Connor
02d056b277
Fix left column positioning
2020-09-02 14:44:52 -04:00
Isaac Connor
8d2ced0fbb
use MonitorStream to handle the video streaming. update buttons. Add onload event to streaming image so that we redraw the points where they should be. Handle padding in locating points.
2020-09-02 14:44:11 -04:00
Isaac Connor
4f90f37f0e
add back request queue
2020-09-02 14:42:47 -04:00
Isaac Connor
9d84b8bd83
remove datetimepickers from static html. They get added later by javascript
2020-09-02 14:42:23 -04:00
Isaac Connor
5544057a8d
Merge branch 'master' into improve_zone_editing
2020-08-31 18:47:24 -04:00
Isaac Connor
762bea0761
Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot.
2020-08-31 18:30:05 -04:00
Isaac Connor
5a9cbdaa3f
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-31 16:43:41 -04:00
Isaac Connor
e120e21b11
fix off-by 1 in limiting results
2020-08-31 10:37:35 -04:00
Isaac Connor
0995708b5b
Use ajax request instead of webui to delete events. The reason is that the web ui will spit out the events view after performing the action. Without a filter it will try to list every event.
2020-08-31 10:37:03 -04:00
Isaac Connor
0b493cd85a
add svg circles for the points
2020-08-31 10:15:14 -04:00
Isaac Connor
3d5ad4902a
zones can now list multiple monitors
2020-08-31 10:14:53 -04:00
Isaac Connor
3f4f28f322
Move monitor class into js/MonitorStream for use elsewhere
2020-08-31 10:13:58 -04:00
Isaac Connor
fa18887f5c
zones can now list multiple monitors so populate a listof monitors with json data
2020-08-31 10:13:30 -04:00
Isaac Connor
f00f9ead79
Move monitor class into js/MonitorStream for use elsewhere
2020-08-31 10:12:47 -04:00
Isaac Connor
3e09840995
Merge branch 'master' into improve_zone_editing
2020-08-28 17:43:07 -04:00
Andrew Bauer
990b5bd9dc
monitor view - convert links to buttons
2020-08-28 15:22:57 -05:00
Andrew Bauer
9c56cd223f
move header right to shift pill list up
2020-08-28 13:32:46 -05:00
Andrew Bauer
47732e2469
right align monitor item names
2020-08-28 13:18:01 -05:00
Andrew Bauer
a919be7b2d
replace tabs with vert pills
2020-08-28 13:09:49 -05:00
Andrew Bauer
d69b3e7f43
make cancel go back to console
2020-08-28 10:56:09 -05:00
Isaac Connor
04b3f5d294
Merge branch 'master' into improve_zone_editing
2020-08-28 09:43:48 -04:00
Andrew Bauer
2b6090d8c6
console.js - change all createPopup to window.location.assign
2020-08-28 07:58:42 -05:00
Andrew Bauer
a288a54fbe
make form id unique on logout view
2020-08-28 07:42:33 -05:00
Andrew Bauer
1e78307735
add navigation buttons to monitor view
2020-08-27 16:30:49 -05:00
Isaac Connor
f294d099c9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-27 17:16:18 -04:00
Isaac Connor
3d9557c5a4
Implement limit on returned events. Free ram in cache if post_condition fails
2020-08-27 17:16:10 -04:00
Andrew Bauer
1f5f964ae3
add navbar to monitor view
2020-08-27 15:53:24 -05:00
Andrew Bauer
948836ed96
enable jump-to feature on frames
2020-08-27 14:58:21 -05:00
Isaac Connor
e9cef72d9f
Use ViewWdith/ViewHeight to get rotated dimensions when calculating thumbnail size
2020-08-27 12:44:56 -04:00
Isaac Connor
1ad084c052
Remove parse
2020-08-27 12:14:17 -04:00
Isaac Connor
69be26213a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-27 11:55:26 -04:00
Isaac Connor
dc15663030
Fix scales after applying layout
2020-08-27 10:55:14 -04:00
Isaac Connor
6173890a45
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-27 10:34:00 -04:00
Isaac Connor
702ea365c2
Remove cruft and fix the filter bar toggle
2020-08-27 10:33:52 -04:00
Isaac Connor
4c1446d856
Fixes to scale selection and remove code that altered width&height in zms url. zms doesn't honour them. Calculate new scale and alter that parameter.
2020-08-27 10:33:08 -04:00
Isaac Connor
62eddfdf2b
reorganize code a bit for better logical grouping
2020-08-27 10:31:27 -04:00
Andrew Bauer
4bacb136c9
enable page-jump-to table extension
2020-08-27 07:46:52 -05:00
Andrew Bauer
e8a2bbf6e0
continue to fix corrupted merge conflict
2020-08-27 07:42:39 -05:00
Andrew Bauer
9b69eb5762
fix corrupted merge conflict
2020-08-27 07:35:05 -05:00
Andrew Bauer
8ba91db1fb
make logout view a modal
2020-08-26 16:28:11 -05:00
Andrew Bauer
8d202aeef0
eslint
2020-08-26 15:36:38 -05:00
Isaac Connor
ab68bef39a
Merge branch 'master' into filter_pre_post
2020-08-26 15:28:48 -04:00
Isaac Connor
99472242af
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-26 15:16:36 -04:00
Isaac Connor
0ced21dda7
Persist video volume in a cookie so that subsequent events remember the volume level.
...
Fixes #3013
2020-08-26 15:15:57 -04:00
Isaac Connor
74d2ba56db
Persist video volume in a cookie so that subsequent events remember the volume level.
2020-08-26 15:15:10 -04:00
Andrew Bauer
67fe9d0cb4
un-popup the users views
2020-08-26 13:52:10 -05:00
Isaac Connor
24d1ba3a00
fix eslint
2020-08-26 13:41:40 -04:00
Andrew Bauer
1c7bddf96e
monitor config no longer a popup
2020-08-26 12:22:19 -05:00
Andrew Bauer
ac7867eab3
make function view a modal
2020-08-26 11:39:48 -05:00
Isaac Connor
06942746d6
Merge branch 'release-1.34'
2020-08-25 12:41:33 -04:00
Isaac Connor
b5ef7b08b9
settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth.
2020-08-25 12:40:22 -04:00
Isaac Connor
6587cdd3de
Handle failure to get v4l settings. Fix assignment of values to monitor object.
2020-08-25 12:39:44 -04:00
Isaac Connor
e3a48c2db4
Handle the case where the layout has invalid json
2020-08-25 12:07:45 -04:00
Isaac Connor
6fbe7457ff
Add missing globals
2020-08-25 11:47:49 -04:00
Isaac Connor
626e892b33
add global
2020-08-25 11:43:55 -04:00
Isaac Connor
3d3dde22c4
Use zm_session_start
2020-08-25 11:31:06 -04:00
Isaac Connor
278be59c86
Use zm_session_start
2020-08-25 11:30:51 -04:00
Isaac Connor
3c29228df5
Use zm_session_start
2020-08-25 11:30:22 -04:00
Isaac Connor
586f9f3e52
Use zm_session_start
2020-08-25 11:27:25 -04:00
Isaac Connor
981439cbd9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 17:42:37 -04:00
Isaac Connor
fe5e005d8e
Calculate scale to pass to getStreamSrc for thumbnail still and stream
2020-08-24 17:42:23 -04:00
Andrew Bauer
0879ecf9a5
update timeline header
2020-08-24 14:33:01 -05:00
Andrew Bauer
8c32511c83
whitespace
2020-08-24 12:05:31 -05:00
Isaac Connor
bce38ae2c6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 12:05:25 -04:00
Isaac Connor
56e2ac5baa
add scale to query params because zms doesn't wupport width&height
2020-08-24 12:05:14 -04:00
Andrew Bauer
e5e2c3b347
fix stats off by 1 frame, don't alert on score 0
2020-08-24 10:57:54 -05:00
Andrew Bauer
c6e3107a50
make donate view a modal
2020-08-24 09:31:21 -05:00
Isaac Connor
67f2e3c1a0
Merge branch 'master' into filter_pre_post
2020-08-24 10:30:01 -04:00
Isaac Connor
b5cdc5c32d
Set width and height on image tag so browser knows how to lay them out. Fixes flickering.
2020-08-24 10:26:07 -04:00
Isaac Connor
0e9c8a35e6
fix thumbnail height style. Make thumbnail clickable.
2020-08-24 09:32:49 -04:00
Isaac Connor
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
Andrew Bauer
8ea806e264
eslint
2020-08-23 18:40:58 -05:00
Andrew Bauer
699b20b961
whitespace
2020-08-23 17:54:57 -05:00
Andrew Bauer
65181c84ee
update frame top toolbar
2020-08-23 17:53:47 -05:00
Andrew Bauer
773557ee8a
set view to stats rather than popup
2020-08-23 13:25:09 -05:00
Andrew Bauer
86f0d41d8e
autoinit changeScale in frame view
2020-08-23 13:17:03 -05:00
Andrew Bauer
63fc59568f
pad frames cells to account for detail view
2020-08-23 13:12:54 -05:00
Andrew Bauer
4b144dea74
whitespace
2020-08-23 13:02:35 -05:00
Andrew Bauer
f06bfe7cbb
use bootstrap-table on stats view
2020-08-23 12:23:58 -05:00
Andrew Bauer
69ba9e6d0e
eslint
2020-08-23 12:14:09 -05:00
Isaac Connor
2a7ea52330
Merge branch 'release-1.34'
2020-08-23 11:51:54 -04:00
Andrew Bauer
4cbac47d6d
add navbar to stats view
2020-08-22 21:09:58 -05:00
Andrew Bauer
de1d1c2ac6
change close link to back link
2020-08-22 14:43:53 -05:00
Andrew Bauer
ad67f74ba4
add formatting to stats table
2020-08-22 14:12:11 -05:00
Andrew Bauer
afc3d2c548
fix horizontal scroll issues events
2020-08-22 13:00:53 -05:00
Andrew Bauer
e69e767878
fix horizontal scroll nonsense
2020-08-22 12:56:31 -05:00
Andrew Bauer
61f89e3306
rough in frames detail view
2020-08-22 12:45:19 -05:00
Andrew Bauer
5d09ae91ab
move div tag into $imgHTML
2020-08-22 07:14:47 -05:00
Andrew Bauer
8ea7b783b5
generate thumbnails when monitor is connected
2020-08-21 21:18:55 -05:00
Andrew Bauer
c8e40eb5b3
don't generate tumbnails when not running
2020-08-21 21:14:16 -05:00
Andrew Bauer
39d538d5cf
add missig }
2020-08-21 20:57:05 -05:00
Andrew Bauer
73a01855f8
rough in thumbnail animation
2020-08-21 20:44:20 -05:00
Isaac Connor
ac0976324f
Fix case of filterQuery. Fixes #3017
2020-08-21 11:22:47 -04:00
Andrew Bauer
9357017a39
add export fx to tables
2020-08-21 07:11:57 -05:00
Isaac Connor
519bfae1da
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-20 17:12:41 -04:00
Andrew Bauer
de4d144cd4
fix scale dropdown in frame view
2020-08-20 10:16:28 -05:00
Andrew Bauer
72d95275c3
add navbar for frame view
2020-08-20 09:19:04 -05:00
Andrew Bauer
247ace7fa2
process clicks per cell in frames
2020-08-20 09:13:11 -05:00
Andrew Bauer
7175fa3d86
no padding on frames outermost div
2020-08-20 08:19:53 -05:00
Andrew Bauer
c9de30d427
click any row to load frame
2020-08-19 17:54:39 -05:00
Andrew Bauer
b2a632a3f8
reinit thumbnail ani on click events
2020-08-19 16:16:27 -05:00
Andrew Bauer
8f70ae192d
enable thumbnail zoom on frames view
2020-08-19 15:42:35 -05:00
Andrew Bauer
a903a885b6
whitepsace
2020-08-19 14:07:00 -05:00
Isaac Connor
c2d6b8f493
revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors.
2020-08-19 14:39:15 -04:00
Isaac Connor
d0c21995cd
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-19 14:14:32 -04:00
Isaac Connor
efec1e7d4f
remove debug
2020-08-19 14:13:48 -04:00
Isaac Connor
177df46113
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-19 14:11:16 -04:00
Isaac Connor
d366d41297
Update parseFilter to Filter::parse
2020-08-19 14:07:51 -04:00
Andrew Bauer
842efc1574
remove <a> tags from col headers
2020-08-19 12:31:13 -05:00
Andrew Bauer
74b0ad2cb3
get rid of horizontal scrollbar in frames
2020-08-19 12:20:57 -05:00
Andrew Bauer
f317bf1722
fix copy/paste typo
2020-08-19 12:07:31 -05:00
Andrew Bauer
e38a532b78
rough new frames view
2020-08-19 12:04:08 -05:00
Andrew Bauer
ad9b9d91cc
disable the back button when new page
2020-08-18 16:57:03 -05:00
Isaac Connor
b38c5e98a8
Merge branch 'master' into filter_pre_post
2020-08-18 16:33:04 -04:00
Andrew Bauer
3664a9b42c
set the pagination list
2020-08-18 15:12:07 -05:00
Andrew Bauer
1e41bd0823
whitespace
2020-08-18 13:48:18 -05:00
Andrew Bauer
6eb7b6d51c
set the right toolbar btn class to match
2020-08-18 13:13:32 -05:00
Andrew Bauer
df02d84a56
don't go back if not referred
2020-08-18 13:08:17 -05:00
Andrew Bauer
2c9caeb348
whitespace
2020-08-18 12:40:27 -05:00
Isaac Connor
2d5522df14
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-18 13:25:21 -04:00
Isaac Connor
c837a17aea
Add a warning about missing EndTime term on UpdateDiskSpace
2020-08-18 13:25:18 -04:00
Andrew Bauer
bf63500b08
fix thumbnail animation after user event
2020-08-18 12:00:20 -05:00
Isaac Connor
e6d6ee1b67
Merge branch 'filter_warnings'
2020-08-18 11:17:46 -04:00
Isaac Connor
16efa9dbb2
Add extra checks for Deleting without an Archived State term and Running in the background without any actions.
2020-08-18 11:17:22 -04:00
Andrew Bauer
1627b1d0d1
privacy view page formatting
2020-08-18 09:08:26 -05:00
Andrew Bauer
287c585d3d
use translated text for delete confirmation
2020-08-18 08:26:45 -05:00
Andrew Bauer
b32bcab91f
add a delete confirmation modal
2020-08-18 08:06:58 -05:00
Isaac Connor
610f73a835
Merge branch 'release-1.34'
2020-08-17 19:30:32 -04:00
Isaac Connor
0a3ad719cd
Merge branch 'master' into filter_pre_post
2020-08-17 18:30:44 -04:00
Andrew Bauer
1dd0b44334
eslint nanny strikes again
2020-08-17 16:59:57 -05:00
Isaac Connor
dc451cbc85
Use filter class
2020-08-17 17:42:22 -04:00
Isaac Connor
e3fe75f21b
fix case on filterQuery
2020-08-17 17:42:03 -04:00
Isaac Connor
e5dd10fc04
use filter class instead of parseFilter
2020-08-17 17:41:50 -04:00
Isaac Connor
0f90b999c0
use filter class instead of parseFilter
2020-08-17 17:41:38 -04:00
Isaac Connor
6649a30bbb
Use querystring instead of query
2020-08-17 17:41:13 -04:00
Andrew Bauer
80b92573b8
set the icons used in bstable toolbar
2020-08-17 16:18:18 -05:00
Isaac Connor
f4594f06d1
Add in pre_condition checks.
2020-08-17 16:58:37 -04:00
Isaac Connor
e452c23c4d
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:43 -04:00
Isaac Connor
e4425d7565
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:20 -04:00
Andrew Bauer
11afad5c92
add pagination on/off toggle
2020-08-17 11:02:25 -05:00
Isaac Connor
1a6154752a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-16 20:08:49 -04:00
Isaac Connor
a8455d4ecf
Add necessary globals
2020-08-16 20:08:42 -04:00
Andrew Bauer
de0a4a18ee
fix checkbox column
2020-08-16 18:00:11 -05:00
Andrew Bauer
5468c0322e
appease the eslint nanny
2020-08-16 16:30:35 -05:00
Andrew Bauer
0cbf559821
only hide cols if cookie not exist
2020-08-16 16:02:43 -05:00
Andrew Bauer
33ea9de8cf
better spacing archived & emailed tinytext
2020-08-16 15:19:08 -05:00
Andrew Bauer
f27f6e6394
fix archive buttons, remove asterisk from event name
2020-08-16 14:46:56 -05:00
Andrew Bauer
94d666b296
tiny text under event name, add emailed column
2020-08-16 14:41:50 -05:00
Andrew Bauer
ee31761627
cleanup & consolidate events view buttons
2020-08-16 13:44:18 -05:00
Isaac Connor
77c391fcae
Add booleanvalues for operators support
2020-08-16 13:07:42 -04:00
Isaac Connor
77f9f4bffb
Add ExistsInFileSystem support in Filters. This also includes limiting operators to IS/IS NOT
2020-08-16 13:07:21 -04:00
Isaac Connor
303154c690
Remove countSQL code that ran the sql query once to get the # of entries returned to be used in pagination. Now that we support POSTSQL Conditions it is no longer useful. Pagination has to happen later. Implement POSTSQLConditions in filtering results.
2020-08-16 13:06:37 -04:00
Andrew Bauer
9be63f1d99
reorganize and init eventTable
2020-08-16 11:34:37 -05:00
Andrew Bauer
93475bef7e
eslint nanny
2020-08-15 16:08:53 -05:00
Andrew Bauer
252bf7995a
eslint nannt
2020-08-15 15:54:58 -05:00
Andrew Bauer
45fde13535
rough in new events view
2020-08-15 15:27:58 -05:00
Isaac Connor
c87886f5a5
Fix v4l2 channel and palette dropdowns allowing the saving of local monitors.
2020-08-15 12:31:30 -04:00
Isaac Connor
dbb2535a6b
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-14 13:08:04 -04:00
Andrew Bauer
7225281771
enlarge event thumbs on hover
2020-08-13 12:50:59 -05:00
Andrew Bauer
b45c4fac1f
tighten up event column spacing
2020-08-13 12:33:13 -05:00
Isaac Connor
047d69ace7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-13 11:28:00 -04:00
Andrew Bauer
c4ee4fb307
split start & end times into sep cols & wrap
2020-08-13 09:24:42 -05:00
Andrew Bauer
27c80cedac
set small screen breakpoint on table-responsive
...
This gets rid of the ugly horizontal scroll bars on the table on larger screens
2020-08-12 10:10:55 -05:00
Isaac Connor
6cbc54ef87
When storage area has been deleted, say so
2020-08-11 14:11:48 -04:00
Isaac Connor
5f0da93c6e
turn off debug
2020-08-11 13:47:48 -04:00
Isaac Connor
303cec92f6
Add globals, fixing timeline view
2020-08-11 13:47:37 -04:00
Isaac Connor
0a7df075ae
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-11 11:41:15 -04:00
Isaac Connor
d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
Isaac Connor
355428e93e
direct settings view to the monitor that is actually recording the stream
2020-08-10 21:32:23 -04:00
Isaac Connor
e8bf2aa386
Update settings view. Were assigning to a function. More work to be done.
2020-08-10 21:20:23 -04:00
Andrew Bauer
4a31ebe045
Update options.php
2020-08-10 15:48:20 -05:00
Andrew Bauer
b5553c968b
expand options to full width
2020-08-10 15:41:25 -05:00
Andrew Bauer
4097693b38
appease the eslint nanny
2020-08-10 13:38:53 -05:00
Andrew Bauer
3fa97f2bc1
reogranize state.php
2020-08-10 13:35:12 -05:00
Isaac Connor
bafffdb486
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:26:37 -04:00
Isaac Connor
5ee086bbfe
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:25:44 -04:00
Isaac Connor
f04e1a0ba7
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-09 22:20:06 -04:00
Isaac Connor
ec707acdd1
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-09 22:19:43 -04:00
Isaac Connor
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
Isaac Connor
8533ce7018
fix CSP on polygons
2020-08-08 11:38:54 -04:00
Isaac Connor
fc5fabf1c5
fix zone editing globals and inputs being too big
2020-08-06 12:24:51 -04:00
Isaac Connor
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
Isaac Connor
ef2ad12846
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-05 20:00:45 -04:00
Isaac Connor
ddeef6f031
Fix globals and a Fatal without ZM\ prefix
2020-08-05 20:00:39 -04:00
Isaac Connor
76e0d155d3
declare globals
2020-08-05 19:15:01 -04:00
Isaac Connor
90671cd4e5
Add missing globals
2020-08-04 18:07:01 -04:00
Isaac Connor
1ab828c110
Add globals
2020-08-04 17:35:52 -04:00
Isaac Connor
dd627d9234
Update cycle monitorlist sidebar to bootstrap4
2020-08-04 17:35:41 -04:00
Isaac Connor
ba4d6dff64
Add globals definitions
2020-08-04 17:05:58 -04:00
Isaac Connor
9a06d6cab6
Fix some spacing
2020-08-04 17:05:44 -04:00
Isaac Connor
c0f21ab55d
Fix globals
2020-08-04 16:36:24 -04:00
Andrew Bauer
ab9a135759
fix inability to stop zm from the web console
2020-08-03 12:10:34 -05:00
Isaac Connor
eb1d94345f
remove crud
2020-08-03 11:05:58 -04:00
Isaac Connor
a2958fe288
Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin
2020-08-03 10:57:08 -04:00
Isaac Connor
325178a556
convert log filters to responsive bootstrap divs.
2020-08-02 20:25:24 -04:00
Isaac Connor
6f9947b583
Switch to jquery in login.js. We no longer include mootool for login view.
2020-08-02 19:12:07 -04:00
Isaac Connor
68b7277784
Fix sizing of option name by removing the non-semantic elements and just specifying the styles
...
in css/base/views/option.css. Alsoo apply h-100 to columns to that nav bar fills the vertical space.
2020-08-02 11:20:18 -04:00
Andrew Bauer
4851f1f940
remove errant text
2020-08-01 09:50:25 -05:00
Andrew Bauer
889b08519a
Set a small breakpoint on table-responsive
...
This fixes (ugly) horizontal scroll bars appearing at the bottom of the monitor table on larger screens, without breaking functionality on mobile devices. @roddone please test this on your mobile device
2020-08-01 09:49:27 -05:00
Isaac Connor
b46d3b81d6
Update user view to use User class
2020-08-01 10:27:54 -04:00
Isaac Connor
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
Isaac Connor
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
Isaac Connor
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -04:00
Andrew Bauer
68dcc05cce
force the options labels small
...
seems backwards, but the bootstrap 4 docs have <small> and <strong> tags rather than a css class
2020-07-30 09:11:39 -05:00
Andrew Bauer
6b303b67d0
continued adjustment of options view fields
2020-07-30 09:03:03 -05:00
Andrew Bauer
484051a191
adjust column widths on options
2020-07-30 08:23:25 -05:00
Isaac Connor
b42eb44a79
handle when [fid] = 0; Fixes #2994
2020-07-29 18:51:11 -04:00
Isaac Connor
8e37efaa7a
handle when [fid] = 0; Fixes #2994
2020-07-29 18:50:14 -04:00
Andrew Bauer
ded0dbc4ae
shrink the vert nav items further
2020-07-29 14:00:44 -05:00
Andrew Bauer
32bbeb556f
set the vert navbar bg color in base.css
2020-07-29 13:51:36 -05:00
Andrew Bauer
907063e385
use smaller font in form control item
2020-07-29 13:25:40 -05:00
Andrew Bauer
fd5adc6623
remove blockquote from options.php
...
It makes the vertical navbar font unnaturally large
2020-07-29 12:49:32 -05:00
Andrew Bauer
52d88e15fd
let options span the full column
2020-07-28 12:45:25 -05:00
Andrew Bauer
cf9eb405ee
don't wrap the rows on small screens
2020-07-28 12:43:51 -05:00
Andrew Bauer
aa8662f311
fix copy/paste typo
2020-07-28 10:37:10 -05:00
Andrew Bauer
b88f0c3991
display user:port@ip when controladdress is empty
2020-07-28 10:08:24 -05:00
Andrew Bauer
45f88ee04a
float web console statusBreakdown left then down
2020-07-28 08:59:28 -05:00
Andrew Bauer
47b35e97fb
implement minimize chevron for filterbar
2020-07-27 16:14:15 -05:00
Isaac Connor
767f5ebb03
navbar closes the form, and doesn't need to be in the form.
2020-07-27 12:40:46 -04:00
Isaac Connor
5f9c62f266
spacing and slightly improve nav item code in options
2020-07-26 22:33:29 -04:00
Isaac Connor
003abfea29
Update class so that Submit button is hidden under new bootstrap
2020-07-26 22:32:36 -04:00
Andrew Bauer
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -05:00
Isaac Connor
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
Isaac Connor
e746f0babe
Use 0 instead of the word auto for scale
2020-07-22 17:28:41 -04:00
Isaac Connor
495cd56b8b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-21 14:39:51 -04:00