From ba1b224dbc8553a25f9307125ff2f0004602d609 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 28 Oct 2016 08:23:30 -0700
Subject: #353 - show abbreviated timezones to avoid confusion when switching,
 broadcast tz change if APIs update late

---
 www/templates/events.html   | 7 ++++---
 www/templates/timeline.html | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index 27dfee37..af2a7f89 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -42,7 +42,7 @@
                 <ion-item collection-repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}"  >
                     
                     
-                    <span style="float:left;margin-top:-18px;background-color:#96281B;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-calendar"></i>&nbsp;&nbsp;{{prettifyTime(event.Event.StartTime)}}</span>&nbsp;&nbsp;
+                    <span style="float:left;margin-top:-18px;background-color:#96281B;color:#fff;font-size:11px;opacity:0.7;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-calendar"></i>&nbsp;&nbsp;{{prettifyTime(event.Event.StartTime)}}&nbsp;{{tzAbbr}}&nbsp;</span>&nbsp;&nbsp;
                     
                                         
                     <span style="float:left;margin-top:-18px;background-color:#fff;color:#888;font-size:11px;opacity:1;">&nbsp;&nbsp;<i class="ion-arrow-right-b"></i>&nbsp;{{event.Event.humanizeTime}} <span ng-if="!event.Event.EndTime">(<span translate="kRecordingProgress"></span>)</span>
@@ -51,7 +51,8 @@
                  
                    
                     
-                    <span style="float:right;margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-clock"></i>&nbsp;&nbsp;{{prettifyDate(event.Event.StartTime)}}</span>
+                    <span style="float:right;margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-clock"></i>&nbsp;&nbsp;{{prettifyDate(event.Event.StartTime)}}
+                        &nbsp;{{tzAbbr}}&nbsp;</span>
                     
                     
                     
@@ -107,7 +108,7 @@
                     <!--row-->
 
                     <div class="row" style="font-size:80%; color:rgb(110,110,110)">
-                        <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp; {{prettify(event.Event.StartTime)}}
+                        <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp; {{prettify(event.Event.StartTime)}}&nbsp;{{tzAbbr}}&nbsp;
                             <br/>
                             <i class="ion-clipboard"></i>&nbsp; {{event.Event.Notes}}
                             <!-- <br/> Default video:{{event.Event.relativePath}}{{event.Event.DefaultVideo}}-->
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index e443e705..f8d89444 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -26,7 +26,7 @@
     <ion-content scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll>
         <div style="padding-left:15px; font-size:10px; color:grey">
 
-        {{prettify(fromDate)}} - {{prettify(toDate)}} ({{'kTimelineOnlyDisplaying1' | translate:translationData}}) 
+        {{prettify(fromDate)}} - {{prettify(toDate)}} &nbsp;{{tzAbbr}}&nbsp;  ({{'kTimelineOnlyDisplaying1' | translate:translationData}}) 
         <strong><br/>{{'kTimelineControlDisplay'|translate}}</strong>
             </div>
 
-- 
cgit v1.2.3