diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js
index 63e60f786..ed06263fe 100644
--- a/xCAT-UI/js/nodes/nodes.js
+++ b/xCAT-UI/js/nodes/nodes.js
@@ -380,7 +380,7 @@ function loadNodes(data) {
var sorted = new Array();
for (var key in headers) {
// Do not put comments and status in twice
- if (key != 'usercomment' && key.indexOf('status') < 0) {
+ if (key != 'usercomment' && key != 'status' && key.indexOf('statustime') < 0) {
sorted.push(key);
}
}
@@ -390,8 +390,8 @@ function loadNodes(data) {
// Power status for nodes will not be requested until user clicks on power link
sorted.unshift('',
'node',
- 'status',
- 'power ',
+ 'status
',
+ 'power ',
'comments');
// Create a datatable
@@ -454,7 +454,7 @@ function loadNodes(data) {
var key = sorted[i];
// Do not put comments and status in twice
- if (key != 'usercomment' && key.indexOf('status') < 0) {
+ if (key != 'usercomment' && key != 'status' && key.indexOf('statustime') < 0) {
var val = attrs[node][key];
if (val) {
row.push(val);
@@ -689,6 +689,30 @@ function loadNodes(data) {
refreshPowerStatus(group);
});
+ // Create tooltip for status
+ var pingTip = createStatusToolTip();
+ pingCol.find('span').append(pingTip);
+ pingCol.find('span a').tooltip({
+ position: "center right",
+ offset: [-2, 10],
+ effect: "fade",
+ opacity: 0.8,
+ relative: true,
+ predelay: 800
+ });
+
+ // Create tooltip for power
+ var powerTip = createPowerToolTip();
+ powerCol.find('span').append(powerTip);
+ powerCol.find('span a').tooltip({
+ position: "center right",
+ offset: [-2, 10],
+ effect: "fade",
+ opacity: 0.8,
+ relative: true,
+ predelay: 800
+ });
+
/**
* Enable editable columns
*/
@@ -739,7 +763,7 @@ function loadNodes(data) {
data : {
cmd : 'nodestat',
tgt : group,
- args : '',
+ args : '-u',
msg : ''
},
@@ -913,7 +937,7 @@ function refreshNodeStatus(group) {
data : {
cmd : 'nodestat',
tgt : group,
- args : '',
+ args : '-u',
msg : ''
},
@@ -1941,6 +1965,34 @@ function createCommentsToolTip(comment) {
return toolTip;
}
+/**
+ * Create a tool tip for node status
+ *
+ * @return Tool tip
+ */
+function createStatusToolTip() {
+ // Create tooltip container
+ var toolTip = $('