diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-09 16:41:28 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-09 16:41:28 -0500 |
| commit | 8b4c11e4e234f1eb52bb16322bacd00c455879f0 (patch) | |
| tree | 87d45f4d920d610a17579b4d269c594e0277e7c3 | |
| parent | 717ccc31124dfc3fe8071b4468f3d77af08fec82 (diff) | |
some more tweaks to h264 video display given its all the rage now
| -rw-r--r-- | www/css/style.css | 30 | ||||
| -rw-r--r-- | www/js/EventModalCtrl.js | 1 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 4 |
3 files changed, 29 insertions, 6 deletions
diff --git a/www/css/style.css b/www/css/style.css index 950a9e0d..260a3afe 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -686,19 +686,41 @@ input[type=range]::-webkit-slider-thumb { } /* This is for quick scrub for H264 */ + + .videogular-container { height: 260px; margin: auto; overflow: hidden; float: left; + +} + + +.videogular-container-modal-width { + height: auto; + width:100%; + margin: auto; + overflow: hidden; } -.videogular-full-container { - height: 80%; - z-index: 100; - float: center; + +.videogular-container-modal-height { + height: 40%; margin: auto; overflow: hidden; } + + +videogular div.event-time { + position: absolute; + display: block; + z-index: 9999; + bottom: 10%; + background: rgba(255,0,0,0.5); +} + + + #full-screen-event { -webkit-animation-duration: 200ms; } diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 94c11e25..628cc1ff 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -791,6 +791,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro return; + $scope.videoDynamicTime = ""; $scope.videoIsReady = false; var ld = NVRDataModel.getLogin(); $scope.loginData = NVRDataModel.getLogin(); diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index caa87e9e..24078df7 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -46,9 +46,9 @@ <!--<vg-buffering></vg-buffering>--> </videogular> </div> - <div id="event_canvas_video"> + <!--<div id="event_canvas_video"> <canvas id="eventchart" width="100%" height="20px"></canvas> - </div> + </div>--> </div> </div> <!-- 100vh --> |