diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 82 | ||||
| -rw-r--r-- | www/templates/events.html | 122 |
2 files changed, 88 insertions, 116 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 5b96c65f..f0d32d52 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -1,33 +1,42 @@ <div ng-controller="ModalCtrl"> <!-- 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-modal-view cache-view="false"> + <ion-content style="background-color:#444444" ng-cloak> - <ion-scroll has-bouncing=false min-zoom=1 zooming="true" - direction="xy" style="width: 100%; "> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> <div style="height: 100vh;"> - <ul rn-carousel rn-carousel-buffered - rn-carousel-transition="none" rn-swipe-disabled="true" - rn-carousel-index="mycarousel.index" - rn-carousel-auto-slide="{{calcMsTimer(eFramesNum, eventDur)/1000.0}}" rn-carousel-pause-on-hover > - <li ng-repeat="slide in slides"> + <div ng-if="defaultVideo==''"> + <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(eFramesNum, eventDur)/1000.0}}" rn-carousel-pause-on-hover> - <img imageonload="finishedLoadingImage($index)" - image-spinner-src="{{playbackURL}}/index.php?view=image&rand={{$root.rand}}&path={{relativePath}}{{slide.img}}&scale=100" - image-spinner-loader="lines" - ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}"/> + <li ng-repeat="slide in slides"> - <!--<img id="hello" imageonload="finishedLoadingImage($index)" + <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&rand={{$root.rand}}&path={{relativePath}}{{slide.img}}&scale=100" image-spinner-loader="lines" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" /> + + <!--<img id="hello" imageonload="finishedLoadingImage($index)" image-spinner-src="{{eventBasePath}}{{slide.img}}?rand={{rand}}" image-spinner-loader="lines" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}";/>--> - </li> - </ul> + </li> + </ul> + </div> + <!-- no default video --> + + <div ng-if="defaultVideo!=''"> + <div> + <videogular vg-theme="videoObject.config.theme"> + <vg-media vg-src="videoObject.config.sources" vg-native-controls="true"> + </vg-media> + </videogular> + </div> + + </div> + </div> + <!-- 100vh --> </ion-scroll> @@ -35,39 +44,35 @@ </ion-content> - <!-- <div class="range"> + <!-- <div class="range"> <input type="range" ng-model="ionRange.index" min="0" max="{{eFramesNum-1}}" > </div>--> - </div> +</div> - </ion-modal-view> +</ion-modal-view> -<nav mfb-menu position="tr" effect="zoomin" label="collapse" - active-icon="ion-chevron-up" resting-icon="ion-chevron-down" - toggling-method="click"> +<nav mfb-menu position="tr" effect="zoomin" label="collapse" active-icon="ion-chevron-up" resting-icon="ion-chevron-down" toggling-method="click"> - <a mfb-button icon="ion-arrow-resize" label="fit image" - ng-click="scaleImage();"></a> - <!--<a mfb-button icon="ion-reply" label="previous event" + <a mfb-button icon="ion-arrow-resize" label="fit image" ng-click="scaleImage();"></a> + <!--<a mfb-button icon="ion-reply" label="previous event" ng-click="controlEventStream(eventCommands.previous)"></a> <a mfb-button icon="ion-forward" label="next event" ng-click="controlEventStream(eventCommands.next)"></a>--> - <a mfb-button icon="ion-close" - label="exit event view" ng-click="closeModal()"> </a> + <a mfb-button icon="ion-close" label="exit event view" ng-click="closeModal()"> </a> - </nav> +</nav> + +<div class="events-range-modal" ng-if="defaultVideo==''"> + + <div style="width:90%"> + <input ng-model="ionRange.index" type="text" id="mySlider2" slider options="slider_modal_options" /> + </div> - <div class="events-range-modal" > - <div style="width:90%"> - <input ng-model="ionRange.index" type="text" id="mySlider2" slider options="slider_modal_options" /> - </div> - - - </div> - - <span class="event-modal-alarm-badge"> +</div> + +<span class="event-modal-alarm-badge"> <a data-badge="{{$root.alarmCount}}" class="animated infinite tada button icon ion-ios-bell notification-badge button-assertive" ng-click="handleAlarms();" ng-if="$root.isAlarm" ></a> </span> @@ -98,5 +103,4 @@ <progress max="{{totalEventTime}}" value="{{currentEventTime}}" class="eventprogress"></progress> ---> - +-->
\ No newline at end of file diff --git a/www/templates/events.html b/www/templates/events.html index 5f1bafd0..ef6bf0d0 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -12,11 +12,7 @@ <ion-nav-buttons side="right"> <a style="" class="button button-icon icon ion-android-more-vertical" ng-click="popover.show($event)" ;> </a> - <!-- - <a style="" class="button button-icon icon ion-stats-bars" - ng-href="#events-graphs"> </a> - <a style="" class="button button-icon icon ion-refresh" ng-href="" - ng-click="doRefresh();"> </a>--> + <a style="" class="button button-icon icon ion-search" ng-href="" ng-click="searchClicked();"> </a> </ion-nav-buttons> @@ -35,10 +31,7 @@ <ion-content on-tap="tapped();" delegate-handle="mainScroll" lazy-scroll has-subheader="true"> - <!--<ion-refresher - pulling-text="Tap <i class='ion-android-more-vertical'></i> and <i class='ion-refresh'></i> to refresh" - spinner="bubbles" on-refresh="dummyDoRefresh();"> - </ion-refresher>--> + <!-- lets make sure the events list is not empty as collection repeat needs height --> <div ng-if="!eventsBeingLoaded"> @@ -62,21 +55,21 @@ <i class="ion-android-walk" style="float:left; font-size:200%;"></i> <div ng-if="event.Event.DefaultVideo!=''"> - <i class="ion-ios-videocam" style="float:left; padding-left:5px; font-size:200%;"></i> + <i class="ion-ios-videocam" style="float:left; padding-left:5px; font-size:200%;"></i> </div> <br/> </div> <div ng-switch-when="Signal"> <i class="ion-wifi" style="float:left; font-size:200%;"></i> <div ng-if="event.Event.DefaultVideo!=''"> - <i class="ion-ios-videocam" style="float:left; padding-left:5px;font-size:200%;"></i> + <i class="ion-ios-videocam" style="float:left; padding-left:5px;font-size:200%;"></i> </div> <br/> </div> <div ng-switch-default> <i class="ion-ionic" style="float:left; font-size:200%;"></i> <div ng-if="event.Event.DefaultVideo!=''"> - <i class="ion-ios-videocam" style="float:left; padding-left:5px;font-size:200%;"></i> + <i class="ion-ios-videocam" style="float:left; padding-left:5px;font-size:200%;"></i> </div> <br/> </div> @@ -107,7 +100,7 @@ <div class="item-text-wrap"><i class="ion-calendar"></i> {{prettify(event.Event.StartTime)}} <br/> <i class="ion-clipboard"></i> {{event.Event.Notes}} - <!-- <br/> Default video:{{event.Event.relativePath}}{{event.Event.DefaultVideo}}--> + <!-- <br/> Default video:{{event.Event.relativePath}}{{event.Event.DefaultVideo}}--> </div> </div> <span style="float:right"> @@ -118,7 +111,7 @@ <button class="button button-small icon icon-left ion-ios-eye" - ng-click="closeIfOpen(event);openModal(event.Event.Id, event.Event.Name, event.Event.Length,event.Event.Frames, event.Event.BasePath, event.Event.relativePath)" > View Footage + ng-click="closeIfOpen(event);openModal(event.Event.Id, event.Event.Name, event.Event.Length,event.Event.Frames, event.Event.BasePath, event.Event.relativePath, event)" > View Footage </button> </span> @@ -127,83 +120,58 @@ <!-- this is the event scrub area --> <div ng-if="isGroupShown(event)"> - + <div ng-if="event.Event.DefaultVideo==''"> - - <br/> - <br/> - <br/> - <div style="width:90%"> - <input ng-model="ionRange.index" type="text" id="mySlider1" slider options="slider_options" /> - </div> - <br/> - - - <!-- <div class="range" style="width:90%"> - <span class="events-alarm-line"></span> - <input type="range" ng-model="ionRange.index" - min="1" max="{{event.Event.Frames}}" - step="1" list="steplist"> - <datalist id="steplist"> - <option>0</option> - <option>10</option> - <option>15</option> - <option>20</option> - <option>25</option> - </datalist> - - </div>--> - <p>{{mycarousel.index+1}}/{{event.Event.Frames}} Type: {{FrameArray[mycarousel.index].Type}}</p> - - <div style="height:190px"> - <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(event.Event.Frames, event.Event.Length)/1000.0}}" rn-carousel-pause-on-hover> - <li ng-repeat="slide in slides"> - <!-- Linwood scaling --> - <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> - <br/> + <br/> + <br/> + <br/> + + <div style="width:90%"> + <input ng-model="ionRange.index" type="text" id="mySlider1" slider options="slider_options" /> + </div> + <br/> - <!-- <img image-spinner-src="{{loginData.url}}cgi-bin/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&scale=100&rate=100&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}" height="190px;" - image-spinner-loader="lines" - />--> + + <p>{{mycarousel.index+1}}/{{event.Event.Frames}} Type: {{FrameArray[mycarousel.index].Type}}</p> + + <div style="height:190px"> + <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(event.Event.Frames, event.Event.Length)/1000.0}}" rn-carousel-pause-on-hover> + <li ng-repeat="slide in slides"> + <!-- Linwood scaling --> + <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> + <br/> - <!--<img imageonload="finishedLoadingImage($index)" - image-spinner-src="{{event.Event.BasePath}}{{slide.img}}?rand={{rand}}" - image-spinner-loader="lines" - height="190px";/>--> - </li> - </ul> + </li> + </ul> + </div> </div> - </div> <!-- no DefaultVideo --> - - + <!-- no DefaultVideo --> + + <div ng-if="event.Event.DefaultVideo!=''"> - <!--<br/>events/{{event.Event.relativePath}}{{event.Event.DefaultVideo}}<br/>--> - <!-- <video controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline" class="videoPlayer"><source src="http://173.228.105.6/zm/events/2/15/11/01/01/54/03/754-video.mp4" type="video/mp4"/></video>--> - <br/><br/><br/> + <br/> + <br/> + <br/> <div class="videogular-container"> - <videogular vg-theme="event.Event.video.config.theme"> - <vg-media vg-src="event.Event.video.config.sources" - - vg-native-controls="true"> - </vg-media> - </videogular> - </div> - - </div> <!-- DefaultVideo --> - </div> <!-- isGroupShown --> + <videogular vg-theme="event.Event.video.config.theme"> + <vg-media vg-src="event.Event.video.config.sources" vg-native-controls="true"> + </vg-media> + </videogular> + </div> + + </div> + <!-- DefaultVideo --> + </div> + <!-- isGroupShown --> <ion-delete-button class="ion-minus-circled" ng-click="deleteEvent(event.Event.Id, $index)"> </ion-delete-button> - <!-- - <ion-option-button class="button-assertive" - ng-click="deleteEvent(event.Event.Id, $index)"> - Delete - </ion-option-button>--> + </div> </ion-item> |
