diff options
| -rw-r--r-- | www/js/WizardCtrl.js | 21 | ||||
| -rw-r--r-- | www/templates/wizard.html | 6 |
2 files changed, 20 insertions, 7 deletions
diff --git a/www/js/WizardCtrl.js b/www/js/WizardCtrl.js index 2ab49d73..8acedb96 100644 --- a/www/js/WizardCtrl.js +++ b/www/js/WizardCtrl.js @@ -70,6 +70,10 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ } + //-------------------------------------------------------------------------- + // we need a monitor ID to do cgi-bin detection - if you don't have + // monitors configured, cgi-bin won't work + //-------------------------------------------------------------------------- function getFirstMonitor() { @@ -128,7 +132,12 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ return d.promise; -} + } + + //-------------------------------------------------------------------------- + // tries to detect cgi-bin + //-------------------------------------------------------------------------- + function detectcgi() { var d = $q.defer(); @@ -152,7 +161,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ var urls = [a1,a2,a3]; - ZMDataModel.getPathZms() + ZMDataModel.getPathZms() // what does ZM have stored in PATH_ZMS? .then (function(data){ urls.push (baseUri.trim()+data.trim()); ZMDataModel.zmLog ("zmWizard: getPathZMS succeeded, adding "+baseUri+data.trim()+" to things to try"); @@ -163,6 +172,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ continueCgi(urls); }); + // Well, PATH_ZMS or not, lets call this function and brute force it function continueCgi (urls) { $ionicLoading.show({ @@ -304,7 +314,11 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ } - + //-------------------------------------------------------------------------- + // clears all status updates in the verify results page - if you + // get back to it + //-------------------------------------------------------------------------- + $scope.enterResults = function() { $scope.portalValidText = ""; @@ -316,7 +330,6 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ //-------------------------------------------------------------------------- // tries to log into the portal and then discover api and cgi-bin //-------------------------------------------------------------------------- - $scope.exitValidate = function () { $rootScope.authSession = 'undefined'; diff --git a/www/templates/wizard.html b/www/templates/wizard.html index 8793361f..fcab8612 100644 --- a/www/templates/wizard.html +++ b/www/templates/wizard.html @@ -16,7 +16,7 @@ <h4>What is your Zoneminder portal url?</h4> <label class="item item-input"> - <input type="text" placeholder="typically http://server/zm" ng-model="wizard.portalurl"> + <input autocapitalize="none" autocomplete="off" type="text" placeholder="typically http://server/zm" ng-model="wizard.portalurl"> </label> <a class="button icon-left ion-information-circled button-clear button-dark" ng-click="toggleTip()">{{wizard.tiptext}}</a> @@ -44,7 +44,7 @@ <ion-toggle ng-show="wizard.useauth" ng-model="wizard.usezmauth" toggle-class="toggle-calm">I use ZM authentication</ion-toggle> <label class="item item-input item-floating-label" ng-show="wizard.usezmauth"> <span class="input-label">user name</span> - <input type="text" ng-model="wizard.zmuser" placeholder="zm auth username" > + <input autocapitalize="none" autocomplete="off" type="text" ng-model="wizard.zmuser" placeholder="zm auth username" > </label> <label class="item item-input item-floating-label" ng-show="wizard.usezmauth"> <span class="input-label">password</span> @@ -55,7 +55,7 @@ <ion-toggle ng-show="wizard.useauth" ng-model="wizard.usebasicauth" toggle-class="toggle-calm">I use Basic authentication</ion-toggle> <label class="item item-input item-floating-label" ng-show="wizard.usebasicauth"> <span class="input-label">user name</span> - <input type="text" ng-model="wizard.basicuser" placeholder="basic auth username" > + <input autocapitalize="none" autocomplete="off" type="text" ng-model="wizard.basicuser" placeholder="basic auth username" > </label> <label class="item item-input item-floating-label" ng-show="wizard.usebasicauth"> <span class="input-label">password</span> |