Commit Graph

135 Commits

Author SHA1 Message Date
digital-gnome 1e412af902 Fix float overlap
Avoid explicitly setting some heights, add clear float
2017-12-10 09:37:16 -05:00
digital-gnome 6974c847e5 Fix controlcss
Missing viewCssFileExtra
2017-12-10 09:37:16 -05:00
Isaac Connor ef1af9cc15 disable FilterComponent as it doesn't actually do anything. Add Groups join when needed 2017-12-09 14:03:42 -05:00
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -05:00
digital-gnome 11a5a47826 Fix missing popups and styles 2017-12-06 09:42:58 -05:00
digital-gnome f47f1a89ea Fix btn-primary css to match current themes 2017-12-05 21:01:16 -05:00
digital-gnome f8d3c07586 Add h264 event view functionality and new feature alarmCues (#2012)
* Fix nearEventsQuery

Removed dbEscape from getNearEvents previous event because it only returns 0.  Now matches next.  Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch.  Also added start times to allow for videoJS replaymode.

* Unescape filters

Filters need to be unescaped

* Add initial values to page load

* Add replay modes to videojs

* rough in figuring out a frame in between bulk frames

* Add alarmCues

Add a graphical indication of where alarm frames happened in an event.  Similar to what zmNinja shows.

* Add remaining buttons to videojs

Functionality for all buttons on videojs streams.  FF/RW buttons show as active when they are active.

* Whitespace and fix Bulkframe calcs

* Fix zms events trying to generate with mp4 code

ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed

* ZMS scrub bar

Move zms scrub bar to bottom of image feed.  Make it simpler and more like videojs style.

* Wrap event feeds properly

* Fix dvrControls on watch view

* Add scaleToFit

Add a scaleToFit option to event view

* Add navigation for videoJS streams

Disables nav buttons at beginning and end of events.  Handles switching from zms to videojs.  If zms crashes changes next event function to reload page instead of ajax.

* Add scaleToFit to watch and frame view

Adds scaleToFit to watch view.  Since frame view uses the watch cookie this required changes to frame view

* Add transition to zoom

* Change stills view to match stream

Move stills slider bar to match scrub bar on streams.  Allow it to resize, make it larger.  Add alarmcues.

* Add Stills for every event

Add stills for every event.  Match size to stream size

* Progressbox transitions
2017-12-04 21:26:59 -05:00
digital-gnome 03ad4898d9 Fix montage monitors jumping on alert (#2013)
The alert class from bootstrap was not overriden on monitors in montage.
2017-12-04 21:25:56 -05:00
digital-gnome 9ca19b003f Add download button to montagereview 2017-12-03 14:42:09 -05:00
digital-gnome 66d6e1a4a4 Add header to watch 2017-12-02 12:28:06 -05:00
digital-gnome 539172b769 remove top margin from header 2017-12-02 12:28:06 -05:00
digital-gnome 58159963fa Fix back on timeline view 2017-12-02 12:28:05 -05:00
digital-gnome 064ce99eac Scalecontrol in wrong place 2017-12-02 12:28:05 -05:00
digital-gnome bf5c928e38 Event view compress header
Combine all three lines of event view to 2.
2017-12-02 12:28:05 -05:00
digital-gnome 50d5a8991d Events header
Moved all non-event links to the header
2017-12-02 12:28:05 -05:00
digital-gnome 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
digital-gnome e6568d01a3 Remove timeline popup 2017-12-02 12:28:05 -05:00
digital-gnome 1636cf6e90 Tighten up headers 2017-12-02 12:28:05 -05:00
digital-gnome e34b8abaca Cleanup events view header 2017-12-02 12:25:53 -05:00
Isaac Connor e64497c16a
Merge pull request #54 from digital-gnome/storageareas-uifixes
Storageareas uifixes
2017-12-01 16:30:29 -05:00
Isaac Connor cb70a3627f Fixes to montagereview and only load event data when in History mode 2017-11-28 14:50:21 -05:00
digital-gnome e166703be0 Cleanup css
Remove repeated block, move eventVideo to the same location in all files
2017-11-28 12:11:07 -05:00
digital-gnome 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
digital-gnome a81c35d377 Cleanup unused code event.css 2017-11-26 19:08:07 -05:00
digital-gnome 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
digital-gnome b506466a70 Change alarmcues to accept arbitrary containing element 2017-11-26 19:08:07 -05:00
digital-gnome abba086d08 Progressbox transition 2017-11-26 19:08:07 -05:00
digital-gnome 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
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00
Isaac Connor 7e3328fbb8 add styles to the html5 button element 2017-11-24 09:36:45 -05:00
Isaac Connor 8b49a475d4 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-11-21 19:55:48 -05:00
Isaac Connor 489d3ba6ed Merge ../ZoneMinder.master into storageareas 2017-11-21 12:23:17 -05:00
digital-gnome 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
digital-gnome 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
digital-gnome 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 1007add771 add row highlighting
Both other css sets have this
2017-11-11 14:49:42 -05:00
digital-gnome 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
Isaac Connor 445fbb06d6 clearFix so that #monitors actually has a height 2017-11-01 11:52:59 -04:00
digital-gnome f2f2aa8720 Replay improvement and overlays 2017-10-21 22:14:46 -04:00
Isaac Connor 92ff3d9606 Tidy up 2017-10-17 11:50:47 -04:00
digital-gnome 3a4a7ada41 progressBar conversion
Convert progressBar to jquery and imporove granularity and performance
2017-10-15 16:46:57 -04:00
digital-gnome 590639039a height 100 causing phantom scroll
Fixes phantom scrollbar in flat skin
2017-10-13 09:01:13 -04:00
digital-gnome 067f8a8089 replayAll fixes
replayAll now handles end of events gracefully.  Fixed bug where back to back continuous events or events that overlap would cause it to try to countdown all of epoch time.
2017-10-11 20:24:39 -04:00
Andrew Bauer e825e5d61e initial commit to change color of web console systemstats (#1981)
* initial commit to change color of web console systemstats

* use css classes
2017-10-07 18:42:39 -04:00
Isaac Connor d4cf84f7e6 Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
digital-gnome ea4b9486aa alarmCues CSS
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
Isaac Connor c46769495b Merge pull request #22 from digital-gnome/storageareas-navigation
Storageareas navigation
2017-10-03 10:18:44 -04:00
digital-gnome 33a3e04f43 Fix class selector 2017-10-02 15:40:18 -04:00
Isaac Connor 15ba7d2a35 fixes 2017-10-02 11:25:51 -04:00
digital-gnome e339b9e12a Merge branch 'storageareas-Navigationfix' into storageareas-navigation 2017-09-30 15:09:32 -04:00