Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A77ACC61E for ; Thu, 18 Jul 2013 17:06:51 +0000 (UTC) Received: (qmail 30217 invoked by uid 500); 18 Jul 2013 17:06:51 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 30195 invoked by uid 500); 18 Jul 2013 17:06:51 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 30187 invoked by uid 99); 18 Jul 2013 17:06:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jul 2013 17:06:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 336D48AD8C7; Thu, 18 Jul 2013 17:06:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yusaku@apache.org To: ambari-commits@incubator.apache.org Message-Id: <7f8bac5d1c634adbbb307aa19ff11a51@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-2682. Security wizard - configure services: "Undo" appears over the realm name when editing properties. (Andrii Babiichuk via yusaku) Date: Thu, 18 Jul 2013 17:06:51 +0000 (UTC) Updated Branches: refs/heads/branch-1.2.5 62317e95b -> cf22ef83e AMBARI-2682. Security wizard - configure services: "Undo" appears over the realm name when editing properties. (Andrii Babiichuk via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/cf22ef83 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/cf22ef83 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/cf22ef83 Branch: refs/heads/branch-1.2.5 Commit: cf22ef83eb02353abfc6626ff0ecff269dbd55cd Parents: 62317e9 Author: Yusaku Sako Authored: Thu Jul 18 10:06:00 2013 -0700 Committer: Yusaku Sako Committed: Thu Jul 18 10:06:39 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 9 +++++++++ ambari-web/app/views/wizard/controls_view.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/cf22ef83/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 9b6f0bc..fdb3aba 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -661,6 +661,15 @@ h1 { padding-left: 8px; padding-right: 8px; } + .with-unit{ + input{ + width:auto; + } + .add-on{ + overflow: hidden; + max-width:250px; + } + } } .running-host-components-table{ http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/cf22ef83/ambari-web/app/views/wizard/controls_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js index b00859b..052b934 100644 --- a/ambari-web/app/views/wizard/controls_view.js +++ b/ambari-web/app/views/wizard/controls_view.js @@ -90,7 +90,7 @@ App.ServiceConfigTextField = Ember.TextField.extend(App.ServiceConfigPopoverSupp */ App.ServiceConfigTextFieldWithUnit = Ember.View.extend(App.ServiceConfigPopoverSupport, { valueBinding: 'serviceConfig.value', - classNames: [ 'input-append' ], + classNames: ['input-append','with-unit'], placeholderBinding: 'serviceConfig.defaultValue', template: Ember.Handlebars.compile('{{view App.ServiceConfigTextField serviceConfigBinding="view.serviceConfig" isPopoverEnabled="false"}}{{view.serviceConfig.unit}}'),