Isaac Connor
515af57c56
Fix some styles on filter edit
2018-02-02 13:24:01 -05:00
Isaac
c04fcfb239
Need a few more pixels of width to fit all preset buttons
2018-01-22 15:50:18 +01:00
Isaac Connor
b013da6b95
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
2018-01-11 13:14:11 -05:00
Isaac Connor
6a36db0b6d
move flat skin to base.
2018-01-11 12:24:53 -05:00
Isaac Connor
148e21d707
fugro
2017-12-21 21:46:21 -05:00
digital-gnome
a6b136ed40
dark theme fixes
...
Overrides bootstrap input colors for dark theme and more chosen
2017-12-18 09:50:08 -05:00
digital-gnome
de6ebfc341
Remove chosen from some filter dropdowns and restyle to match
2017-12-17 22:04:10 -05:00
digital-gnome
6ffa96dea3
Add chosen to filters
2017-12-16 23:10:20 -05:00
digital-gnome
a091153929
Use seperate structure and theme jquery ui
2017-12-16 20:04:12 -05:00
digital-gnome
2e56210007
Fix row highlighting
2017-12-15 22:56:49 -05:00
digital-gnome
f8da9a1c1b
Cleanup filter appearance
...
Tighten up fields and reduce jumping when adding terms.
2017-12-15 08:47:01 -05:00
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
b8660e95c9
Dark theme options menu fixes
...
Override bootstrap to match dark theme
2017-12-05 21:01:17 -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
898c9e7473
Add bottom border to dark and classic 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
digital-gnome
83a37732ce
Fix montage view jumping
...
Need to override bootstrap styling
2017-11-30 09:48:02 -05:00
digital-gnome
f8c3e5573e
Change dark theme buttons to match original colors
2017-11-28 21:39:31 -05:00
digital-gnome
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
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
07b0bf81c1
More cleanup
2017-11-28 12:30:00 -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
ac3dbfbc23
Fix Typo
2017-11-26 19:08:06 -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