diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-07-04 16:56:53 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-07-04 16:56:53 -0400 |
| commit | c2ac88f9a4a1c945988acd89c45e394bde08529a (patch) | |
| tree | ee50facac3d6e3bf744e1c61844c82bd7ce3c0ae | |
| parent | 223fb28e4001689b6bbd049d75f807a250a2c392 (diff) | |
improved input experience - urls copy from base url
| -rw-r--r-- | www/js/LoginCtrl.js | 19 | ||||
| -rw-r--r-- | www/templates/login.html | 8 |
2 files changed, 23 insertions, 4 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index c4192927..86da2e06 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -23,6 +23,25 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r ZMDataModel.setAwake(false); }); + + //------------------------------------------------------------------------------- + // Makes input easier + //------------------------------------------------------------------------------- + + $scope.portalKeypress = function(evt) + { + + // if ($scope.loginData.streamingurl.indexOf($scope.loginData.url) !=0) + $scope.loginData.streamingurl = $scope.loginData.url; + + if ($scope.loginData.streamingurl.slice(-3).toLowerCase() == '/zm') { + $scope.loginData.streamingurl = $scope.loginData.streamingurl.slice(0, -3); + } + + + // if ($scope.loginData.apiurl.indexOf($scope.loginData.url) !=0) + $scope.loginData.apiurl = $scope.loginData.url+"/api"; + }; //------------------------------------------------------------------------------- // Adds http to url if not present // http://stackoverflow.com/questions/11300906/check-if-a-string-starts-with-http-using-javascript diff --git a/www/templates/login.html b/www/templates/login.html index a9fc6ac9..7f89da7a 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -10,7 +10,7 @@ <span style="color:rgb(100,100,100)"> <i class="ion-android-home" style="font-size:150%"></i> ZoneMinder Settings</span> <label class="item item-input item-floating-label"> <span class="input-label">username</span> - <input autocapitalize="none" type="text" placeholder="username" ng-model="loginData.username"> + <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">password</span> @@ -18,17 +18,17 @@ </label> <label class="item item-input item-floating-label"> <span class="input-label">ZM portal url</span> - <input autocapitalize="none" type="text" placeholder="ZM portal url " ng-model="loginData.url"> + <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM portal url " ng-model="loginData.url" ng-keyup="portalKeypress($event)"> </label> <label class="item item-input item-floating-label"> <span class="input-label">base path to cgi-bin</span> - <input autocapitalize="none" type="text" placeholder="base path to cgi-bin" ng-model="loginData.streamingurl"> + <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="base path to cgi-bin" ng-model="loginData.streamingurl"> </label> <label class="item item-input item-floating-label"> <span class="input-label">ZM api url</span> - <input autocapitalize="none" type="text" placeholder="ZM api url" ng-model="loginData.apiurl"> + <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM api url" ng-model="loginData.apiurl"> </label> <label > |