diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 3 | ||||
| -rw-r--r-- | www/templates/moment.html | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 3458fb2e..b947f03a 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -72,13 +72,14 @@ <canvas style="padding-left:23px; padding-right:23px;" id="eventchart" width="auto" height="20"></canvas> </div> + <div ng-if="checkEventOn" id="event_slider" data-tap-disabled="false"> <div class="range"> <input on-drag="enableSliderBlock()" on-release="youChangedSlider()" type="range" min="0" max="{{currentEventDuration}}" ng-model="sliderProgress.progress"> </div> </div> <div id="event_rate_text"> - @{{currentRate}}x {{'kAt' | translate}}:{{currentProgress.progress}}s + @{{currentRate}}x {{'kAt' | translate}}:{{currentProgress.progress}}s </div> </div> diff --git a/www/templates/moment.html b/www/templates/moment.html index bdd64b6a..f90ea0de 100644 --- a/www/templates/moment.html +++ b/www/templates/moment.html @@ -22,7 +22,7 @@ </div> - <ion-content class="padding" delegate-handle="moment-delegate" overflow-scroll="false" mouse-wheel-scroll style="background-color:#444444" > + <ion-content delegate-handle="moment-delegate" overflow-scroll="false" mouse-wheel-scroll style="background-color:#444444" > <div ng-if="isSubMenu"> @@ -66,12 +66,15 @@ <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> + <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="playEvent(moment)"/> + + <figcaption class="normal-subfigcaption"><span style="float:right"><button class="button button-small button-icon icon {{moment.Event.pinnedIcon}}" ng-click="togglePin( $index)"></button></span></figcaption> + <!--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> + <figcaption class="normal-figcaption"> {{moment.Event.humanizeTime}}<span style="float:right">{{hourmin(moment.Event.StartTime)}} </span></figcaption> </figure> </div> |