svn commit: r732640 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/contrib/chukwa/src/web/hicc/js/flot.extend.js

[cdouglas]

Author: cdouglas
Date: Thu Jan  8 00:26:17 2009
New Revision: 732640

URL: http://svn.apache.org/viewvc?rev=732640&view=rev
Log:
HADOOP-4884. Make tool tip date format match standard HICC format. Contributed 
by Eric Yang.

Modified:
    hadoop/core/branches/branch-0.20/CHANGES.txt
    
hadoop/core/branches/branch-0.20/src/contrib/chukwa/src/web/hicc/js/flot.extend.js

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=732640&r1=732639&r2=732640&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Thu Jan  8 00:26:17 2009
@@ -517,6 +517,9 @@
     HADOOP-4914. Add description fields to Chukwa init.d scripts (Eric Yang via
     cdouglas)
 
+    HADOOP-4884. Make tool tip date format match standard HICC format. (Eric
+    Yang via cdouglas)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

Modified: 
hadoop/core/branches/branch-0.20/src/contrib/chukwa/src/web/hicc/js/flot.extend.js
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/chukwa/src/web/hicc/js/flot.extend.js?rev=732640&r1=732639&r2=732640&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.20/src/contrib/chukwa/src/web/hicc/js/flot.extend.js
 (original)
+++ 
hadoop/core/branches/branch-0.20/src/contrib/chukwa/src/web/hicc/js/flot.extend.js
 Thu Jan  8 00:26:17 2009
@@ -26,7 +26,7 @@
 
 options={
         points: { show: true },
-        xaxis: {                timeformat: "%D/%O/%y<br/>%H:%M:%S",
+        xaxis: {                timeformat: "%y/%O/%D<br/>%H:%M:%S",
                 mode: "time"
         },
         selection: { mode: "xy" },
@@ -52,10 +52,9 @@
                     $("#tooltip").remove();
                     var x = item.datapoint[0].toFixed(2),
                          y = item.stackValue.toFixed(2);
-//item.datapoint[1].toFixed(2);
                     var dnow=new Date();
                     dnow.setTime(x);
-                   var 
dita=leftPad(dnow.getUTCDate())+"/"+leftPad(dnow.getUTCMonth()+1)+"/"+dnow.getUTCFullYear()+"
 
"+leftPad(dnow.getUTCHours())+":"+leftPad(dnow.getUTCMinutes())+":"+leftPad(dnow.getUTCSeconds());
+                   var 
dita=leftPad(dnow.getUTCFullYear())+"/"+leftPad(dnow.getUTCMonth()+1)+"/"+dnow.getUTCDate()+"
 
"+leftPad(dnow.getUTCHours())+":"+leftPad(dnow.getUTCMinutes())+":"+leftPad(dnow.getUTCSeconds());
  
                     showTooltip(item.pageX, item.pageY,
                                 item.series.label + ": " + y + "<br>Time: " + 
dita);
@@ -79,7 +78,7 @@
                          y = item.datapoint[1].toFixed(2);
                     var dnow=new Date();
                     dnow.setTime(x);
-                   var 
dita=leftPad(dnow.getUTCDate())+"/"+leftPad(dnow.getUTCMonth()+1)+"/"+dnow.getUTCFullYear()+"
 
"+leftPad(dnow.getUTCHours())+":"+leftPad(dnow.getUTCMinutes())+":"+leftPad(dnow.getUTCSeconds());
+                   var 
dita=leftPad(dnow.getUTCFullYear())+"/"+leftPad(dnow.getUTCMonth()+1)+"/"+dnow.getUTCDate()+"
 
"+leftPad(dnow.getUTCHours())+":"+leftPad(dnow.getUTCMinutes())+":"+leftPad(dnow.getUTCSeconds());
  
                     showTooltip(item.pageX, item.pageY,
                                 item.series.label + ": " + y + "<br>Time: " + 
dita);