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 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

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

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>
-- 
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/devoptions.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 0ce3d11c..1f70d412 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -21,7 +21,8 @@
                 <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"><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>
+                <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>
@@ -41,9 +42,6 @@
                             toggle-class="toggle-calm">use ZMS for events footage</ion-toggle>
             </label>
             -->
-
-            
-
             <div class="item item-text-wrap item-input-inset">
                 {{'kMaxMonitorsMontage' | translate }}&nbsp;
                 <label class="item-input-wrapper">
-- 
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/devoptions.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 1f70d412..2c373418 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -4,7 +4,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="saveDevOptions()">Save</button>
+        <button class="button button-clear" ng-click="saveDevOptions()">{{'kSave' | translate}}</button>
     </ion-nav-buttons>
     <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
         <div class="list list-inset">
-- 
cgit v1.2.3