You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/04/25 22:24:13 UTC
[1/2] ambari git commit: AMBARI-10740. Comparing config versions
needs multiple fixes
Repository: ambari
Updated Branches:
refs/heads/trunk 36ab07ca6 -> 6f67c4f66
AMBARI-10740. Comparing config versions needs multiple fixes
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6aa96902
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6aa96902
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6aa96902
Branch: refs/heads/trunk
Commit: 6aa96902f841993b818f46aea1b63bb9697c5496
Parents: 36ab07c
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Apr 24 14:45:31 2015 -0700
Committer: Srimanth Gunturi <sg...@HW11574.local>
Committed: Sat Apr 25 10:28:27 2015 -0700
----------------------------------------------------------------------
ambari-web/app/styles/widgets.less | 8 ++++++++
.../common/configs/widgets/combo_config_widget.hbs | 3 ++-
.../widgets/comparison/config_widget_comparison.hbs | 5 +++--
.../app/templates/common/configs/widgets/controls.hbs | 11 +++++++----
.../common/configs/widgets/directory_config_widget.hbs | 3 ++-
.../common/configs/widgets/list_config_widget.hbs | 3 ++-
.../common/configs/widgets/radio_button_config.hbs | 3 ++-
.../common/configs/widgets/slider_config_widget.hbs | 1 +
.../common/configs/widgets/textfield_config_widget.hbs | 3 ++-
.../common/configs/widgets/time_interval_spinner.hbs | 1 +
.../common/configs/widgets/toggle_config_widget.hbs | 1 +
.../common/configs/service_config_layout_tab_view.js | 3 +++
.../common/configs/widgets/combo_config_widget_view.js | 2 +-
.../common/configs/widgets/slider_config_widget_view.js | 2 +-
14 files changed, 36 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/styles/widgets.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less
index a2525b9..af3461b 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -327,6 +327,14 @@
}
+ .disabled {
+ .dropdown {
+ input[type="text"] {
+ background-color: #eee;
+ }
+ }
+ }
+
.action-button {
margin-left: @undo-btn-margin;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
index 2e9315d..ab57419 100644
--- a/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
@@ -16,9 +16,10 @@
* limitations under the License.
}}
{{#if view.isOriginalSCP}}
+ <div class="clearfix"></div>
<p class="widget-config-label">{{view.configLabel}}</p>
{{/if}}
-<div {{bindAttr class=":pull-left view.isOriginalSCP:original-widget"}}>
+<div {{bindAttr class=":pull-left view.isOriginalSCP:original-widget view.disabled:disabled"}}>
<div class="input-append">
<div class="dropdown btn-group">
{{view Em.TextField valueBinding="view.content.value" disabled="disabled"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
index 4ca3e0a..f5e1edb 100644
--- a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
@@ -17,9 +17,10 @@
}}
{{#each compareConfig in view.serviceConfigProperty.compareConfigs}}
- <div {{bindAttr class=":control-group :overrideField"}}>
+ <div class="clearfix"></div>
+ <div {{bindAttr class=":control-group :overrideField :widget-config-comparison"}}>
{{view view.serviceConfigProperty.widget canEditBinding="view.canEdit" configBinding="compareConfig" categoryConfigsAllBinding="view.parentView.categoryConfigsAll" isPopoverEnabled="false"}}
- <div class="clearfix">
+ <div class="widget-config-controls">
<span class="label label-info">{{compareConfig.serviceVersion.versionText}}</span>
{{#if compareConfig.serviceVersion.isCurrent}}
<span class="label label-success">{{t common.current}}</span>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/controls.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs b/ambari-web/app/templates/common/configs/widgets/controls.hbs
index 7da80e3..14d4ecc 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -66,22 +66,25 @@
{{/if}}
{{/if}}
-{{#if view.config.errorMessage}}
- <p class="text-error">{{view.config.errorMessage}}</p>
+{{#unless controller.isCompareMode}}
+ {{#if view.config.errorMessage}}
+ <p class="text-error">{{view.config.errorMessage}}</p>
{{else}}
{{#if view.config.warnMessage}}
<p class="text-warning">{{view.config.warnMessage}}</p>
{{else}}
<p> </p>
{{/if}}
-{{/if}}
+ {{/if}}
+{{/unless}}
{{#if view.isComparison}}
<div class="widget-config-controls">
{{#if controller.selectedConfigGroup.isDefault}}
<span
- class="label label-info">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
+ class="label label-info pull-right">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
{{#if controller.isCurrentSelected}}
+ <div class="clearfix"></div>
<span class="label label-success">{{t common.current}}</span>
{{/if}}
{{else}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs
index 0e4dcab..93cee58 100644
--- a/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs
@@ -18,8 +18,9 @@
<div class="span10">
{{#if view.isOriginalSCP}}
+ <div class="clearfix"></div>
<span class="widget-config-label">{{view.config.displayName}}</span>
{{/if}}
{{view view.configView}}
</div>
-{{template "templates/common/configs/widgets/controls"}}
\ No newline at end of file
+{{template "templates/common/configs/widgets/controls"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
index 43d95d0..4ca12ed 100644
--- a/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
@@ -18,10 +18,11 @@
<div {{bindAttr class="view.config.isHiddenByFilter:hide view.isOriginalSCP:original-widget :widget-config :list-widget"}}>
{{#if view.isOriginalSCP}}
+ <div class="clearfix"></div>
<p class="widget-config-label">{{view.configLabel}}</p>
{{/if}}
<div class="pull-left btn-group">
- <a class="btn dropdown-toggle" data-toggle="dropdown">{{view.displayVal}} <span class="caret"></span></a>
+ <a {{bindAttr class=":btn :dropdown-toggle view.config.isEditable::disabled"}} data-toggle="dropdown">{{view.displayVal}} <span class="caret"></span></a>
<ul class="dropdown-menu">
{{#each option in view.options}}
<li>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs b/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
index b9d18c9..995a31a 100644
--- a/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
@@ -17,6 +17,7 @@
}}
{{#if view.isOriginalSCP}}
+ <div class="clearfix"></div>
<p class="widget-config-label">
{{view.configLabel}}
</p>
@@ -29,4 +30,4 @@
</label>
{{/each}}
</div>
-{{template "templates/common/configs/widgets/controls"}}
\ No newline at end of file
+{{template "templates/common/configs/widgets/controls"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
index 336c308..e49010c 100644
--- a/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
@@ -18,6 +18,7 @@
<div class="widget-config slider-widget">
{{#if view.isOriginalSCP}}
+ <div class="clearfix"></div>
<p class="widget-config-label">{{formatWordBreak view.configLabel}}</p>
{{/if}}
<div {{bindAttr class="view.isOriginalSCP:original-widget :ui-slider-wrapper"}}>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/textfield_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/textfield_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/textfield_config_widget.hbs
index 4d1c251..a1af7b1 100644
--- a/ambari-web/app/templates/common/configs/widgets/textfield_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/textfield_config_widget.hbs
@@ -18,8 +18,9 @@
<div>
{{#if view.isOriginalSCP}}
+ <div class="clearfix"></div>
<p class="widget-config-label">{{view.configLabel}}</p>
{{/if}}
{{view view.configView}}
</div>
-{{template "templates/common/configs/widgets/controls"}}
\ No newline at end of file
+{{template "templates/common/configs/widgets/controls"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/time_interval_spinner.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/time_interval_spinner.hbs b/ambari-web/app/templates/common/configs/widgets/time_interval_spinner.hbs
index 093805f..fdc46f4 100644
--- a/ambari-web/app/templates/common/configs/widgets/time_interval_spinner.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/time_interval_spinner.hbs
@@ -17,6 +17,7 @@
}}
{{#if view.isOriginalSCP}}
+ <div class="clearfix"></div>
<p class="widget-config-label">{{view.configLabel}}</p>
{{/if}}
<div {{bindAttr class=":pull-left view.isOriginalSCP:original-widget"}}>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/templates/common/configs/widgets/toggle_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/toggle_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/toggle_config_widget.hbs
index b26d3e4..70c300f 100644
--- a/ambari-web/app/templates/common/configs/widgets/toggle_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/toggle_config_widget.hbs
@@ -17,6 +17,7 @@
}}
{{#if view.isOriginalSCP}}
+ <div class="clearfix"></div>
<p class="widget-config-label">{{view.configLabel}}</p>
{{/if}}
<div {{bindAttr class=":pull-left view.isOriginalSCP:original-widget"}}>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
index c3c3762..f8b2263 100644
--- a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
+++ b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
@@ -195,6 +195,9 @@ App.ServiceConfigLayoutTabView = Em.View.extend(App.ConfigOverridable, {
didInsertElement: function () {
this._super();
this.prepareConfigProperties();
+ if (this.get('controller.isCompareMode')) {
+ this.filterEnhancedConfigs();
+ }
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
index c6fdbd9..3f2e923 100644
--- a/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
@@ -119,7 +119,7 @@ App.ComboConfigWidgetView = App.ConfigWidgetView.extend({
* Delegate event from text input in combo widget to trigger dropdown
*/
click: function(event) {
- if (event.target.className.contains('ember-text-field')) {
+ if (!this.get('disabled') && event.target.className.contains('ember-text-field')) {
$(event.target).closest('.dropdown').toggleClass('open');
return false;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6aa96902/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index 016e7a6..255f643 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -433,6 +433,6 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
self.changeBoundariesOnce();
}, 10);
}
- }.observes('parentView.content.isActive')
+ }.observes('parentView.content.isActive', 'parentView.parentView.tab.isActive')
});
[2/2] ambari git commit: AMBARI-10749. Re-layout widget content to
save vertical space (ababiichuk via srimanth)
Posted by sr...@apache.org.
AMBARI-10749. Re-layout widget content to save vertical space (ababiichuk via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f67c4f6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f67c4f6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f67c4f6
Branch: refs/heads/trunk
Commit: 6f67c4f664846e6372cccdfbb64c0b66d0b03853
Parents: 6aa9690
Author: Srimanth Gunturi <sg...@HW11574.local>
Authored: Sat Apr 25 13:12:15 2015 -0700
Committer: Srimanth Gunturi <sg...@HW11574.local>
Committed: Sat Apr 25 13:12:15 2015 -0700
----------------------------------------------------------------------
ambari-web/app/styles/widgets.less | 29 +++++-
.../common/configs/widgets/controls.hbs | 99 +++++++++-----------
.../configs/widgets/directory_config_widget.hbs | 13 ++-
.../configs/widgets/config_widget_view.js | 25 +++++
.../widgets/directory_config_widget_view.js | 2 +-
5 files changed, 106 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f67c4f6/ambari-web/app/styles/widgets.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less
index af3461b..9ff5a21 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -42,9 +42,7 @@
@toggle-widget-off-background-color: @green;
.widget-config {
- .widget-config {
- margin-bottom: 0;
- }
+ margin-bottom: 11px;
.widget-config-label {
font-size: 90%;
&.text-success {
@@ -58,20 +56,41 @@
float: right;
display: inline-block;
margin-left: 10px;
- min-height: 60px;
+ min-height: 50px;
+ min-width: 39px;
+ .widget-col {
+ width: 18px;
+ &.left {
+ float: left;
+ }
+ &.right {
+ float: right;
+ }
+ }
.widget-action {
text-decoration: none;
display: block;
}
.widget-action-final {
+ padding-left: 1px;
color: @widget-config-override-action-color;
&.active {
color: @widget-config-override-action-active-color;
}
}
+ .icon-warning-sign {
+ &.warning {
+ color: @health-status-yellow
+ }
+ }
}
}
+.directory-textarea-wrapper {
+ float: left;
+ width: 80%;
+}
+
.list-widget {
li, li:active {
a, a:hover, a:focus, a:active, a:visited {
@@ -187,7 +206,7 @@
.ui-slider-wrapper {
.ui-slider-wrapper-inner {
- width: 75%;
+ width: 68%;
.slider.slider-horizontal {
width: 100%;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f67c4f6/ambari-web/app/templates/common/configs/widgets/controls.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs b/ambari-web/app/templates/common/configs/widgets/controls.hbs
index 14d4ecc..c3b7e88 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -18,41 +18,47 @@
{{#if view.canEdit}}
<div class="widget-config-controls">
- {{#if view.config.supportsFinal}}
- <a href="#" data-toggle="tooltip"
- {{bindAttr class=":widget-action :widget-action-final view.config.isFinal:active view.showFinalConfig:show:hide" disabled="view.config.isNotEditable"}}
- {{action "toggleFinalFlag" view.config target="view"}}
- {{translateAttr data-original-title="services.service.config.final"}}>
- <i class="icon-lock"></i>
- </a>
- {{/if}}
- {{#if view.overrideAllowed}}
- {{#isAccessible ADMIN}}
- <div {{bindAttr class=":widget-action :widget-action-override view.isHover:show:hide"}}>
- <a class="widget-action widget-action-override" href="#" data-toggle="tooltip"
- {{action "createOverrideProperty" view.config target="view.parentView"}}
- {{translateAttr data-original-title="common.override"}}>
- <i class="icon-plus-sign"></i>
+ <div class="widget-col left">
+ {{view view.issueView configBinding="view.config"}}
+ {{#if view.config.isNotDefaultValue}}
+ {{#if view.undoAllowed}}
+ <a class="widget-action widget-action-undo" href="#" {{action "restoreValue" target="view"}}>
+ <i class="icon-undo"></i>
</a>
- </div>
- {{/isAccessible}}
- {{/if}}
- {{#unless view.isOriginalSCP}}
- {{#isAccessible ADMIN}}
- <a {{bindAttr class=":widget-action :widget-action-remove view.isHover:show:hide"}} href="#" data-toggle="tooltip"
- {{action "removeOverride" view.config target="view.parentView"}}
- {{translateAttr data-original-title="common.remove"}}>
- <i class="icon-minus-sign"></i>
- </a>
- {{/isAccessible}}
- {{/unless}}
- {{#if view.config.isNotDefaultValue}}
- {{#if view.undoAllowed}}
- <a class="widget-action widget-action-undo" href="#" {{action "restoreValue" target="view"}}>
- <i class="icon-undo"></i>
+ {{/if}}
+ {{/if}}
+ </div>
+ <div class="widget-col right">
+ {{#if view.config.supportsFinal}}
+ <a href="#" data-toggle="tooltip"
+ {{bindAttr class=":widget-action :widget-action-final view.config.isFinal:active view.showFinalConfig:show:hide" disabled="view.config.isNotEditable"}}
+ {{action "toggleFinalFlag" view.config target="view"}}
+ {{translateAttr data-original-title="services.service.config.final"}}>
+ <i class="icon-lock"></i>
</a>
{{/if}}
- {{/if}}
+ {{#unless view.isOriginalSCP}}
+ {{#isAccessible ADMIN}}
+ <a {{bindAttr class=":widget-action :widget-action-remove view.isHover:show:hide"}} href="#"
+ data-toggle="tooltip"
+ {{action "removeOverride" view.config target="view.parentView"}}
+ {{translateAttr data-original-title="common.remove"}}>
+ <i class="icon-minus-sign"></i>
+ </a>
+ {{/isAccessible}}
+ {{/unless}}
+ {{#if view.overrideAllowed}}
+ {{#isAccessible ADMIN}}
+ <div {{bindAttr class=":widget-action :widget-action-override view.isHover:show:hide"}}>
+ <a class="widget-action widget-action-override" href="#" data-toggle="tooltip"
+ {{action "createOverrideProperty" view.config target="view.parentView"}}
+ {{translateAttr data-original-title="common.override"}}>
+ <i class="icon-plus-sign"></i>
+ </a>
+ </div>
+ {{/isAccessible}}
+ {{/if}}
+ </div>
</div>
<div class="clearfix"></div>
{{/if}}
@@ -66,31 +72,18 @@
{{/if}}
{{/if}}
-{{#unless controller.isCompareMode}}
- {{#if view.config.errorMessage}}
- <p class="text-error">{{view.config.errorMessage}}</p>
- {{else}}
- {{#if view.config.warnMessage}}
- <p class="text-warning">{{view.config.warnMessage}}</p>
- {{else}}
- <p> </p>
- {{/if}}
- {{/if}}
-{{/unless}}
-
{{#if view.isComparison}}
<div class="widget-config-controls">
- {{#if controller.selectedConfigGroup.isDefault}}
- <span
+ {{#if controller.selectedConfigGroup.isDefault}}
+ <span
class="label label-info pull-right">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
- {{#if controller.isCurrentSelected}}
- <div class="clearfix"></div>
- <span class="label label-success">{{t common.current}}</span>
+ {{#if controller.isCurrentSelected}}
+ <span class="label label-success">{{t common.current}}</span>
+ {{/if}}
+ {{else}}
+ <span class="label label-info">{{t common.default}}
+ {{t services.service.config.configHistory.configGroup}}</span>
{{/if}}
- {{else}}
- <span class="label label-info">{{t common.default}}
- {{t services.service.config.configHistory.configGroup}}</span>
- {{/if}}
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f67c4f6/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs
index 93cee58..346330a 100644
--- a/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/directory_config_widget.hbs
@@ -21,6 +21,13 @@
<div class="clearfix"></div>
<span class="widget-config-label">{{view.config.displayName}}</span>
{{/if}}
- {{view view.configView}}
-</div>
-{{template "templates/common/configs/widgets/controls"}}
+ {{#if view.isOriginalSCP}}
+ <span class="widget-config-label">{{view.config.displayName}}</span>
+ {{/if}}
+ <div class="directory-textarea-wrapper">
+ {{view view.configView}}
+ </div>
+ <div class="right">
+ {{template "templates/common/configs/widgets/controls"}}
+ </div>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f67c4f6/ambari-web/app/views/common/configs/widgets/config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index 5a2566f..1251837 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -87,6 +87,31 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
*/
isComparisonBinding: 'config.isComparison',
+ issueView: Em.View.extend({
+
+ tagName: 'i',
+
+ classNames: ['icon-warning-sign'],
+
+ classNameBindings: ['issueIconClass'],
+
+ attributeBindings:['issueMessage:data-original-title'],
+
+ config: null,
+
+ didInsertElement: function() {
+ App.tooltip($(this.get('element')));
+ },
+
+ issueIconClass: function() {
+ return this.get('config.errorMessage') ? '': this.get('config.warnMessage') ? 'warning' : 'not-show';
+ }.property('config.warnMessage', 'config.errorMessage'),
+
+ issueMessage: function() {
+ return this.get('config.errorMessage') || this.get('config.warnMessage');
+ }.property('config.warnMessage', 'config.errorMessage')
+ }),
+
/**
* Config name to display.
* @type {String}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f67c4f6/ambari-web/app/views/common/configs/widgets/directory_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/directory_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/directory_config_widget_view.js
index 8d562f5..8a39d51 100644
--- a/ambari-web/app/views/common/configs/widgets/directory_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/directory_config_widget_view.js
@@ -21,7 +21,7 @@ require('views/common/controls_view');
var App = require('app');
App.DirectoryConfigWidgetView = App.ConfigWidgetView.extend({
- templateName: require('templates/common/configs/widgets/textfield_config_widget'),
+ templateName: require('templates/common/configs/widgets/directory_config_widget'),
classNames: ['widget-config', 'directory-widget'],
/**