diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-04-22 10:50:52 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-04-22 10:50:52 -0400 |
| commit | bbd8d4b8fc3da1182ec3c6077775a6bf857950bc (patch) | |
| tree | 9a96fa068f4d7c9d648ba5898f8bc7bb00c8b109 | |
| parent | 2d414799fd949b37f35e21b52256fc79e12cea43 (diff) | |
#228 - more tweaks
Former-commit-id: 4df202510c0d6a37e4a51791ab7b8c6216dc2242
| -rw-r--r-- | www/js/LoginCtrl.js | 6 | ||||
| -rw-r--r-- | www/templates/events.html | 1 | ||||
| -rw-r--r-- | www/templates/login.html | 20 |
3 files changed, 18 insertions, 9 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index f89ed726..82742497 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -322,7 +322,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r title: 'cgi-bin settings', cssClass: 'popup90', template: text, - buttons: [{text: 'Ok'},{text:'Use suggestion', onTap:function(e) {$scope.loginData.streamingurl=dtext;}}, /*{text:'try harder', onTap:function(e) {tryHarder();}}*/] + buttons: [{text: 'Ok', type:'button-positive'},{text:'Use suggestion',type:'button-balanced', onTap:function(e) {$scope.loginData.streamingurl=dtext;}}, /*{text:'try harder', onTap:function(e) {tryHarder();}}*/] }); } @@ -648,7 +648,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $http.get(ld.streamingurl + "/zms") .success(function (data) { ZMDataModel.zmDebug("Urk! cgi-path returned success, but it should not have come here"); - loginStatus = "Login validated, but could not validate cgi-path. If live streams don't work please check your cgi-bin path"; + loginStatus = "Login validated, but could not validate cgi-path. If live streams don't work please check your cgi-bin path or try using the discover feature"; var refresh = ZMDataModel.getMonitors(1); @@ -670,7 +670,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r // if its 4xx then the cgi-bin path is not valid if (status < 500) { - loginStatus = "The cgi-bin path you entered may be wrong. I can't make sure, but if your live views don't work, please review your cgi path."; + loginStatus = "The cgi-bin path you entered may be wrong. I can't make sure, but if your live views don't work, please review your cgi path or try using the discover feature."; } if (showalert) diff --git a/www/templates/events.html b/www/templates/events.html index f2369121..9529db8d 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -30,6 +30,7 @@ </ion-header-bar> </div> + <ion-content ng-cloak on-tap="tapped();" delegate-handle="mainScroll" has-subheader="true" overflow-scroll="false"> diff --git a/www/templates/login.html b/www/templates/login.html index b9954ba6..f71e9161 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -56,19 +56,27 @@ placeholder="ZM portal url " 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:30px;border-radius: 0px 0px 5px 5px;" on-tap="detectCgi();"> <i class="ion-wand"></i> help</span> + <!--<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();"> <i class="ion-wand"></i>discover</span>--> <span class="input-label">path to cgi-bin</span> - <input autocapitalize="none" autocomplete="off" - autocorrect="off" type="text" - placeholder="eg. server.com/zm/cgi-bin" - ng-model="loginData.streamingurl"> - + + <input autocapitalize="none" autocomplete="off" + autocorrect="off" type="text" + placeholder="eg. server.com/zm/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" |