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/devoptions.html          | 43 ++++++++++++++++++----------------
 www/templates/eventserversettings.html |  2 +-
 www/templates/login.html               | 16 ++++++-------
 3 files changed, 32 insertions(+), 29 deletions(-)

(limited to 'www')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index cf207327..0ce3d11c 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -18,14 +18,14 @@
                 </label>
             </div>
             <label>
-                <ion-toggle ng-model="loginData.use24hr" ng-checked="{{loginData.use24hr}}" toggle-class="toggle-calm">{{'kEnable24hr' | translate}}</ion-toggle>
+                <ion-toggle ng-model="loginData.use24hr" ng-checked="{{loginData.use24hr}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnable24hr' | translate}}</span></ion-toggle>
             </label>
             <label>
-                <ion-toggle ng-model="loginData.useLocalTimeZone" ng-checked="{{loginData.useLocalTimeZone}}" ng-disabled="!isTzSupported()" toggle-class="toggle-calm">{{'kLocalTimeZone' | translate}}<span ng-if="!isTzSupported()"><p>{{'kTimeZoneNotSupported' | translate}}</p></span><span ng-if="isTzSupported()"><p>{{'kServerTimeZone' | translate}}:{{getTimeZoneNow()}}</p></span></ion-toggle>
+                <ion-toggle ng-model="loginData.useLocalTimeZone" ng-checked="{{loginData.useLocalTimeZone}}" ng-disabled="!isTzSupported()" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kLocalTimeZone' | translate}}<span ng-if="!isTzSupported()"><p>{{'kTimeZoneNotSupported' | translate}}</p></span><span ng-if="isTzSupported()"><p>{{'kServerTimeZone' | translate}}:{{getTimeZoneNow()}}</p></span></span></ion-toggle>
             </label>
             <div ng-if="$root.platformOS=='android'">
                 <label>
-                    <ion-toggle ng-model="loginData.exitOnSleep" ng-checked="{{loginData.exitOnSleep}}" toggle-class="toggle-calm">{{'kExitAppBackground' | translate}}</ion-toggle>
+                    <ion-toggle ng-model="loginData.exitOnSleep" ng-checked="{{loginData.exitOnSleep}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kExitAppBackground' | translate}}</span></ion-toggle>
                 </label>
             </div>
             <!--
@@ -41,7 +41,10 @@
                             toggle-class="toggle-calm">use ZMS for events footage</ion-toggle>
             </label>
             -->
-            <div class="item item-input-inset">
+
+            
+
+            <div class="item item-text-wrap item-input-inset">
                 {{'kMaxMonitorsMontage' | translate }}&nbsp;
                 <label class="item-input-wrapper">
                     <input type="tel" placeholder="be careful" ng-model="loginData.maxMontage">
@@ -55,19 +58,19 @@
                 </label>
             </div>
             -->
-            <div class="item item-input-inset">
+            <div class="item item-text-wrap item-input-inset">
                 {{'kMontageImageScale' | translate}}(%)&nbsp;
                 <label class="item-input-wrapper">
                     <input type="tel" placeholder="max is 70" ng-model="loginData.montageQuality">
                 </label>
             </div>
-            <div class="item item-input-inset">
+            <div class="item item-text-wrap item-input-inset">
                 {{'kEventSingleImageScale' | translate}}(%)&nbsp;
                 <label class="item-input-wrapper">
                     <input type="tel" placeholder="" ng-model="loginData.singleImageQuality">
                 </label>
             </div>
-            <div class="item item-input-inset">
+            <div class="item item-text-wrap item-input-inset">
                 {{'kMonitorSingleImageScale' | translate}}(%)&nbsp;
                 <label class="item-input-wrapper">
                     <input type="tel" placeholder="" ng-model="loginData.monSingleImageQuality">
@@ -81,13 +84,13 @@
                 </label>
 
             </div>-->
-            <div class="item item-input-inset">
+            <div class="item item-text-wrap item-input-inset">
                 {{'kEventMontageImageScale'|translate}}(%)&nbsp;
                 <label class="item-input-wrapper">
                     <input type="tel" placeholder="" ng-model="loginData.montageHistoryQuality">
                 </label>
             </div>
-            <div class="item item-input-inset">
+            <div class="item item-text-wrap item-input-inset">
                 {{'kMaxItemsForTimeline' | translate}}&nbsp;
                 <label class="item-input-wrapper">
                     <input type="tel" placeholder="" ng-model="loginData.graphSize">
@@ -95,7 +98,7 @@
                 </label>
                 <br/>
             </div>
-            <div class="item item-input-inset">
+            <div class="item item-text-wrap item-input-inset">
                 {{'kMinAlarmCount' | translate}}&nbsp;
                 <label class="item-input-wrapper">
                     <input type="tel" placeholder="" ng-model="loginData.minAlarmCount">
@@ -109,27 +112,27 @@
                 </label>
             </div>
             <label>
