You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2013/12/13 18:58:49 UTC
git commit: AMBARI-4067 UI improvements for Config groups..
(ababiichuk)
Updated Branches:
refs/heads/trunk 9b32b676e -> 2eeac2986
AMBARI-4067 UI improvements for Config groups.. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2eeac298
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2eeac298
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2eeac298
Branch: refs/heads/trunk
Commit: 2eeac2986b66c6a05e389fe37c53dd799b36a071
Parents: 9b32b67
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Dec 13 19:55:39 2013 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Dec 13 19:58:39 2013 +0200
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 6 +++---
.../app/templates/common/configs/selectCreateConfigGroup.hbs | 2 +-
ambari-web/app/utils/config.js | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2eeac298/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 582b4b4..5cfab3d 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -4956,9 +4956,9 @@ i.icon-asterisks {
.select-create-config-group-div {
margin-left: 20px;
margin-bottom: 20px;
- .message{
- color: #777;
- }
+ }
+ .message{
+ color: #777;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2eeac298/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs b/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs
index 15a50b0..9c192a9 100644
--- a/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs
+++ b/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs
@@ -28,7 +28,7 @@
</div>
<label class="radio">
{{view view.selectConfigGroupRadioButton}}
- {{t config.group.selection.dialog.option.select serviceNameBinding="selectedService.displayName"}}
+ <span {{bindAttr class="view.parentView.hasExistedGroups::message"}}>{{t config.group.selection.dialog.option.select serviceNameBinding="selectedService.displayName"}}</span>
</label>
{{#if view.parentView.availableConfigGroups.length}}
<div class="select-create-config-group-div">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2eeac298/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index c2575bf..88ccc03 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1060,6 +1060,9 @@ App.config = Em.Object.create({
optionCreateConfigGroup: function(){
return !this.get('optionSelectConfigGroup');
}.property('optionSelectConfigGroup'),
+ hasExistedGroups: function() {
+ return !!this.get('availableConfigGroups').length;
+ }.property('availableConfigGroups'),
availableConfigGroups: availableConfigGroups,
selectedConfigGroup: selectedConfigGroup,
newConfigGroupName: '',
@@ -1125,7 +1128,7 @@ App.config = Em.Object.create({
this.set('parentView.parentView.optionSelectConfigGroup', true);
},
didInsertElement: function () {
- if (!this.get('parentView.parentView.availableConfigGroups').length) {
+ if (!this.get('parentView.parentView.hasExistedGroups')) {
this.set('disabled', true);
this.set('parentView.parentView.optionSelectConfigGroup', false);
}