Merge pull request #1 from pliablepixels/master

updating

1 files changed, 12 insertions, 47 deletions

diff --git a/www/templates/login.html b/www/templates/login.html
index 738c1c46..9372aae0 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -1,120 +1,85 @@
 <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>
+        <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-input-inset">
+    <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-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>
-
-
         <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>
-
-            <div class="item">
+            <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">{{'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>
         </div>
-
-
     </ion-content>
-</ion-view>
\ No newline at end of file
+</ion-view>