From 83593d6e7592e60493e38e4f3594e39ab583ec04 Mon Sep 17 00:00:00 2001
From: lucas_nz <lucas_nz@outlook.com>
Date: Sun, 13 Sep 2020 09:28:23 +1200
Subject: The date div was too wide, resulting in the friendly time being
 pushed onto a new line. Unsetting flex and width seems to resolve this.

---
 www/templates/events.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index 199a9b85..670197c6 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -50,7 +50,7 @@
                 </div>
               </div>
 
-              <div class="col events-list-text" style="margin-top:-20px;padding:0px; ">
+              <div class="col events-list-text" style="margin-top:-20px;padding:0px; width:unset; flex:unset;">
                 <div  style="float:right;background-color:#444;color:#fff;font-size:11px;opacity:0.7;border-radius: 0px 0px 5px 5px;">
                   &nbsp;&nbsp;<i class="ion-calendar"></i>&nbsp;&nbsp;{{prettifyDate(event.Event.StartTime)}} &nbsp;{{tzAbbr}}&nbsp;&nbsp;&nbsp;
                 </div>
-- 
cgit v1.2.3


From 62d12df2c29b2443b7333ba985aedd78bf2ad0ae Mon Sep 17 00:00:00 2001
From: lucas_nz <lucas_nz@outlook.com>
Date: Sun, 13 Sep 2020 09:29:30 +1200
Subject: Base row size on image height and resolve resizing.

---
 www/templates/events.html | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index 670197c6..6588f741 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -33,7 +33,7 @@
       <ion-list show-delete="eventList.showDelete">
         
          <ion-item force-refresh-images="true" collection-repeat="event in events| filter:search.text |  eventListFilter" force-refresh-images=true 
-          item-height="event.Event.ShowScrub? rowHeightExpanded:rowHeight" id="item-{{$index}}" on-swipe-left="checkSwipe($index);" force-refresh-images="true" >
+          item-height="getRowHeight(event)" id="item-{{$index}}" on-swipe-left="checkSwipe($index);" force-refresh-images="true" >
          
             <!-- item headers: date/time -->
             <div class="row" style="padding-top:0px; padding-bottom:10px">
@@ -62,7 +62,7 @@
               <div class="col events-list-text"> <!-- data -->
                 <!-- for largeThumbs show image in this column -->
                 <div ng-if="loginData.eventViewThumbs!='none' && thumbClass=='large'"  width="100%" style="padding: 5px;">
-                  <br/><img  bg-color="#6C7A89" ng-src="{{constructThumbnail(event)}}"
+                  <img  bg-color="#6C7A89" ng-src="{{constructThumbnail(event)}}"
                   on-tap="closeIfOpen(event);openModalWithSnapshot(event)" width="{{event.Event.thumbWidth}}px"
                   height="{{event.Event.thumbHeight}}px" fallback-src="img/noimage.png" style="display: block; margin: auto;" />
                 </div>
@@ -145,10 +145,8 @@
             | translate}}</ion-option-button>
 
             <!-- this is the event scrub/alarm frames area -->
-            <div ng-if="isGroupShown(event)" style="min-height: 50px;">
+            <div class="row" ng-if="isGroupShown(event)" style="min-height: 50px;padding-top: 5px;margin-top: 0px;">
               <div ng-if="groupType=='alarms'">
-                <br />
-                <br />
                 <div>
                   <p>
                     <!--scroll <i class="icon ion-arrow-left-c"></i> 
@@ -188,9 +186,6 @@
               </div>
               <div ng-if="groupType=='scrub'">
                 <div ng-if="event.Event.DefaultVideo=='' || loginData.enableh264==false">
-                  <br />
-                  <br />
-                  <br />
                   <div style="width:90%">
                     <input ng-model="ionRange.index" type="text" id="mySlider1" slider options="slider_options" />
                   </div>
@@ -214,9 +209,6 @@
                 </div>
                 <!-- no DefaultVideo -->
                 <div ng-if="event.Event.DefaultVideo!='' && loginData.enableh264 == true">
-                  <br />
-                  <br />
-                  <br />
                   <div class="videogular-container">
                     <videogular vg-theme="event.Event.video.config.theme" vg-plays-inline="'true'" vg-auto-play="'true'"
                       vg-responsive="true" vg-can-play="eventCanPlay()" vg-player-ready="readyToPlay($API)">
-- 
cgit v1.2.3