Updated Branches: refs/heads/trunk d5810bd61 -> 0ef3c9363
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/0ef3c936 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/0ef3c936 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/0ef3c936 Branch: refs/heads/trunk Commit: 0ef3c9363ed494df35607f1f018f5964fd789487 Parents: d5810bd Author: Yusaku Sako <[email protected]> Authored: Thu Jul 18 10:06:00 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Thu Jul 18 10:06:04 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/0ef3c936/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/0ef3c936/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"}}<span class="add-on">{{view.serviceConfig.unit}}</span>'),