-                <ion-toggle ng-model="loginData.disableAlarmCheckMontage" ng-checked="loginData.disableAlarmCheckMontage" toggle-class="toggle-calm">{{'kDisableAlarmMontage' | translate}}
-                    <p>{{'kDisableAlarmMontageSub' | translate}}</p>
+                <ion-toggle ng-model="loginData.disableAlarmCheckMontage" ng-checked="loginData.disableAlarmCheckMontage" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kDisableAlarmMontage' | translate}}
+                    <p>{{'kDisableAlarmMontageSub' | translate}}</p></span>
                 </ion-toggle>
             </label>
             <label>
-                <ion-toggle ng-model="loginData.enableLogs" ng-checked="{{loginData.enableLogs}}" toggle-class="toggle-calm">{{'kEnableLogs' | translate}}</ion-toggle>
+                <ion-toggle ng-model="loginData.enableLogs" ng-checked="{{loginData.enableLogs}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableLogs' | translate}}</span></ion-toggle>
             </label>
-            <div class="item item-input-inset">
+            <div class="item item-text-wrap item-input-inset">
                 {{'kCycleMonitorsInterval'|translate}}({{'kSec'|translate}}.)&nbsp;
                 <label class="item-input-wrapper">
                     <input type="tel" placeholder="" ng-model="loginData.cycleMonitorsInterval">
                 </label>
             </div>
             <label>
-                <ion-toggle ng-if="loginData.enableLogs" ng-model="loginData.enableDebug" ng-checked="{{loginData.enableDebug}}" toggle-class="toggle-calm">{{'kEnableDebug' | translate}}</ion-toggle>
+                <ion-toggle ng-if="loginData.enableLogs" ng-model="loginData.enableDebug" ng-checked="{{loginData.enableDebug}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableDebug' | translate}}</span></ion-toggle>
             </label>
             <label>
-                <ion-toggle ng-model="loginData.canSwipeMonitors" ng-checked="{{loginData.canSwipeMonitors}}" toggle-class="toggle-calm">{{'kSwipeToChangeMon' | translate}}</ion-toggle>
+                <ion-toggle ng-model="loginData.canSwipeMonitors" ng-checked="{{loginData.canSwipeMonitors}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kSwipeToChangeMon' | translate}}</span></ion-toggle>
             </label>
             <label>
-                <ion-toggle ng-model="loginData.forceImageModePath" ng-checked="{{loginData.forceImageModePath}}" toggle-class="toggle-calm"> {{'kForceImagePath' | translate}}</ion-toggle>
+                <ion-toggle ng-model="loginData.forceImageModePath" ng-checked="{{loginData.forceImageModePath}}" toggle-class="toggle-calm"> <span class="item-text-wrap">{{'kForceImagePath' | translate}}</span></ion-toggle>
             </label>
             <!--
             <label>
@@ -137,11 +140,11 @@
             </label>
             -->
             <label>
-                <ion-toggle ng-model="loginData.enableBlog" ng-checked="{{loginData.enableBlog}}" toggle-class="toggle-calm"> {{'kEnableNewsUpdates' | translate}}</ion-toggle>
+                <ion-toggle ng-model="loginData.enableBlog" ng-checked="{{loginData.enableBlog}}" toggle-class="toggle-calm"> <span class="item-text-wrap">{{'kEnableNewsUpdates' | translate}}</span></ion-toggle>
             </label>
             <label ng-if="$root.platformOS != 'desktop'">
-                <ion-toggle ng-model="loginData.disableNative" ng-checked="{{loginData.disableNative}}" toggle-class="toggle-calm"> {{'kDisableNative' | translate}}
-                    <p>{{'kDisableNativeSub' | translate}}</p>
+                <ion-toggle ng-model="loginData.disableNative" ng-checked="{{loginData.disableNative}}" toggle-class="toggle-calm"> <span class="item-text-wrap">{{'kDisableNative' | translate}}
+                    <p>{{'kDisableNativeSub' | translate}}</p></span>
                 </ion-toggle>
             </label>
         </div>
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html
index e6ec4614..7612a584 100644
--- a/www/templates/eventserversettings.html
+++ b/www/templates/eventserversettings.html
@@ -37,7 +37,7 @@
             <ion-toggle ng-if="loginData.isUseEventServer && $root.platformOS !='ios'" ng-model="loginData.vibrateOnPush"  ng-checked="loginData.vibrateOnPush" toggle-class="toggle-calm" >{{'kVibrateOnPush'| translate }}</ion-toggle>
         
         
-          <ion-toggle ng-if="loginData.isUseEventServer" ng-model="loginData.soundOnPush"  ng-checked="loginData.soundOnPush" toggle-class="toggle-calm" >{{'kSoundOnPush'| translate }}</ion-toggle>
+          <ion-toggle ng-if="loginData.isUseEventServer" ng-model="loginData.soundOnPush"  ng-checked="loginData.soundOnPush" toggle-class="toggle-calm" class="item-text-wrap" >{{'kSoundOnPush'| translate }}</ion-toggle>
         
         <!--
              <ion-toggle  ng-model="loginData.defaultPushSound" toggle-class="toggle-calm" class="item-text-wrap" ng-checked="{{loginData.defaultPushSound}}">use system sound<p>please save and restart app</p></ion-toggle>
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