diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/devoptions.html | 3 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 30 | ||||
| -rw-r--r-- | www/templates/events.html | 3 |
3 files changed, 27 insertions, 9 deletions
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index 7aaf16fe..b8cdef70 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -141,6 +141,9 @@ <ion-toggle ng-model="loginData.persistMontageOrder" ng-checked="{{loginData.persistMontageOrder}}" toggle-class="toggle-calm">{{'kPersistHidden' | translate}}</ion-toggle> </label> + <label> + <ion-toggle ng-model="loginData.forceImageModePath" ng-checked="{{loginData.forceImageModePath}}" toggle-class="toggle-calm"> {{'kForceImagePath' | translate}}</ion-toggle> + </label> <label> <ion-toggle ng-model="loginData.enableh264" ng-checked="{{loginData.enableh264}}" toggle-class="toggle-calm"> {{'kH264VideoSupport' | translate}}</ion-toggle> diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 3eb8140a..5c030c99 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -1,7 +1,7 @@ <div ng-controller="EventModalCtrl"> <!-- style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"--> <ion-modal-view cache-view="false"> - <ion-content style="background-color:#444444" ng-cloak> + <ion-content style="background-color:#444444" overflow-scroll="true" ng-cloak> <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; " delegate-handle="imgscroll" on-swipe-left="onSwipeEvent(nextId,1)" on-swipe-right="onSwipeEvent(prevId,-1)" overflow-scroll="false"> <div id="full-screen-event" style="height: 100vh;"> @@ -29,8 +29,18 @@ <!-- no default video --> <div ng-if="defaultVideo!==undefined && defaultVideo!='' && loginData.enableh264 == true"> - <div on-double-tap="closeModal();"> - <videogular vg-theme="videoObject.config.theme" vg-complete="playbackFinished()"> + <div ng-if="videoIsReady" class="videogular-full-container" > + + <!--<video controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline" class="videoPlayer"><source src="" dynamic-url dynamic-url-src="{{video_url}}" type="video/mp4"/></video>--> + + <videogular vg-theme="videoObject.config.theme" vg-complete="playbackFinished()" on-double-tap="closeModal();" vg-autoplay="true" vg-responsive="true"> + + <vg-media vg-src="videoObject.config.sources" vg-native-controls="false"> + </vg-media> + + <vg-overlay-play></vg-overlay-play> + <!-- <vg-buffering></vg-buffering>--> + <vg-controls> <vg-play-pause-button></vg-play-pause-button> <vg-scrub-bar> @@ -42,11 +52,13 @@ <vg-mute-button></vg-mute-button> </vg-volume> </vg-controls> - <vg-media vg-src="videoObject.config.sources" vg-native-controls="false"> - </vg-media> + + + </videogular> + </div> - <div id="event_canvas_video"> + <div id="event_canvas_video"> <canvas id="eventchart" width="100%" height="20px"></canvas> </div> @@ -57,7 +69,7 @@ </div> <!-- 100vh --> - </ion-scroll> + </ion-scroll> <div ng-if="( (defaultVideo=='') || (loginData.enableh264==false)) && (loginData.useNphZmsForEvents==true)"> <div id="event_canvas"> @@ -104,9 +116,9 @@ - <div class="events-range-modal-text">{{'kShowingEvent' | translate}}: {{d_eventId}}</div> + <div class="events-range-modal-text">{{'kShowingEvent' | translate}}: {{d_eventId}}</div> - <div id="flyoutmenu" style="position:absolute;bottom:100px;left:10px"> + <div id="flyoutmenu" style="position:absolute;bottom:100px;left:10px"> <ul> <li ng-if="defaultVideo==''"> <a href="" ng-click="toggleGapless()"> <i class="ion-ios-loop-strong"></i>-{{loginData.gapless? ('kOn' | translate): ('kOff' | translate)}}</a> diff --git a/www/templates/events.html b/www/templates/events.html index 59938d7f..16cd4dd8 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -218,6 +218,7 @@ <div class="videogular-container"> <videogular vg-theme="event.Event.video.config.theme" vg-plays-inline="'true'" vg-auto-play="'true'" vg-responsive="true"> + <vg-overlay-play></vg-overlay-play> <vg-controls> <vg-play-pause-button></vg-play-pause-button> <vg-scrub-bar> @@ -232,6 +233,8 @@ <vg-media vg-src="event.Event.video.config.sources" vg-native-controls="false"> </vg-media> + + </videogular> </div> |