Commit Graph

188 Commits

Author SHA1 Message Date
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
digital-gnome 5f42bf4fe5 Change CSS to class, add class to php
I needed the styling for the video.js buttons.  The fallback mjpeg player used ids.
2017-09-29 21:47:52 -04:00
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
peruchi d71b30aff3 Images Gif to PNG (#1969)
* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG
2017-08-16 14:51:20 -04:00
Isaac Connor 0e54d4e69a imposing a height on the textpanel causes the text to overflow 2017-07-14 09:26:56 -04:00
Isaac Connor 148d7066f9 Merge branch 'master' into storageareas 2017-07-11 16:15:02 -04:00
Isaac Connor 90882edc31 make montage images be display: block; This makes the layout not jump around when a camera feed dies 2017-07-07 10:05:20 -04:00
Isaac Connor 2dd8b5df1f in dark and flat, the buttons use a larger font. The fixed size is not appropriate 2017-07-07 09:59:41 -04:00
Isaac Connor 39745e49d4 I think we switch to border-box model or something, anyways, the box that the pantilt buttons go in needs to be 100px not 96px 2017-07-07 09:51:51 -04:00
Isaac Connor 75c11431e6 deprecate filtersavepopup 2017-06-16 11:10:25 -04:00
Isaac Connor 9f301e3c51 Merge branch 'log_no_truncate' into storageareas 2017-06-14 10:18:27 -04:00
Isaac Connor ce6a6a41a8 fix gif->png and the path for arrow-s-u and arrow-s-d 2017-06-14 09:34:03 -04:00
Isaac Connor b4bdc1fd6b Merge branch 'master' into dragndrop_monitor_sorting 2017-06-06 20:39:58 -04:00
Isaac Connor 04aa01ba0c add login css files 2017-06-05 21:41:39 -04:00
Isaac Connor c71a4fd690 fix spacing 2017-06-05 15:36:37 -04:00
Isaac Connor 2a45cd02ca sync some missing styles from classic 2017-06-05 12:49:39 -04:00
Isaac Connor 0e643f0f93 Merge branch 'master' into storageareas 2017-05-30 11:58:38 -04:00
Isaac Connor a75488e0f3 flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed 2017-05-30 11:52:04 -04:00
Isaac Connor 7cfa0b12ec Merge branch 'dragndrop_monitor_sorting' into storageareas 2017-05-25 15:26:04 -04:00