diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-12-17 14:44:30 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-12-17 14:44:30 -0500 |
| commit | 485deb664e46fb4c17b4042f8cc7f4012cd2e561 (patch) | |
| tree | ef032d6c1e18fa5ae96ea31992e70f04b28bfe79 /www/templates | |
| parent | 6460992ab3341423fb44ffd4e3318f00fdc80ec2 (diff) | |
#570 allowed multi sorting and fixes in sorting logic
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/moment-popover.html | 5 | ||||
| -rw-r--r-- | www/templates/moment.html | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/www/templates/moment-popover.html b/www/templates/moment-popover.html index 49dbea89..1d77483d 100644 --- a/www/templates/moment-popover.html +++ b/www/templates/moment-popover.html @@ -4,7 +4,12 @@ <a class="item" ng-href="" ng-click="popover.hide();getMoments('StartTime');"> {{'kMomentMenuByTime' | translate}} + </a> + + <a class="item" ng-href="" ng-click="popover.hide();getMoments('MonitorId');">{{'kMomentMenuByMonitor' | translate}}</a> + + <a class="item" ng-href="" ng-click="popover.hide();getMoments('MaxScore');">{{'kMomentMenuByScore' | translate}}</a> </div> diff --git a/www/templates/moment.html b/www/templates/moment.html index 40881ae2..a4da87d4 100644 --- a/www/templates/moment.html +++ b/www/templates/moment.html @@ -23,7 +23,7 @@ <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}}" + <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> |