From 485deb664e46fb4c17b4042f8cc7f4012cd2e561 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 17 Dec 2017 14:44:30 -0500
Subject: #570 allowed multi sorting and fixes in sorting logic

---
 www/templates/moment-popover.html | 5 +++++
 www/templates/moment.html         | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'www/templates')

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}}&nbsp;</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>
-- 
cgit v1.2.3