From a11e9426dcbbec7c5df39c29b99befa360feaea8 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 10 Nov 2016 09:37:06 -0500
Subject: added text-wrap for input items to manage larger strings (problem
 when translated to some languages like russian)

---
 www/templates/login.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/www/templates/login.html b/www/templates/login.html
index 738c1c46..de80eb3e 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -15,7 +15,7 @@
 
     <ion-content scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll >
 
-        <div class="item item-input-inset">
+        <div class="item item-text-wrap  item-input-inset">
             {{'kServerName' | translate }}:&nbsp;
             <label class="item-input-wrapper">
                 <input autocorrect="off" type="text" placeholder="{{'kExampleServer' | translate}}" ng-model="loginData.serverName">
@@ -23,11 +23,11 @@
         </div>
 
         <label>
-            <ion-toggle ng-model="loginData.enableLowBandwidth" toggle-class="toggle-calm">{{'kLowBandwidth'|translate}}
+            <ion-toggle ng-model="loginData.enableLowBandwidth" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kLowBandwidth'|translate}}</span>
             </ion-toggle>
         </label>
         <label ng-if="loginData.enableLowBandwidth">
-            <ion-toggle ng-model="loginData.autoSwitchBandwidth" toggle-class="toggle-calm">{{'kAutoSwitchBW'|translate}}
+            <ion-toggle ng-model="loginData.autoSwitchBandwidth" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kAutoSwitchBW'|translate}}</span>
             </ion-toggle>
         </label>
 
@@ -38,7 +38,7 @@
                {{'kZMSettingsFor' | translate}} {{loginData.serverName || ('kUnknown' | translate)}}
             </span>
 
-            <div class="item">
+            <div class="item item-text-wrap">
                 <ion-checkbox ng-model="check.isUseAuth">{{'kUseZmAuth' | translate }}</ion-checkbox>
 
                 <div ng-if="check.isUseAuth">
@@ -97,19 +97,19 @@
             <div ng-if="$root.platformOS != 'desktop'">
                 <label>
 
-                    <ion-toggle ng-model="loginData.usePin" ng-change="pinPrompt();" ng-checked="{{loginData.usePin}}" toggle-class="toggle-calm">{{'kPassword' | translate}} {{'kProtect'|translate}}</ion-toggle>
+                    <ion-toggle ng-model="loginData.usePin" ng-change="pinPrompt();" ng-checked="{{loginData.usePin}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kPassword' | translate}} {{'kProtect'|translate}}</span></ion-toggle>
                 </label>
             </div>
 
             <label>
-                <ion-toggle ng-model="loginData.useSSL" ng-checked="{{loginData.useSSL}}" toggle-class="toggle-calm">{{'kUseSSL' | translate}}</ion-toggle>
+                <ion-toggle ng-model="loginData.useSSL" ng-checked="{{loginData.useSSL}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kUseSSL' | translate}}</span></ion-toggle>
             </label>
 
             <div ng-if="$root.platformOS != 'desktop'">
                 <label>
 
-                    <ion-toggle ng-model="loginData.keepAwake" ng-checked="{{loginData.keepAwake}}" toggle-class="toggle-calm">{{'kAwake1'|translate}}
-                        <p>{{'kAwake2'| translate}}</p>
+                    <ion-toggle ng-model="loginData.keepAwake" ng-checked="{{loginData.keepAwake}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kAwake1'|translate}}
+                        <p>{{'kAwake2'| translate}}</p></span>
                     </ion-toggle>
                 </label>
             </div>
-- 
cgit v1.2.3


From 3066a84aca25c1bef13b50f149f6a15b23e9fb2c Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 11 Nov 2016 11:16:06 -0500
Subject: Added samsung note in login screen too

---
 www/templates/login.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/www/templates/login.html b/www/templates/login.html
index de80eb3e..41f555f3 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -19,7 +19,9 @@
             {{'kServerName' | translate }}:&nbsp;
             <label class="item-input-wrapper">
                 <input autocorrect="off" type="text" placeholder="{{'kExampleServer' | translate}}" ng-model="loginData.serverName">
+    
             </label>
+
         </div>
 
         <label>
@@ -32,12 +34,13 @@
         </label>
 
 
+        
         <div class="list list-inset">
             <span style="color:rgb(100,100,100)">
                 <i class="ion-android-home" style="font-size:150%"></i>
                {{'kZMSettingsFor' | translate}} {{loginData.serverName || ('kUnknown' | translate)}}
             </span>
