diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-08 09:23:26 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-08 09:23:26 -0400 |
| commit | c667a1dd0f0f881e6a4c022e31ee75cbe12ef876 (patch) | |
| tree | 46945f0a7e6a5cf0eaa5fbcf644601e08411b2e5 | |
| parent | 18e41df85b9b4c6d3ac88e66e57e235e7a322e83 (diff) | |
warn user for basic auth
| -rw-r--r-- | www/js/LoginCtrl.js | 5 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 1 | ||||
| -rw-r--r-- | www/templates/login.html | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 74efc2cd..1a728de4 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -245,6 +245,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r oldLoginData = ''; //console.log("**VIEW ** LoginCtrl Entered"); NVRDataModel.setAwake(false); + $scope.basicAuthUsed = false; var ld = NVRDataModel.getLogin(); oldName = ld.serverName; @@ -425,6 +426,10 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData.streamingurl = $scope.loginData.url + "/cgi-bin"; } + $scope.basicAuthUsed = ($scope.loginData.url.indexOf('@') == -1) ? false:true; + + + }; //------------------------------------------------------------------------------- // Adds http to url if not present diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 8015468d..ea6c82e7 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -401,6 +401,7 @@ "kVideoLoading" :"Loading Video", "kVideoMp4Warning" :"It is currently not possible to know when video is fully downloaded. Please track file size of download.", "kWake" :"Wake", + "kWarningBasicAuth" :"Basic auth may interfere with live streaming. Please read FAQ", "kWarningLargeTimeline" :"A large value can affect timeline performance. If you find timeline performance slow, try reducing the value to 200 and work your way up from there.", "kWeek" :"Week", "kWelcomeWizard" :"Welcome to zmWizard", diff --git a/www/templates/login.html b/www/templates/login.html index 36f216b4..472075cf 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -42,6 +42,9 @@ </label> </div> </div> + + <p ng-if="basicAuthUsed" style="font-size:0.8em; color:#e84118">{{'kWarningBasicAuth' | translate}}</p> + <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="{{'kPortalUrlExample' | translate}}" ng-model="loginData.url" ng-keyup="portalKeypress($event)"> |