9ca19b003f
Add download button to montagereview
2017-12-03 14:42:09 -05:00
4f5677eb3b
Remove time limit from archive download for exceptionally large files
2017-12-03 14:42:08 -05:00
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
7a188a84f7
Add montagereview filter passing
...
montagereview now accepts any appropriate filters
2017-12-02 12:29:55 -05:00
6d6b4366de
Fix MontageReview filters
2017-12-02 12:29:54 -05:00
1c201b0efe
Fix timeline filters
2017-12-02 12:28:06 -05:00
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
1e50df741f
fix some memleaks
2017-11-28 09:50:09 -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
03c9f88d55
fix build on trusty
2017-11-27 08:24:14 -05: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
dd3f9492ba
fix dulicate logic
2017-11-26 15:12:35 -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
b1bb0020d3
turn off database debug
2017-11-24 15:42:44 -05:00
c0e49b65ef
stop writing env to /tmp/env
2017-11-24 15:38:07 -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
485567349d
Don't calc DiskSpace if it is already defined
2017-11-23 07:29:05 -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
c284078db6
upgrade mootools to 1.6.0
2017-11-22 11:46:02 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
095e1ecadb
remove extra ), add AnalysisFPS and CaptureFPS
2017-11-21 23:58:13 -05:00
e2aa278d78
add SaveJPEGs
2017-11-21 23:57:44 -05:00
e617ffca2d
can't use BASE_URL since it will be empty. Have to construct a full URL when using MIN_STREAMING_PORT
2017-11-21 21:00:27 -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
d8af654338
Fix dvrControls on watch view
2017-11-18 14:05:11 -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
6d02c88db9
Don't round percentage in bulkframes
...
Gives more accurate frame delta.
2017-11-16 12:48:04 -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
bc3f169a80
add event_id as a paramteter
2017-11-13 11:51:54 -08:00
d07f36a7ee
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-13 10:27:27 -08:00
f093cfbcef
add Filtering to monitors index
2017-11-13 10:27:24 -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
5283f778c5
Fix virtual/bulk frame calculation
...
Previously bulk frames wouldn't calculate at the start and end of bulk frame collection. Also the calculation for percent was inaccurate.
2017-11-11 14:49:42 -05:00
8086b6e0a5
whitespace
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
95622cc3b0
pause on delete
...
Pausing on delete lets a slow network user know that the click worked.
2017-11-11 14:49:42 -05:00
e6ba5162ef
choose correct video download
...
Use download mp4 link if it's a videojs event, otherwise use the video generator link.
2017-11-11 14:49:42 -05:00
1007add771
add row highlighting
...
Both other css sets have this
2017-11-11 14:49:42 -05:00
ab87848899
Add visual cue to archived events
...
The asterisk didn't do it for me. Added a faint cast to the row.
2017-11-11 14:49:42 -05:00
97058065ff
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-10 10:11:03 -08:00
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
14e9a13c99
wip
2017-11-09 11:53:04 -08:00
821717b06e
turn off debug
2017-11-08 11:26:13 -05:00
aba7ecd9a6
split lines
2017-11-08 11:18:23 -05:00
59a87c14d3
fix error message
2017-11-08 11:17:46 -05:00
625170bffc
fix getVideoStream to getVideoStreamHTML. Change how scaling works
2017-11-08 11:17:30 -05:00
57cb6bb3f2
increase height of monitor
2017-11-06 12:03:24 -08:00
c2fab6e959
add the options for nvsocket as an include
2017-11-06 07:31:08 -08:00
bef7c0ed94
Only start a monitor if it has a Function
2017-11-05 11:54:00 -05:00
7374ced076
0 is a prefectly valid PreEventCount
2017-11-05 10:00:24 -05:00
09f3355e18
add /usr/share/zoneminder/www/cache as a temp dir
2017-11-04 14:52:36 -04:00
63c788ef0e
handle when sql error occurs and no params given
2017-11-03 15:45:11 -04:00
f39353a4a3
add missing breaks
2017-11-03 15:44:53 -04:00
8432ab5938
change quotes, and limit the # of results to 2 when getting next and previous frames. 2 is because one of them could be the currently selected Event,
2017-11-03 15:09:19 -04:00
0ef5c16bcc
when doing parseSort, reset the sortfield to StartTime instead of DateTime
2017-11-03 15:07:04 -04:00
cab8c4cd5e
cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style
2017-11-03 13:49:42 -04:00
54d77519c0
Only show Storage and Server filters if there is more than 1
2017-11-03 12:03:01 -04:00
67bb8c302f
add missing /
2017-11-03 10:00:29 -04:00
09938ef7ee
join the echo's into 1 to also get the line breaks
2017-11-03 09:24:13 -04:00
073c06f6a8
fix sizing after switching scale. basically re-apply the layout
2017-11-03 09:23:50 -04:00
4ef28bb30d
don't put the leading / in the cache link
2017-11-03 09:22:43 -04:00
5aa61cf1f5
unset the ref so that last monitor isn't duplicated
2017-11-02 07:59:25 -04:00
92917809b8
add creating /usr/share/zoneminder/www/cache
2017-11-01 12:49:38 -07:00
866c875312
Merge branch 'storageareas' into tesla
2017-11-01 12:01:51 -07:00
1aea1517bf
put back old behaviour for add monitor
2017-11-01 13:09:14 -04:00
eb2ee76f57
disable and re-enabled onclick action when editing layout/cancelling edit
2017-11-01 13:08:01 -04:00
96e0959c35
clear the cookie for zmMontageLayout
2017-11-01 13:07:35 -04:00
0af389c984
populate the Id of the layout when inserting it
2017-11-01 13:07:24 -04:00
d4080dcdbd
when saving a new layout, auto-select it
2017-11-01 12:19:27 -04:00
8e010b3bd0
get rid of experimental code to fix monitor layout. Apparently draggable does it all for us.
2017-11-01 12:00:48 -04:00
445fbb06d6
clearFix so that #monitors actually has a height
2017-11-01 11:52:59 -04:00
a9d4dfac45
fix the file extension so that mime type works better
2017-11-01 11:52:32 -04:00
36e13039c7
Switch to LONGTEXT FROM JSON type
2017-11-01 11:05:21 -04:00
25210b7ecf
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-01 09:41:22 -04:00
e6918cd1bd
implement crude cache busting code for .js and .css files
2017-11-01 09:41:19 -04:00
33771f92e9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-31 13:32:47 -07:00
9473fbecd8
more debug
2017-10-31 13:32:42 -07:00
3deb8a35bb
fixes
2017-10-30 21:38:27 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
ce6cc24de5
turn off debug
2017-10-30 20:20:40 -04:00
52110adfa9
update code because we are now including the entire object in the layouts array
2017-10-30 16:32:14 -04:00
efe8b2db7e
update code because we are now including the entire object in the layouts array
2017-10-30 16:32:03 -04:00
c69e2468b0
add edit and save layout
2017-10-30 16:30:15 -04:00
207b66c8fa
add Edit Layout
2017-10-30 16:29:46 -04:00
1694eeb436
debugging and code simplification
2017-10-30 16:29:27 -04:00
97757ba6cd
add Inserting when saving
2017-10-30 16:29:13 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
8312bf52a4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-30 08:37:54 -04:00
c16e101120
rough in add monitors import wizard
2017-10-27 20:52:08 -07:00
eb48759ff8
wip
2017-10-27 13:37:51 -07:00
71222d7f2f
rework how montage layouts are done, pull from db now
2017-10-27 12:06:26 -07:00
71c8562b46
Rough in a MontageLayout class
2017-10-27 10:01:16 -07:00
82fbec697f
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
2017-10-27 08:37:53 -07:00
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
12b611b9d5
When in live mode say Camera Offline instead of no data
2017-10-25 13:02:28 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
ea84bd1e69
add a Status Filter
2017-10-25 09:04:54 -07:00
b6dde354be
rename AnalysisFPS to AnalysisFPSLimit
2017-10-24 17:34:32 -07:00
e9600bc5d3
add monitors.php
2017-10-24 16:25:11 -07:00
ea669b4750
increase size of group edit popup
2017-10-24 16:09:12 -07:00
6905c6a1fb
add CpuLoad t Servers list
2017-10-24 16:08:52 -07:00
5ba6cf0fb2
Add DiskSpace to Events listings on console
2017-10-24 14:19:36 -07:00
82bf507ee9
Add Status, ram, swap to Servers List
2017-10-24 12:43:32 -07:00
59e50bbbef
Update DiskSpace when we create jpg's
2017-10-23 17:04:02 -07:00
6b2d0aa59b
fix popup when clicking on a monitor on montagereview
2017-10-23 17:03:41 -07:00
5e98587ff4
add Server and Storage filters to montagereview
2017-10-23 17:03:18 -07:00
9cbd33b439
if there is a selected monitor but it isn't in the available monitors, still show the monitors
2017-10-23 17:02:47 -07:00
729fdb4fdd
add a popup size for monitors
2017-10-23 17:02:21 -07:00
b5e59efda5
improve updating diskSpace entries
2017-10-23 17:02:04 -07:00
d2c8a0240a
add a monitors view which is for editing function/enabled/server/storage of multiple monitors
2017-10-23 17:01:43 -07:00
ced5015a83
move zmcControl and zmaControl to the Monitor Object
2017-10-23 17:00:59 -07:00
df8fbaccea
Fixes
2017-10-23 11:50:45 -07:00
f99e404730
update the total_disk_space function to do and sql sum on the events that already have a space assigned and only update ones that don't. This reduces ram requirements.
2017-10-23 11:02:36 -07:00
digital-gnome
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
APHW2 MFGENG
Isaac Connor