diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/image-modal.html | 13 | ||||
| -rw-r--r-- | www/templates/moment-mask.html | 24 | ||||
| -rw-r--r-- | www/templates/moment-popover.html | 8 | ||||
| -rw-r--r-- | www/templates/moment.html | 62 |
4 files changed, 93 insertions, 14 deletions
diff --git a/www/templates/image-modal.html b/www/templates/image-modal.html index d38ca5b9..a682a8e6 100644 --- a/www/templates/image-modal.html +++ b/www/templates/image-modal.html @@ -1,9 +1,14 @@ <ion-modal-view cache-view="false" style="background-color:#444444"> - <ion-content> - <ion-scroll direction="xy" scrollbar-x="false" scrollbar-y="false" overflow-scroll="false" zooming="true"> - <img on-double-tap="closeModal();" ng-src="{{thumbnailLarge}}" style="display:block; width:100%" /> + <ion-content ng-cloak on-double-tap="closeModal();" scroll="false"> - </ion-scroll> + + <div id="imagecontainer"> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" + direction="xy" style="width: 100%;" overflow-scroll="false"> + <img style="width:100vw; height:100vh;" on-double-tap="closeModal();" ng-src="{{thumbnailLarge}}" style="display:block; width:100%" /> + + </ion-scroll> + </div> </ion-content> </ion-modal-view> diff --git a/www/templates/moment-mask.html b/www/templates/moment-mask.html new file mode 100644 index 00000000..51657b19 --- /dev/null +++ b/www/templates/moment-mask.html @@ -0,0 +1,24 @@ +<ion-modal-view cache-view="false" style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"> + <ion-header-bar class="bar-stable"> + <h1 class="title"></h1> + <div class="buttons"> + <button class="button button-icon icon ion-checkmark" ng-click="saveMask()"></button> + <button class="button button-icon icon ion-close" ng-click="cancelMask()"></button> + </div> + </ion-header-bar> + <ion-content> + <div class="list"> + <span ng-repeat="item in monitors"> + + <a ng-class="{ 'item item-icon-right' : item.Monitor.listDisplay == 'show', 'item item-icon-right eye-background-red' : item.Monitor.listDisplay!='show' }" ng-click="toggleHide($index)" href="" > + + + + <i ng-class="{'icon ion-eye':item.Monitor.listDisplay=='show','eye-red icon ion-eye-disabled':item.Monitor.listDisplay!='show'}"> </i><h2><span ng-class="{'eye-red':item.Monitor.listDisplay!='show'}">{{item.Monitor.Name}}</span></h2><p>{{'kId' | translate}}:{{item.Monitor.Id}}, {{'kMode' | translate}}:{{item.Monitor.Function}}</p> + + </a> + + </span> + </div> + </ion-content> +</ion-modal-view> diff --git a/www/templates/moment-popover.html b/www/templates/moment-popover.html index 49dbea89..2da37112 100644 --- a/www/templates/moment-popover.html +++ b/www/templates/moment-popover.html @@ -4,9 +4,15 @@ <a class="item" ng-href="" ng-click="popover.hide();getMoments('StartTime');"> {{'kMomentMenuByTime' | translate}} + </a> + + <a class="item" ng-href="" ng-click="popover.hide();getMoments('monitorName');">{{'kMomentMenuByMonitor' | translate}}</a> + + <a class="item" ng-href="" ng-click="popover.hide();getMoments('MaxScore');">{{'kMomentMenuByScore' | translate}}</a> - + + </div> </ion-content> </ion-popover-view> diff --git a/www/templates/moment.html b/www/templates/moment.html index 40881ae2..12cc2c95 100644 --- a/www/templates/moment.html +++ b/www/templates/moment.html @@ -2,28 +2,72 @@ <ion-nav-title>{{'kMoment24Heading' | translate}} {{type}}</ion-nav-title> <ion-nav-buttons side="left"> <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> + <button class="button button-icon button-clear ion-gear-b" ng-click="hideUnhide()"></button> + <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button> </ion-nav-buttons> <ion-nav-buttons side="right"> - <a class="button button-icon icon ion-grid" ng-click="reLayout()" ;></a> + <a class="button button-icon icon ion-chevron-down" ng-click="toggleSubMenu()" ;></a> + + <a class="button button-icon icon ion-android-more-vertical " ng-click="popover.show($event)" ;> </a> + - <a class="button button-icon icon ion-android-more-vertical" ng-click="popover.show($event)" ;> </a> </ion-nav-buttons> - <ion-content class="padding" scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll style="background-color:#444444" > + + <div class="events-float-filter" > + {{displayTimeFrom}} - {{displayTimeTo}}</span> + </div> + + + <ion-content class="padding" delegate-handle="moment-delegate" overflow-scroll="false" mouse-wheel-scroll style="background-color:#444444" > + + + <div ng-if="isSubMenu"> + <br/> + <div id="flyoutmenu" style="float:left"> + <ul> + <li> + <a href="" ng-click="sizeChanged(1)"> <i class="ion-plus-circled"></i></a> + </li> + <li> + <a href="" ng-click="sizeChanged(-1)"> <i class="ion-minus-circled"></i></a> + </li> + <li> + <a href="" ng-click="reLayout()"> <i class="ion-grid"></i></a> + </li> + </ul> + </div> + + <div id="flyoutmenu" style="float:right"> + <ul> + <li> + <a href="" ng-click="changeFrom(-1)"> <i class="ion-chevron-left"></i></a> + </li> + <li> + <a href="" ng-click="changeFrom(1)"> <i class="ion-chevron-right"></i></a> + </li> + + </ul> + </div> + + <div style="clear: both;"></div> + <br/> + </div> + - <div style="color:white" ng-if="!moments.length"> - Nothing to show yet... + <div style="color:white; text-align:center" ng-if="!moments.length"> + {{loadingStatus}} </div> <div class="grid" id="mygrid"> - <div class="grid-sizer grid-item-10"></div> - <figure class="grid-item" ng-repeat="moment in moments | onlyEnabledMoments"> - <figcaption class="normal-figheader">{{moment.Event.monitorName}}<span style="float:right"><button class="button button-small button-icon icon {{moment.Event.icon}}" ng-click="toggleCollapse(moment.Event.MonitorId, moment.Event.Id)"></button>{{moment.Event.collapseCount}} </span></figcaption> - <img image-spinner-src="{{moment.Event.baseURL}}/index.php?view=image&fid={{moment.Event.MaxScoreFrameId}}" img-spinner-w="{{moment.Event.width}}" + + <figure class="grid-item grid-item-{{gridSize}}" ng-repeat="moment in moments | onlyEnabledMoments"> + <figcaption class="normal-figheader">{{moment.Event.monitorName}}<span style="float:right"><button class="button button-small button-icon icon {{moment.Event.icon}}" ng-click="toggleCollapse(moment.Event.MonitorId, moment.Event.Id, $index)"></button>{{moment.Event.collapseCount}} </span></figcaption> + <img image-spinner-src="{{moment.Event.baseURL}}/index.php?view=image&fid={{moment.Event.MaxScoreFrameId}}&width={{moment.Event.thumbWidth*2}}&height={{moment.Event.thumbHeight*2}}" img-spinner-w="{{moment.Event.width}}" img-spinner-h="{{moment.Event.height}}" image-spinner-loader="lines" on-tap="showThumbnail(moment.Event.baseURL,moment.Event.MaxScoreFrameId)"/> <figcaption class="normal-figcaption">{{moment.Event.humanizeTime}}<span style="float:right">{{hourmin(moment.Event.StartTime)}}</span></figcaption> |