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/09 17:08:54 UTC
[1/2] git commit: AMBARI-4018 config group description doesn't
preserve multi-line. (ababiichuk)
Updated Branches:
refs/heads/trunk 71fa52975 -> e307e832a
AMBARI-4018 config group description doesn't preserve multi-line. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e307e832
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e307e832
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e307e832
Branch: refs/heads/trunk
Commit: e307e832a814c595a23c948e054dd8b2b84c6e14
Parents: 15caddd
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Dec 9 18:06:02 2013 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Dec 9 18:08:30 2013 +0200
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 7 ++++++-
.../main/service/manage_configuration_groups_popup.hbs | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e307e832/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index e3cf1bd..3bfde98 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -4977,7 +4977,12 @@ i.icon-asterisks {
margin-top: 0px;
}
.manage-configuration-group-content {
- margin-bottom: 30px;
+ margin-bottom: 0px;
+ .group-description {
+ height:40px;
+ overflow-y: auto;
+ white-space: pre;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e307e832/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 726e97a..6c6faeb 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
@@ -74,7 +74,7 @@
<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 class="span10 group-description">{{selectedConfigGroup.description}}</div>
</div>
</div>
<div class="clearfix"></div>
[2/2] git commit: AMBARI-4011 Config description popups linger after
filtering. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-4011 Config description popups linger after filtering. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/15caddde
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/15caddde
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/15caddde
Branch: refs/heads/trunk
Commit: 15caddde9bc1559e928fd887cf998f2d2310916d
Parents: 71fa529
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Dec 6 21:11:19 2013 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Dec 9 18:08:30 2013 +0200
----------------------------------------------------------------------
ambari-web/app/views/common/configs/services_config.js | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/15caddde/ambari-web/app/views/common/configs/services_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js
index fc88342..1229bc1 100644
--- a/ambari-web/app/views/common/configs/services_config.js
+++ b/ambari-web/app/views/common/configs/services_config.js
@@ -318,6 +318,7 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({
* Filtered <code>categoryConfigs</code> array. Used to show filtered result
*/
filteredCategoryConfigs: function () {
+ $('.popover').remove();
var filter = this.get('parentView.filter');
var columns = this.get('parentView.columns');
if (filter != null) {