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
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
Isaac Connor
64e4363302
update code populating DeviceChannel, DeviceFormat, CapturePalette
2020-07-21 13:40:04 -04:00
Isaac Connor
e23c6de373
populate monitors with monitor array which will be json-encoded. Fixes failed population of monitor names dropdown
2020-07-20 17:42:25 -04:00
Isaac Connor
9d6e0fc3af
Merge pull request #2977 from roddone/fix_events_table_responsive
...
make events table (events view) responsive
2020-07-16 15:49:01 -04:00
Isaac Connor
855efd57fd
Merge pull request #2977 from roddone/fix_events_table_responsive
...
make events table (events view) responsive
2020-07-15 10:44:34 -04:00