You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by is...@apache.org on 2018/05/07 16:10:43 UTC
[ambari] branch trunk updated: [AMBARI-23771] Customize Services -
Alignment between Final/Set Recommended buttons and text boxes not proper
in new tabs
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1dea194 [AMBARI-23771] Customize Services - Alignment between Final/Set Recommended buttons and text boxes not proper in new tabs
1dea194 is described below
commit 1dea1945b910230c462a04ef9c8eeb166b5ad588
Author: Ishan Bhatt <is...@gmail.com>
AuthorDate: Fri May 4 18:59:21 2018 -0700
[AMBARI-23771] Customize Services - Alignment between Final/Set Recommended buttons and text boxes not proper in new tabs
---
ambari-web/app/styles/service_configurations.less | 7 ++++
ambari-web/app/styles/wizard.less | 16 ++++++++
.../app/templates/common/configs/controls.hbs | 4 +-
.../templates/common/configs/widgets/controls.hbs | 2 +-
.../configs/widgets/controls/create_override.hbs | 2 +-
.../common/configs/widgets/controls/edit.hbs | 2 +-
.../configs/widgets/controls/remove_override.hbs | 2 +-
.../configs/widgets/controls/set_recommended.hbs | 2 +-
.../common/configs/widgets/config_widget_view.js | 4 +-
.../configs/widgets/config_widget_view_test.js | 44 +++-------------------
10 files changed, 38 insertions(+), 47 deletions(-)
diff --git a/ambari-web/app/styles/service_configurations.less b/ambari-web/app/styles/service_configurations.less
index 6f36bf8..8a575c6 100644
--- a/ambari-web/app/styles/service_configurations.less
+++ b/ambari-web/app/styles/service_configurations.less
@@ -164,6 +164,13 @@
line-height: 20px;
}
+ .common-config-category {
+ .icon-repeat {
+ color: #cbcbcb;
+ padding: 5px 10px;
+ text-decoration: none;
+ }
+ }
.enhanced-config-tab-content {
.action {
display: inline-block;
diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less
index 74e596a..52695f5 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -952,7 +952,14 @@
.config-actions {
margin-right: 10px;
}
+ .widget-config-raw {
+ display: inline;
+ }
+ .widget-action {
+ display: inline !important;
+ }
.widget-config-controls {
+ float: none;
a, .show {
display: inline !important;
}
@@ -962,6 +969,15 @@
}
}
+#databases {
+ .widget-action {
+ display: inline !important;
+ }
+ .widget-config-controls {
+ float: none;
+ }
+}
+
#databases, #all-configurations {
.config-section {
border: none;
diff --git a/ambari-web/app/templates/common/configs/controls.hbs b/ambari-web/app/templates/common/configs/controls.hbs
index 84e50ad..e17ff2d 100644
--- a/ambari-web/app/templates/common/configs/controls.hbs
+++ b/ambari-web/app/templates/common/configs/controls.hbs
@@ -49,10 +49,10 @@
</a>
{{/if}}
{{#if view.showSetRecommended}}
- <a href="#" data-toggle="tooltip" class="btn-sm"
+ <a href="#" data-toggle="tooltip"
{{action "setRecommendedValue" view.serviceConfigProperty target="view.parentView"}}
{{translateAttr data-original-title="services.service.config.setRecommendedValue"}}>
- <i class="glyphicon glyphicon-repeat"></i>
+ <i class="icon-repeat"></i>
</a>
{{/if}}
{{/if}}
diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs b/ambari-web/app/templates/common/configs/widgets/controls.hbs
index c8adee5..478079e 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -21,7 +21,7 @@
</div>
{{#if view.supportSwitchToTextBox}}
{{#unless view.isPropertyUndefined}}
- <div {{bindAttr class="view.config.showAsTextBox::hide :left :widget-config-raw"}}>
+ <div {{bindAttr class="view.config.showAsTextBox::hide :widget-config-raw"}}>
{{view App.PlainConfigTextField
isVisibleBinding="view.config.showAsTextBox"
sectionBinding="view.section"
diff --git a/ambari-web/app/templates/common/configs/widgets/controls/create_override.hbs b/ambari-web/app/templates/common/configs/widgets/controls/create_override.hbs
index 71dde7d..d37ad08 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls/create_override.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls/create_override.hbs
@@ -18,7 +18,7 @@
{{#if view.overrideAllowed}}
{{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}
- <div {{bindAttr class=":widget-action :widget-action-override view.isHover:show:hide"}}>
+ <div {{bindAttr class=":widget-action :widget-action-override"}}>
<a class="widget-action widget-action-override" href="#" data-toggle="tooltip"
{{action "createOverrideProperty" view.config target="view.parentView"}}
{{translateAttr data-original-title="common.override"}}>
diff --git a/ambari-web/app/templates/common/configs/widgets/controls/edit.hbs b/ambari-web/app/templates/common/configs/widgets/controls/edit.hbs
index ac3cef9..3b02de1 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls/edit.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls/edit.hbs
@@ -20,7 +20,7 @@
{{#if view.isWidgetViewAllowed}}
<a href="#"
data-toggle="tooltip" {{translateAttr data-original-title="common.edit"}}
- {{bindAttr class=":glyphicon :glyphicon-pencil :widget-action :widget-action-switch-view view.isHover::hide view.config.showAsTextBox::active"}}
+ {{bindAttr class=":glyphicon :glyphicon-pencil :widget-action :widget-action-switch-view view.config.showAsTextBox::active"}}
{{action "toggleWidgetView" target="view"}}>
</a>
{{else}}
diff --git a/ambari-web/app/templates/common/configs/widgets/controls/remove_override.hbs b/ambari-web/app/templates/common/configs/widgets/controls/remove_override.hbs
index 53b7fc2..c1c5c78 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls/remove_override.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls/remove_override.hbs
@@ -19,7 +19,7 @@
{{#unless view.isOriginalSCP}}
{{#unless view.disabled}}
{{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}
- <a {{bindAttr class=":widget-action :widget-action-remove view.isHover:show:hide"}} href="#" data-toggle="tooltip"
+ <a {{bindAttr class=":widget-action :widget-action-remove"}} href="#" data-toggle="tooltip"
{{action "removeOverride" view.config target="view.parentView"}}
{{translateAttr data-original-title="common.remove"}}>
<i class="glyphicon glyphicon-minus-sign"></i>
diff --git a/ambari-web/app/templates/common/configs/widgets/controls/set_recommended.hbs b/ambari-web/app/templates/common/configs/widgets/controls/set_recommended.hbs
index 5a4c22c..42011b4 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls/set_recommended.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls/set_recommended.hbs
@@ -19,7 +19,7 @@
{{#if view.config.recommendedValueExists}}
{{#unless view.disabled}}
<a href="#"
- {{bindAttr class=":icon-repeat :widget-action-set-recommended view.isHover::hide :widget-action"}}
+ {{bindAttr class=":icon-repeat :widget-action-set-recommended :widget-action"}}
{{action "setRecommendedValue" target="view"}} data-toggle="tooltip" {{translateAttr data-original-title="services.service.config.setRecommendedValue"}}>
</a>
{{/unless}}
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 7a33b9a..f9b39f1 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
@@ -325,8 +325,8 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
*/
showFinalConfig: function () {
var config = this.get('config');
- return config.get('isFinal') || !config.get('isNotEditable') && this.get('isHover');
- }.property('config.isFinal', 'config.isNotEditable', 'isHover'),
+ return config.get('isFinal') || !config.get('isNotEditable');
+ }.property('config.isFinal', 'config.isNotEditable'),
/**
*
diff --git a/ambari-web/test/views/common/configs/widgets/config_widget_view_test.js b/ambari-web/test/views/common/configs/widgets/config_widget_view_test.js
index 2a173f2..b85a955 100644
--- a/ambari-web/test/views/common/configs/widgets/config_widget_view_test.js
+++ b/ambari-web/test/views/common/configs/widgets/config_widget_view_test.js
@@ -327,63 +327,31 @@ describe('App.ConfigWidgetView', function () {
{
config: {
isFinal: true,
- isNotEditable: true,
- isHover: true
+ isNotEditable: true
},
e: true
},
{
config: {
isFinal: true,
- isNotEditable: false,
- isHover: true
- },
- e: true
- },{
- config: {
- isFinal: true,
- isNotEditable: true,
- isHover: false
- },
- e: true
- },{
- config: {
- isFinal: true,
- isNotEditable: false,
- isHover: false
+ isNotEditable: false
},
e: true
},
{
config: {
isFinal: false,
- isNotEditable: true,
- isHover: true
+ isNotEditable: true
},
e: false
},
{
config: {
isFinal: false,
- isNotEditable: false,
- isHover: true
+ isNotEditable: false
},
- e: false
- },{
- config: {
- isFinal: false,
- isNotEditable: true,
- isHover: false
- },
- e: false
- },{
- config: {
- isFinal: false,
- isNotEditable: false,
- isHover: false
- },
- e: false
- }
+ e: true
+ }
].forEach(function (test) {
it(JSON.stringify(test.config), function () {
--
To stop receiving notification emails like this one, please contact
ishanbha@apache.org.