You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/08/09 19:39:05 UTC
git commit: AMBARI-2854. ResourceManager heap widget jumps on hover.
(onechiporenko via yusaku)
Updated Branches:
refs/heads/trunk 67ed85b9e -> e7ac8688d
AMBARI-2854. ResourceManager heap widget jumps on hover. (onechiporenko via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/e7ac8688
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/e7ac8688
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/e7ac8688
Branch: refs/heads/trunk
Commit: e7ac8688d0a1378abaeee5bf2270cd1e3b971c6c
Parents: 67ed85b
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Fri Aug 9 10:38:58 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Fri Aug 9 10:38:58 2013 -0700
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 5 ++++-
.../app/views/main/dashboard/widgets/pie_chart_widget.js | 6 +++++-
.../views/main/dashboard/widgets/resource_manager_heap.js | 10 ----------
3 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e7ac8688/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 538df74..05ecb86 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2073,6 +2073,9 @@ table.graphs {
#dashboard-widgets{
+ .caption {
+ height: 25px;
+ }
.thumbnails {
margin-left: 8px;
}
@@ -2122,6 +2125,7 @@ table.graphs {
text-decoration: none;
display: none;
position: relative;
+ z-index: 7;
}
.hidden-info-two-line{
padding-top: 60px;
@@ -2178,7 +2182,6 @@ table.graphs {
}
.hidden-info-general{
display: block;
- z-index: 7;
}
.caption{
margin-left: -6px;
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e7ac8688/ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js b/ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js
index 502ea69..b4dcab0 100644
--- a/ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js
+++ b/ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js
@@ -98,7 +98,11 @@ App.PieChartDashboardWidgetView = App.DashboardWidgetView.extend({
data: function() {
return this.get('parentView.dataForPieChart');
- }.property('parentView.dataForPieChart'),
+ }.property(),
+
+ setData: function() {
+ this.set('data', this.get('parentView.dataForPieChart'));
+ }.observes('parentView.dataForPieChart'),
contentColor: function () {
var used = parseFloat(this.get('data')[0]);
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e7ac8688/ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js b/ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js
index 966de98..1b706c6 100644
--- a/ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js
+++ b/ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js
@@ -25,16 +25,6 @@ App.ResourceManagerHeapPieChartView = App.PieChartDashboardWidgetView.extend({
id: '24',
model_type: 'yarn',
- /*hiddenInfo: function () {
- var memUsed = this.get('model').get('jvmMemoryHeapUsed');
- var memCommitted = this.get('model').get('jvmMemoryHeapCommitted');
- var percent = memCommitted > 0 ? ((100 * memUsed) / memCommitted) : 0;
- var result = [];
- result.pushObject(percent.toFixed(1) + '% used');
- result.pushObject(numberUtils.bytesToSize(memUsed, 1, "parseFloat", 1000000) + ' of ' + numberUtils.bytesToSize(memCommitted, 1, "parseFloat", 1000000));
- return result;
- }.property('model.jvmMemoryHeapUsed', 'model.jvmMemoryHeapCommitted'),*/
-
modelFieldMax: 'jvmMemoryHeapCommitted',
modelFieldUsed: 'jvmMemoryHeapUsed',