66d6e1a4a4
Add header to watch
2017-12-02 12:28:06 -05:00
11629076f6
Fix Timeline view, add list link
2017-12-02 12:28:06 -05:00
539172b769
remove top margin from header
2017-12-02 12:28:06 -05:00
898c9e7473
Add bottom border to dark and classic header
2017-12-02 12:28:06 -05:00
58159963fa
Fix back on timeline view
2017-12-02 12:28:05 -05:00
064ce99eac
Scalecontrol in wrong place
2017-12-02 12:28:05 -05:00
bf5c928e38
Event view compress header
...
Combine all three lines of event view to 2.
2017-12-02 12:28:05 -05:00
50d5a8991d
Events header
...
Moved all non-event links to the header
2017-12-02 12:28:05 -05:00
8772d1e99a
Timeline header to flex
...
Moved flex override to timeline.css rather than set in in skin file.
2017-12-02 12:28:05 -05:00
e6568d01a3
Remove timeline popup
2017-12-02 12:28:05 -05:00
9d1bbfab42
Remove unused code from event
2017-12-02 12:28:05 -05:00
725814d41d
Remove unused code from events
2017-12-02 12:28:05 -05:00
7a5dfb71dc
Remove no longer used max from events
2017-12-02 12:28:05 -05:00
1636cf6e90
Tighten up headers
2017-12-02 12:28:05 -05:00
b3ef499e46
remove event popup
2017-12-02 12:28:04 -05:00
f02cd2e615
Remove watch popup
2017-12-02 12:28:04 -05:00
1289269e6f
Change filter to work without popup
2017-12-02 12:28:04 -05:00
adc1b924da
Remove events popup
2017-12-02 12:25:53 -05:00
e34b8abaca
Cleanup events view header
2017-12-02 12:25:53 -05:00
9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
...
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
53f886edc4
Make navbar refresh not change header links
2017-12-01 22:15:29 -05:00
e64497c16a
Merge pull request #54 from digital-gnome/storageareas-uifixes
...
Storageareas uifixes
2017-12-01 16:30:29 -05:00
1bbcf239d7
Fix timeline by adding StartDateTime
2017-12-01 16:25:03 -05:00
ca3d6546bd
sorty by name when listing monitors by name
2017-12-01 12:30:21 -08:00
5e953cefea
fix old cookie causing errors loading layouts
2017-12-01 12:30:07 -08:00
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
83a37732ce
Fix montage view jumping
...
Need to override bootstrap styling
2017-11-30 09:48:02 -05:00
f8c3e5573e
Change dark theme buttons to match original colors
2017-11-28 21:39:31 -05:00
3cdb965c4a
Fix dark theme console
...
Hover was using the mostly white from classic and flat. Added the striped look from classic and flat.
2017-11-28 21:27:46 -05:00
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
07b0bf81c1
More cleanup
2017-11-28 12:30:00 -05:00
e166703be0
Cleanup css
...
Remove repeated block, move eventVideo to the same location in all files
2017-11-28 12:11:07 -05:00
dfb69a2c5b
Merge branch 'tesla' into storageareas
2017-11-28 06:29:42 -05:00
00c5590a71
add Monitor count to servers
2017-11-27 11:56:48 -08:00
c92b3a9408
Converge stills view and stream view
...
Make the stills view look more like stream view. Moved slider up to be like a scrub bar, added alarmcues.
2017-11-26 19:08:07 -05:00
a81c35d377
Cleanup unused code event.css
2017-11-26 19:08:07 -05:00
18dc515ba4
stills view loads image when slider used
...
Stills view now loads the selected image if an image is being viewed and the slider is used.
2017-11-26 19:08:07 -05:00
136f0e90f5
Fix autoscale on stills view
...
Switching from stills view and changing the window would make stream view go crazy. Changed to autoscale on switch
2017-11-26 19:08:07 -05:00
b506466a70
Change alarmcues to accept arbitrary containing element
2017-11-26 19:08:07 -05:00
abba086d08
Progressbox transition
2017-11-26 19:08:07 -05:00
b01fed111a
Add zoom transition
2017-11-26 19:08:06 -05:00
ac3dbfbc23
Fix Typo
2017-11-26 19:08:06 -05:00
b5db885a31
Add scaleToFit to frame view
...
Changes navigation to use flexbox because absolute positioning was messing with scaletofit. Also makes frame view respect scale choice
2017-11-26 19:08:06 -05:00
55699a9b9b
Change scaleToFit to choose what to fit
...
Adds 4th input to choose what element is the last thing to fit.
2017-11-26 19:08:06 -05:00
f52306ff56
Fix scales to only use fixed width/height on montage
2017-11-26 19:08:06 -05:00
68e54400e2
Add scaleToFit to watch view
2017-11-26 19:08:06 -05:00
3920420aa9
Convert scaleToFit to shared function
2017-11-26 19:08:06 -05:00
428d923874
make StatusFIlter do something
2017-11-26 17:39:49 -05:00
39e490e5e5
fix monitor dropdown
2017-11-26 17:32:41 -05:00
4fbdacef05
fix event counts
2017-11-26 17:03:36 -05:00
d6bc727c9c
use htmlSelect to create the Colours dropdown, which fixes a problem caused when I inverted the Colours array
2017-11-26 11:12:00 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
7e3328fbb8
add styles to the html5 button element
2017-11-24 09:36:45 -05:00
a9f0f3813a
Merge branch 'tesla' into storageareas
2017-11-24 09:31:00 -05:00
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
2a669896c2
Merge branch 'tesla' into storageareas
2017-11-23 08:42:53 -05:00
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
02ec4bdebb
use StartDateTime instead of DateTime in filters, and get rid of Filters button at bottom
2017-11-22 13:49:46 -08:00
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
121e64a8c6
turn on MOnitors dropdown in filters, an debug
2017-11-22 11:40:07 -08:00
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
11449b77a9
add debugging. increase concurrency of request queue
2017-11-22 11:46:24 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
8b49a475d4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-21 19:55:48 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
e14c21fdbe
Fix dark theme archive highlight
...
Another bad copy
2017-11-21 10:37:09 -05:00
5f0d1b4720
Fix bad copy
2017-11-21 10:28:27 -05:00
ff7e104f1b
Merge fix
...
This editor is fun!
2017-11-20 20:42:28 -05:00
6eb542f0e2
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:19:27 -05:00
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
b655689f47
Fix cache_bust
...
Cache busting was preventing changing css due to leaving symlinks behind. Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
b58efe6a36
Fix classic/dark dvr buttons centering
2017-11-20 09:45:14 -05:00
73d6b0e198
Fix sidebar in dark theme
...
Sidebar in dark theme had a scrollbar when main content was shorter than menu content
2017-11-19 09:14:19 -05:00
c7ecb71810
Fix progressbar on short events
...
Fixes rounding errors at the end of events due to zms only returning integers. Especially noticable on short events.
2017-11-17 22:29:10 -05:00
e0f6a7caa9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-17 14:31:03 -05:00
84403f18a0
Revert dvrControls to class
...
Since dvrControls only occurs once now we can leave it as id.
2017-11-17 12:46:08 -05:00
64346a031d
alarmCues to status.php
...
Switched alarm cues from API to ajax/status.php. Less overhead due to only requesting the information it needs and avoids a weird problem with authentication after sitting logged in for hours.
2017-11-16 21:03:03 -05:00
617a92e33e
Re-Add streamstatus pause
...
Handles when stream is paused from zms side.
2017-11-16 16:21:17 -05:00
1686584908
more cppcheck fixes
2017-11-16 09:19:27 -05:00
97be2bf0a3
fix events js vars, eliminating doing the sql query twice
2017-11-15 13:01:07 -05:00
a7b02ea3ba
Fix eventVideo and content div wrapping properly
...
Wrap eventVideo div around both videojs and zms. Consolidate control buttons/status to common set with default values.
2017-11-14 23:04:05 -05:00
93a4dfa3aa
remove extra dropdown addition
2017-11-14 02:42:51 -05:00
5717a19215
be able to popup watch view even if the monitor is not running
2017-11-13 20:29:01 -05:00
99802945fe
be able to popup watch view even if the monitor is not running
2017-11-13 20:28:18 -05:00
1632aa7349
fix nvsocket
2017-11-13 14:25:19 -08:00
d07f36a7ee
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-13 10:27:27 -08:00
ef6cb42c5f
Cleanup
2017-11-11 14:49:43 -05:00
1b8ae2bb45
Fix autoscale for ZMS
...
ZMS zoom would display broken jpegs with arbitrary scale. When using scaleToFit set zms scale to nearest regular scale and let the browser handle the rest.
2017-11-11 14:49:43 -05:00
44c8299faa
Consolidate initPage
2017-11-11 14:49:43 -05:00
91c3e3573c
ZMS controls for videojs
...
Add ZMS style controls to videojs page. Zoom, fast forward, fast reverse, frame skip, play/pause. Some cleanup of old videojs code
2017-11-11 14:49:43 -05:00
21949f5426
Cleanup vjsReplay
2017-11-11 14:49:43 -05:00
f08e75c598
Add remaining buttons to videojs
2017-11-11 14:49:43 -05:00
91cda415bd
Add default values to buttons
2017-11-11 14:49:43 -05:00
1b6992ea6b
Fix stills
...
Event stills fits on the page without a phantom scroll. Still image is scaled to fit the window instead of being full event size.
2017-11-11 14:49:43 -05:00
81a57b086e
Add stills window for everything
...
Stills can work for every event since frames can be generated after the fact by ffmpeg
2017-11-11 14:49:43 -05:00
5e9aacfc09
Stills path fix
2017-11-11 14:49:42 -05:00
5960da0b85
Make mp4 link download
...
download instead of view
2017-11-11 14:49:42 -05:00
1ae3fca599
Fast forward and rewind show active
...
FF and RW show as active if they are active
2017-11-11 14:49:42 -05:00
0c59c5ba88
Fix databar jumping
...
dataBar items would jump around when navigating between events dues to automatic spacing and different string lengths. This locks them in place and should allow for most reasonable event sizes.
2017-11-11 14:49:42 -05:00
digital-gnome
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
APHW2 MFGENG