Andrew Bauer
aa055c147b
classic skin - fix dvr control buttons
...
The buttons were being drawn too small which cropped the symbols inside the buttons. Deleting the classic-skin-specific override of the css file allows the default css to apply which looks good to me.
2018-06-07 14:32:36 -05:00
Isaac Connor
4e7bf6efe7
remove duplicated css for watch view in dark skin
2018-05-02 11:39:16 -04:00
Isaac Connor
2aa689a14a
Use a class instead of an id for consoleTable
2018-04-19 14:20:02 -04:00
Isaac Connor
10a191ae5b
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
2018-04-17 14:14:40 -07:00
Isaac Connor
489f11bd07
empty contents of zone.css because it is no different from base.
2018-04-03 21:18:29 -04:00
Isaac Connor
6a8084652e
add min width to Status Filter
2018-04-03 12:31:12 -07:00
Isaac Connor
1f29fc601e
add Function Filter min width
2018-04-03 10:38:22 -07:00
Pliable Pixels
f790306990
added account icon
2018-03-25 16:18:50 -04:00
Pliable Pixels
980684a2f0
adjusted h1 size
2018-03-25 16:09:31 -04:00
Pliable Pixels
cc2f285408
log view tweaks, cleaned up header issues
2018-03-25 16:01:04 -04:00
Pliable Pixels
1179b6ddc4
rounded top for tables and highlights
2018-03-25 11:43:34 -04:00
Pliable Pixels
bf57b65ebb
reduced 2nd row of navbar text
2018-03-25 09:56:41 -04:00
Pliable Pixels
14f638e009
replaced ionic fonts with material design icons
2018-03-25 09:28:00 -04:00
Pliable Pixels
acdc076b84
padding to navbutton
2018-03-24 18:36:10 -04:00
Pliable Pixels
0b31cc4d3d
2nd level header tweak
2018-03-24 17:34:46 -04:00
Pliable Pixels
140217bef6
icons, muted colors, text tightening
2018-03-24 09:59:39 -04:00
Isaac Connor
7abe7d6fe3
fix centering in buttons
2018-02-11 14:18:26 -05:00
Isaac Connor
08c359fdbc
add some margin to minTime and maxtime
2018-02-09 07:31:30 -08:00
Isaac Connor
6ee133bf6b
give some left margin on labels
2018-02-09 07:30:43 -08:00
Isaac Connor
c454d5355d
adjust column width on console
2018-02-09 07:30:32 -08:00
Isaac Connor
f987bde6df
fix styles on montagereview. Mostly remove borders and make timelineDiv 100%
2018-02-08 09:28:52 -08:00
Isaac Connor
f6bb3017ef
Use absolute patch to point-g.png. Makes the assumption that /zm always works.
2018-02-08 07:49:52 -05:00
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
digital-gnome
e14c21fdbe
Fix dark theme archive highlight
...
Another bad copy
2017-11-21 10:37:09 -05:00
digital-gnome
5f0d1b4720
Fix bad copy
2017-11-21 10:28:27 -05:00
digital-gnome
ff7e104f1b
Merge fix
...
This editor is fun!
2017-11-20 20:42:28 -05:00
Isaac Connor
6eb542f0e2
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:19:27 -05:00
Isaac Connor
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
digital-gnome
b58efe6a36
Fix classic/dark dvr buttons centering
2017-11-20 09:45:14 -05:00
digital-gnome
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
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
Isaac Connor
1686584908
more cppcheck fixes
2017-11-16 09:19:27 -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
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -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
Isaac Connor
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00