Commit Graph

3787 Commits

Author SHA1 Message Date
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
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
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
b01fed111a Add zoom transition 2017-11-26 19:08:06 -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
digital-gnome
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
digital-gnome
f52306ff56 Fix scales to only use fixed width/height on montage 2017-11-26 19:08:06 -05:00
digital-gnome
68e54400e2 Add scaleToFit to watch view 2017-11-26 19:08:06 -05:00
digital-gnome
3920420aa9 Convert scaleToFit to shared function 2017-11-26 19:08:06 -05:00
Isaac Connor
428d923874 make StatusFIlter do something 2017-11-26 17:39:49 -05:00
Isaac Connor
39e490e5e5 fix monitor dropdown 2017-11-26 17:32:41 -05:00
Isaac Connor
4fbdacef05 fix event counts 2017-11-26 17:03:36 -05:00
Isaac Connor
dd3f9492ba fix dulicate logic 2017-11-26 15:12:35 -05:00
Isaac Connor
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
Isaac Connor
b1bb0020d3 turn off database debug 2017-11-24 15:42:44 -05:00
Isaac Connor
c0e49b65ef stop writing env to /tmp/env 2017-11-24 15:38:07 -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
a9f0f3813a Merge branch 'tesla' into storageareas 2017-11-24 09:31:00 -05:00
Isaac Connor
900fbe1e0f update save to a button tag, and add a saveas functionality 2017-11-23 08:26:55 -08:00
Isaac Connor
485567349d Don't calc DiskSpace if it is already defined 2017-11-23 07:29:05 -08:00
Isaac Connor
2a669896c2 Merge branch 'tesla' into storageareas 2017-11-23 08:42:53 -05:00
Isaac Connor
9d6b417b60 make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts 2017-11-22 17:03:37 -08:00
Isaac Connor
02ec4bdebb use StartDateTime instead of DateTime in filters, and get rid of Filters button at bottom 2017-11-22 13:49:46 -08:00
Isaac Connor
3c55daaf36 Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla 2017-11-22 12:10:54 -08:00
Isaac Connor
9dd0f29e88 Merge branch 'storageareas' into tesla 2017-11-22 11:41:11 -08:00
Isaac Connor
121e64a8c6 turn on MOnitors dropdown in filters, an debug 2017-11-22 11:40:07 -08:00
Isaac Connor
b565125df9 montage layout improvements 2017-11-22 12:33:34 -05:00
Isaac Connor
11449b77a9 add debugging. increase concurrency of request queue 2017-11-22 11:46:24 -05:00
Isaac Connor
c284078db6 upgrade mootools to 1.6.0 2017-11-22 11:46:02 -05:00
Isaac Connor
cd1d2e1721 lots more debugging. re-add status update command on failure 2017-11-22 01:18:07 -05:00
Isaac Connor
095e1ecadb remove extra ), add AnalysisFPS and CaptureFPS 2017-11-21 23:58:13 -05:00
Isaac Connor
e2aa278d78 add SaveJPEGs 2017-11-21 23:57:44 -05:00
Isaac Connor
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
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
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
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
d8af654338 Fix dvrControls on watch view 2017-11-18 14:05:11 -05:00