From 017d1416fa9148f84596aa109826cacb13c1c774 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 22 Oct 2016 13:07:39 -0400
Subject: #353 - more timezone tweaks, especially making sure humanizeTime is
 ALWAYS using local time irrespective of setting

Former-commit-id: d28f076eb0a780a83466f259d17563b8d2d34a0d
---
 www/index.html | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'www/index.html')

diff --git a/www/index.html b/www/index.html
index c04e169b..41e64912 100644
--- a/www/index.html
+++ b/www/index.html
@@ -186,17 +186,14 @@
                         </ion-item>
 
                         <ion-item nav-clear menu-close href="#/login/false">
-
-
-                        <span class=" item-icon-left">
-                            <i class="icon ion-person"></i>
-                            {{'kMenuZMSettings'|translate}}
-                            <!--<span class="item-note" style="width:90px">
-                                {{$root.getProfileName();}}
-                            </span>-->
-                                <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;:text-overflow:ellipsis;overflow:hidden;white-space:nowrap;display:inline-block;text-align:center;">&nbsp;{{$root.getProfileName();}}&nbsp;</span>
-                        </span>     
-
+                            <span class=" item-icon-left">
+                                <i class="icon ion-person"></i>
+                                {{'kMenuZMSettings'|translate}}
+                                <!--<span class="item-note" style="width:90px">
+                                    {{$root.getProfileName();}}
+                                </span>-->
+                                    <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;:text-overflow:ellipsis;overflow:hidden;white-space:nowrap;display:inline-block;text-align:center;">&nbsp;{{$root.getProfileName();}}&nbsp;</span>
+                            </span>     
                         </ion-item>
 
                         <ion-item nav-clear menu-close href="#/devoptions">
@@ -260,6 +257,14 @@
                             </ion-item>
 
                         </div>
+                        
+                        <ion-item style="color:rgb(106, 106, 106); font-size:90%;">
+                            <i class="ion-ios-location"></i> {{$root.getLocalTimeZone();}} <br/>
+                            <span ng-if="$root.isTzSupported()"><i class="icon icon-server"></i> {{$root.getServerTimeZoneNow();}}   </span>                 
+                        </ion-item>
+                        
+                        
+                          
 
 
                     </ion-list>
-- 
cgit v1.2.3