-
+            <p ng-if="$root.platformOS!='android'" style="font-size:0.8em; color:gray">{{'kDisableSamsung' | translate}}</p>
             <div class="item item-text-wrap">
                 <ion-checkbox ng-model="check.isUseAuth">{{'kUseZmAuth' | translate }}</ion-checkbox>
 
-- 
cgit v1.2.3


From eb47b69df4470fcfa5e7aeb76515a4cab4a406da Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 11 Nov 2016 11:16:50 -0500
Subject: samsung note in login screen #367

---
 www/templates/login.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/www/templates/login.html b/www/templates/login.html
index 41f555f3..f907fabb 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -34,13 +34,13 @@
         </label>
 
 
-        
+
         <div class="list list-inset">
             <span style="color:rgb(100,100,100)">
                 <i class="ion-android-home" style="font-size:150%"></i>
                {{'kZMSettingsFor' | translate}} {{loginData.serverName || ('kUnknown' | translate)}}
             </span>
-            <p ng-if="$root.platformOS!='android'" style="font-size:0.8em; color:gray">{{'kDisableSamsung' | translate}}</p>
+            <p ng-if="$root.platformOS=='android'" style="font-size:0.8em; color:gray">{{'kDisableSamsung' | translate}}</p>
             <div class="item item-text-wrap">
                 <ion-checkbox ng-model="check.isUseAuth">{{'kUseZmAuth' | translate }}</ion-checkbox>
 
-- 
cgit v1.2.3


From cf93ca01f3d54fca62d4222f110c2a63b526badb Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 16 Nov 2016 12:11:06 -0500
Subject: nits

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

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

diff --git a/www/templates/login.html b/www/templates/login.html
index f907fabb..f05781f9 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -25,7 +25,7 @@
         </div>
 
         <label>
-            <ion-toggle ng-model="loginData.enableLowBandwidth" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kLowBandwidth'|translate}}</span>
+            <ion-toggle ng-mode nl="loginData.enableLowBandwidth" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kLowBandwidth'|translate}}</span>
             </ion-toggle>
         </label>
         <label ng-if="loginData.enableLowBandwidth">
-- 
cgit v1.2.3


From 31ca68739126f5740681238539a8c6a1b66e0000 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 18 Nov 2016 09:28:08 -0500
Subject: mass formatting and normalization - tweaked JSBeautify options

---
 www/templates/login.html | 42 ++----------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

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

diff --git a/www/templates/login.html b/www/templates/login.html
index f05781f9..05ada193 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -1,29 +1,19 @@
 <ion-view view-title="{{'kSettings' | translate}}" cache-view="false">
-
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
         <button class="button button-icon button-clear ion-arrow-down-b" ng-click="serverActionSheet()"></button>
-
-
-
         <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
     </ion-nav-buttons>
-
     <ion-nav-buttons side="right">
         <button class="button button-clear" ng-click="saveItems()">Save</button>
     </ion-nav-buttons>
-
-    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll >
-
+    <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
         <div class="item item-text-wrap  item-input-inset">
             {{'kServerName' | translate }}:&nbsp;
             <label class="item-input-wrapper">
                 <input autocorrect="off" type="text" placeholder="{{'kExampleServer' | translate}}" ng-model="loginData.serverName">
-    
             </label>
-
         </div>
-
         <label>
             <ion-toggle ng-mode nl="loginData.enableLowBandwidth" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kLowBandwidth'|translate}}</span>
             </ion-toggle>
@@ -32,9 +22,6 @@
             <ion-toggle ng-model="loginData.autoSwitchBandwidth" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kAutoSwitchBW'|translate}}</span>
             </ion-toggle>
         </label>
-
-
-
         <div class="list list-inset">
             <span style="color:rgb(100,100,100)">
                 <i class="ion-android-home" style="font-size:150%"></i>
@@ -43,81 +30,56 @@
             <p ng-if="$root.platformOS=='android'" style="font-size:0.8em; color:gray">{{'kDisableSamsung' | translate}}</p>
             <div class="item item-text-wrap">
                 <ion-checkbox ng-model="check.isUseAuth">{{'kUseZmAuth' | translate }}</ion-checkbox>
-
                 <div ng-if="check.isUseAuth">
