Repository: ambari Updated Branches: refs/heads/trunk a281dfc09 -> afea5a578
AMBARI-15206. Issues with Login Message dialog Round #3 (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/afea5a57 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/afea5a57 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/afea5a57 Branch: refs/heads/trunk Commit: afea5a578a1fd8a2efa1d41e677ebde9e211cc7d Parents: a281dfc Author: Alex Antonenko <[email protected]> Authored: Fri Feb 26 19:23:42 2016 +0200 Committer: Alex Antonenko <[email protected]> Committed: Sat Feb 27 07:52:09 2016 +0200 ---------------------------------------------------------------------- .../app/views/loginActivities/loginMessage.html | 15 ++++++++------- ambari-web/app/router.js | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/afea5a57/ambari-admin/src/main/resources/ui/admin-web/app/views/loginActivities/loginMessage.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/loginActivities/loginMessage.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/loginActivities/loginMessage.html index 1374f00..9dbc23f 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/loginActivities/loginMessage.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/loginActivities/loginMessage.html @@ -32,13 +32,14 @@ <label class="col-sm-2 control-label">{{'common.loginActivities.message' | translate}}</label> <div class="col-sm-10"> <textarea type="text" - class="form-control" - name="login_text" - placeholder="{{'common.loginActivities.loginMessage.placeholder' | translate}}" - ng-model="text" - ng-change="inputChangeEvent()" - ng-disabled="!status" - autocomplete="off"> + rows="4" + class="form-control" + name="login_text" + placeholder="{{'common.loginActivities.loginMessage.placeholder' | translate}}" + ng-model="text" + ng-change="inputChangeEvent()" + ng-disabled="!status" + autocomplete="off"> </textarea> <div class="alert alert-danger top-margin" ng-show="form.login_text.$error.pattern && form.submitted"> {{'common.loginActivities.onlySimpleChars' | translate}} http://git-wip-us.apache.org/repos/asf/ambari/blob/afea5a57/ambari-web/app/router.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js index d486d8b..f121fe5 100644 --- a/ambari-web/app/router.js +++ b/ambari-web/app/router.js @@ -393,11 +393,11 @@ App.Router = Em.Router.extend({ onClose: function () { self.setClusterData(data, opt, params); this.hide(); - }, - didInsertElement: function () { - this.fitHeight(); } }); + }else{ + this.setClusterData(data, opt, params); + return false; } },
