Merge remote-tracking branch 'refs/remotes/origin/master' into 440-Hard-coded-text-found-

# Conflicts:
#	www/templates/timeline.html

3 files changed, 11 insertions, 5 deletions

diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
index 41d5a6f6..ca495a5a 100644
--- a/www/lang/locale-en.json
+++ b/www/lang/locale-en.json
@@ -10,6 +10,7 @@
     "kAll"                       :"All",
     "kAnalyze"                   :"Analyze",
     "kApiUrl"                    :"ZM api url",
+    "kApiUrlExample"             :"e.g. server/zm/api",
     "kApplyingChanges"           :"Applying changes. Please wait",
     "kArrangingImages"           :"arranging images",
     "kAt"                        :"at",
@@ -241,6 +242,7 @@
     "kPTZnotConfigured"          :"PTZ not configured for this monitor",
     "kPassword"                  :"password",
     "kPathToCgi"                 :"path to cgi-bin",
+    "kPathToCgiExample"          :"e.g. server/zm/cgi-bin",	
     "kPause"                     :"pause",
     "kPaused"                    :"paused",
     "kPersistHidden"             :"Persist hidden monitors",
@@ -268,6 +270,7 @@
     "kPortalNoticeSub"           :"(Swipe right to access the menu)",
     "kPortalPleaseSelect"        :"Please select",
     "kPortalUrl"                 :"ZM portal url",
+    "kPortalUrlExample"          :"e.g. server/zm",
     "kPresets"                   :"presets",
     "kPrev"                      :"Prev",
     "kPrevEvent"                 :"prev. event",
diff --git a/www/lang/locale-nl.json b/www/lang/locale-nl.json
index 529db990..94b3e32b 100755
--- a/www/lang/locale-nl.json
+++ b/www/lang/locale-nl.json
@@ -10,6 +10,7 @@
     "kAll"                       :"Alles",
     "kAnalyze"                   :"Analyseer",
     "kApiUrl"                    :"ZM api url",
+    "kApiUrlExample"             :"bijv. server/zm/api",	
     "kApplyingChanges"           :"Veranderingen toepassen. Even geduld",
     "kArrangingImages"           :"afbeeldingen rangschikken",
     "kAt"                        :"op",
@@ -241,6 +242,7 @@
     "kPTZnotConfigured"          :"PTZ niet geconfigureerd voor deze monitori",
     "kPassword"                  :"Wachtwoord",
     "kPathToCgi"                 :"map naar cgi-bin",
+    "kPathToCgiExample"          :"bijv. server/zm/cgi-bin",	
     "kPause"                     :"pauze",
     "kPaused"                    :"onderbroken",
     "kPersistHidden"             :"Aanhoudend verborgen monitoren",
@@ -268,6 +270,7 @@
     "kPortalNoticeSub"           :"(Swipe rechts voor menu toegang)",
     "kPortalPleaseSelect"        :"Maak selectie",
     "kPortalUrl"                 :"ZM portaal url",
+    "kPortalUrlExample"          :"bijv. server/zm",
     "kPresets"                   :"voorinstellingen",
     "kPrev"                      :"Vorige",
     "kPrevEvent"                 :"vorige gebeurtenis",
diff --git a/www/templates/login.html b/www/templates/login.html
index f351016a..55c7befa 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -33,28 +33,28 @@
                 <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">
+                        <input  autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kUsername' | translate}}" 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">
+                        <input type="password" placeholder="{{'kPassword' | translate}}" ng-model="loginData.password">
                     </label>
                 </div>
             </div>
             <label class="item item-input item-floating-label">
                 <span class="input-label">{{'kPortalUrl' | translate}}</span>
-                <input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM portal url " ng-model="loginData.url" ng-keyup="portalKeypress($event)">
+                <input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kPortalUrlExample' | translate}}" 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 hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="eg. server.com/zm/cgi-bin" ng-model="loginData.streamingurl">
+                <input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kPathToCgiExample' | translate}}" ng-model="loginData.streamingurl">
             </label>
             <label class="item item-input item-floating-label">
                 <span class="input-label">{{'kApiUrl' | translate}}</span>
-                <input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM api url" ng-model="loginData.apiurl">
+                <input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kApiUrlExample' | translate}}" ng-model="loginData.apiurl">
             </label>
             <a class="item item-icon-right" href="" ng-click="selectFallback()">
                 <i class="icon ion-ios-arrow-right">