-
                     <label class="item item-input item-floating-label">
                         <span class="input-label">{{'kUserName'|translate}}</span>
                         <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="username" ng-model="loginData.username">
                     </label>
-
                     <label class="item item-input item-floating-label">
                         <span class="input-label">{{'kPassword' | translate}}</span>
                         <input type="password" placeholder="password" ng-model="loginData.password">
                     </label>
                 </div>
-
             </div>
             <label class="item item-input item-floating-label">
                 <span class="input-label">{{'kPortalUrl' | translate}}</span>
                 <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM portal url " ng-model="loginData.url" ng-keyup="portalKeypress($event)">
             </label>
-
             <!--<button class="button button-small button-clear icon-left ion-wand" ng-click="detectCgi()">tap here to discover cgi-bin
                 </button>-->
-
             <label class="item item-input item-floating-label">
-
-
                 <!--<span style="float:right;margin-top:-7px;background-color:#6d0909;color:#fff;font-size:14px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;" on-tap="detectCgi();">&nbsp;&nbsp;&nbsp;<i class="ion-wand"></i>discover</span>-->
-
-
                 <span class="input-label">{{'kPathToCgi' | translate}}</span>
-
                 <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="eg. server.com/zm/cgi-bin" ng-model="loginData.streamingurl">
-
             </label>
-
-
-
             <label class="item item-input item-floating-label">
                 <span class="input-label">{{'kApiUrl' | translate}}</span>
                 <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM api url" ng-model="loginData.apiurl">
             </label>
-
             <a class="item item-icon-right" href="" ng-click="selectFallback()">
                 <i class="icon ion-ios-arrow-right">
                 </i> {{'kFallback' | translate}}
                 <p>{{loginData.fallbackConfiguration}}</p>
             </a>
-
             <a class="item item-icon-right" href="" ng-click="eventServerSettings()">
                 <i class="icon ion-ios-arrow-right">
                 </i> {{'kEventServer' | translate}}
             </a>
-
-
             <div ng-if="$root.platformOS != 'desktop'">
                 <label>
-
                     <ion-toggle ng-model="loginData.usePin" ng-change="pinPrompt();" ng-checked="{{loginData.usePin}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kPassword' | translate}} {{'kProtect'|translate}}</span></ion-toggle>
                 </label>
             </div>
-
             <label>
                 <ion-toggle ng-model="loginData.useSSL" ng-checked="{{loginData.useSSL}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kUseSSL' | translate}}</span></ion-toggle>
             </label>
-
             <div ng-if="$root.platformOS != 'desktop'">
                 <label>
-
                     <ion-toggle ng-model="loginData.keepAwake" ng-checked="{{loginData.keepAwake}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kAwake1'|translate}}
                         <p>{{'kAwake2'| translate}}</p></span>
                     </ion-toggle>
                 </label>
             </div>
         </div>
-
-
     </ion-content>
-</ion-view>
\ No newline at end of file
+</ion-view>
-- 
cgit v1.2.3


From 7e00aaa03b7d7ec26ba2261e5522aedb5d07c5cd Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 18 Nov 2016 16:33:12 -0500
Subject: typo fix

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

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

diff --git a/www/templates/login.html b/www/templates/login.html
index 05ada193..28e340e8 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -15,7 +15,7 @@
             </label>
         </div>
         <label>
-            <ion-toggle ng-mode nl="loginData.enableLowBandwidth" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kLowBandwidth'|translate}}</span>
+            <ion-toggle ng-model="loginData.enableLowBandwidth" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kLowBandwidth'|translate}}</span>
             </ion-toggle>
         </label>
         <label ng-if="loginData.enableLowBandwidth">
-- 
cgit v1.2.3


From 89ade3c9f048bbda108948d89de3c2b9c0d4a0ed Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 3 Dec 2016 07:17:36 -0500
Subject: fixed hardcoded strings, except 'Back' #400

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

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

diff --git a/www/templates/login.html b/www/templates/login.html
index 28e340e8..9372aae0 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -5,7 +5,7 @@
         <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
     </ion-nav-buttons>
     <ion-nav-buttons side="right">
-        <button class="button button-clear" ng-click="saveItems()">Save</button>
+        <button class="button button-clear" ng-click="saveItems()">{{'kSave' | translate}}</button>
     </ion-nav-buttons>
     <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
         <div class="item item-text-wrap  item-input-inset">
-- 
cgit v1.2.3