svn commit: r1418998 - in /incubator/ambari/branches/AMBARI-666: AMBARI-666-CHANGES.txt ambari-web/app/messages.js ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs ambari-web/app/views/main/charts/heatmap/heatmap_host.js

[yu...@apache.org]

Author: yusaku
Date: Sun Dec  9 15:00:41 2012
New Revision: 1418998

URL: http://svn.apache.org/viewvc?rev=1418998&view=rev
Log:
AMBARI-1046. Heatmap with no numbers on the hover. (Srimanth Gunturi via yusaku)

Modified:
    incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
    incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/charts/heatmap/heatmap_host.js

Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1418998&r1=1418997&r2=1418998&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Sun Dec  9 15:00:41 2012
@@ -511,6 +511,9 @@ AMBARI-666 branch (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+ 
+  AMBARI-1046. Heatmap with no numbers on the hover. (Srimanth Gunturi via
+  yusaku)
 
   AMBARI-1045. Service summary sections have incorrect values displayed.
   (Srimanth Gunturi via yusaku)

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js?rev=1418998&r1=1418997&r2=1418998&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js Sun Dec  9 15:00:41 2012
@@ -277,6 +277,7 @@ Em.I18n.translations = {
   'charts.heatmap.item.host.process':'Total Running Processes',
   'charts.heatmap.category.hdfs':'HDFS',
   'charts.heatmap.category.mapreduce': 'MapReduce',
+  'charts.heatmap.unknown': 'Unknown',
 
   'metric.default':'combined',
   'metric.cpu':'cpu',

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs?rev=1418998&r1=1418997&r2=1418998&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs Sun Dec  9 15:00:41 2012
@@ -20,8 +20,14 @@
 OS: {{view.details.osType}}<br/>
 IP: {{view.details.ip}}<br/>
 {{#if view.details.metricName}}
-{{view.details.metricName}}: {{view.details.metricValue}}<br/>
+  {{view.details.metricName}}: {{view.details.metricValue}}<br/>
 {{/if}}
-Disk: {{view.details.diskUsage}}% <br/>
-CPU: {{view.details.cpuUsage}}%<br/>
-Memory: {{view.details.memoryUsage}}%<br/>
+{{#if view.details.diskUsage}}
+  Disk: {{view.details.diskUsage}}% <br/>
+{{/if}}
+{{#if view.details.cpuUsage}}
+  CPU: {{view.details.cpuUsage}}%<br/>
+{{/if}}
+{{#if view.details.memoryUsage}}
+  Memory: {{view.details.memoryUsage}}%<br/>
+{{/if}}
\ No newline at end of file

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/charts/heatmap/heatmap_host.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/charts/heatmap/heatmap_host.js?rev=1418998&r1=1418997&r2=1418998&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/charts/heatmap/heatmap_host.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/charts/heatmap/heatmap_host.js Sun Dec  9 15:00:41 2012
@@ -42,7 +42,7 @@ App.MainChartsHeatmapHostView = Em.View.
       if (h2vMap && metricName) {
         var value = h2vMap[host.get('hostName')];
         if (value == undefined || value == null) {
-          value = "Unknown";
+          value = this.t('charts.heatmap.unknown');
         } else {
           value = value + selectedMetric.get('units')
         }