You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2013/11/28 16:34:29 UTC
git commit: AMBARI-3913. Description should be shown properly in
Manage Config Groups dialog (Denys Buzhor via alexantonenko)
Updated Branches:
refs/heads/trunk e8594a9cb -> 0afd327c9
AMBARI-3913. Description should be shown properly in Manage Config Groups dialog (Denys Buzhor via alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0afd327c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0afd327c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0afd327c
Branch: refs/heads/trunk
Commit: 0afd327c94eba72f790946951fa0003aa1e41cd8
Parents: e8594a9
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Nov 28 17:34:28 2013 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Nov 28 17:34:28 2013 +0200
----------------------------------------------------------------------
.../service/manage_config_groups_controller.js | 2 +-
ambari-web/app/models/config_group.js | 4 ++--
ambari-web/app/styles/application.less | 5 +++++
.../manage_configuration_groups_popup.hbs | 21 +++++++++++++-------
4 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0afd327c/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index ed13fc9..2729bed 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -163,7 +163,7 @@ App.ManageConfigGroupsController = Em.Controller.extend({
},
showProperties: function () {
- var properies = this.get('selectedConfigGroup.propertiesList');
+ var properies = this.get('selectedConfigGroup.propertiesList').htmlSafe();
if (properies) {
App.showAlertPopup(Em.I18n.t('services.service.config_groups_popup.properties'), properies);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0afd327c/ambari-web/app/models/config_group.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/config_group.js b/ambari-web/app/models/config_group.js
index d71dddf..708e1c5 100644
--- a/ambari-web/app/models/config_group.js
+++ b/ambari-web/app/models/config_group.js
@@ -126,8 +126,8 @@ App.ConfigGroup = Ember.Object.extend({
propertiesList: function () {
var result = '';
this.get('properties').forEach(function (item) {
- result += item.name + " : " + item.value + '\n';
+ result += item.name + " : " + item.value + '<br/>';
}, this);
return result;
}.property('properties.length')
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/0afd327c/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 2e6a549..f08112e 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -4985,3 +4985,8 @@ i.icon-asterisks {
}
}
+.prrl {
+ position: relative;
+ right: 10px;
+}
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/0afd327c/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
index 63e2c73..6484798 100644
--- a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
+++ b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
@@ -72,14 +72,21 @@
{{bindAttr data-original-title="selectedConfigGroup.propertiesList" }}>{{selectedConfigGroup.properties.length}} {{t common.properties}}</a>
</div>
</div>
+ <div class="clearfix"></div>
+ <div class="row-fluid">
+ <div class="span2"><span class="prrl">{{t common.description}}</span></div>
+ <div class="span10">{{selectedConfigGroup.description}}</div>
+ </div>
</div>
- <div class="span12">{{selectedConfigGroup.description}}</div>
- <div class="span12 text-error" id="manage-config-group-error-div">
- {{#if errorMessage}}
- {{errorMessage}}
- {{else}}
-
- {{/if}}
+ <div class="clearfix"></div>
+ <div class="row-fluid">
+ <div class="span12 text-error" id="manage-config-group-error-div">
+ {{#if errorMessage}}
+ {{errorMessage}}
+ {{else}}
+
+ {{/if}}
+ </div>
</div>
</div>
</div>