Repository: ambari Updated Branches: refs/heads/trunk c7df7bd0b -> e5fb8d72c
AMBARI-10689 Create widget wizard-> Add metric popup: UI changes. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5fb8d72 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5fb8d72 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5fb8d72 Branch: refs/heads/trunk Commit: e5fb8d72c0b7a3aae5e36ebdb17a94bfb8587425 Parents: c7df7bd Author: Andrii Tkach <atk...@hortonworks.com> Authored: Thu Apr 23 14:40:49 2015 +0300 Committer: Andrii Tkach <atk...@hortonworks.com> Committed: Thu Apr 23 16:58:55 2015 +0300 ---------------------------------------------------------------------- .../templates/main/service/widgets/create/step2_add_metric.hbs | 5 ----- .../app/views/main/service/widgets/create/expression_view.js | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e5fb8d72/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs b/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs index be62e8b..503e45e 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs @@ -42,11 +42,6 @@ </div> </li> {{/each}} - <li><a class="link" href="#" {{action showMore target="view"}}>{{t hostPopup.serviceInfo.showMore}}</a></li> - <li class="row-fluid"> - <button class="btn span4 offset1">{{t common.cancel}}</button> - <button class="btn btn-primary span4 apply-button">{{t common.apply}}</button> - </li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/e5fb8d72/ambari-web/app/views/main/service/widgets/create/expression_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/widgets/create/expression_view.js b/ambari-web/app/views/main/service/widgets/create/expression_view.js index 56ea96f..1899daa 100644 --- a/ambari-web/app/views/main/service/widgets/create/expression_view.js +++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js @@ -209,6 +209,7 @@ App.WidgetWizardExpressionView = Em.View.extend({ selectComponents: function (event) { var component = this.get('componentMap').findProperty('serviceName', event.context.get('serviceName')) .get('components').findProperty('id', event.context.get('id')); + $('#add-metric-popup .component-select').removeClass('open'); this.set('selectedComponent', component); this.set('parentView.selectedMetric', null);