arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up code.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8490 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt
2010-12-21 02:47:30 +00:00
parent 878798c65f
commit fad11f9958
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xCAT-UI/js/monitor/gangliamon.js
View File

@@ -198,8 +198,7 @@ function loadGroups4Ganglia(data) {
var info = $('<div class="ui-state-highlight ui-corner-all"></div>');
var msg = $('<p></p>');
msg.append('<span class="ui-icon ui-icon-info"></span>');
msg
.append('Review the nodes that are monitored by Ganglia. You can turn on Ganglia monitoring on a node by selecting it and clicking on Monitor. If you are satisfied with the nodes you want to monitor, ');
msg.append('Review the nodes that are monitored by Ganglia. You can turn on Ganglia monitoring on a node by selecting it and clicking on Monitor. If you are satisfied with the nodes you want to monitor, ');
msg.append(gangliaLnk);
msg.append(' to open Ganglia page.');
info.append(msg);
@@ -230,8 +229,7 @@ function loadGroups4Ganglia(data) {
success : loadNodes4Ganglia
});
// Get subgroups within selected group
// only when this is the parent group and not a subgroup
// Get subgroups within selected group only when this is the parent group and not a subgroup
if (data.rslt.obj.attr('id').indexOf('Subgroup') < 0) {
$.ajax( {
url : 'lib/cmd.php',
@@ -247,7 +245,7 @@ function loadGroups4Ganglia(data) {
});
}
} // End of if (thisGroup)
} );
});
}
/**
@@ -461,11 +459,9 @@ function loadNodes4Ganglia(data) {
pingCol.find('span a').bind('click', function(event) {
refreshNodeStatus(group);
});
powerCol.find('span a').bind('click', function(event) {
refreshPowerStatus(group);
});
gangliaCol.bind('click', function(event) {
refreshGangliaStatus(group);
});
@@ -645,8 +641,8 @@ function monitorNode(node, monitor) {
} else {
warningMsg = out[i];
}
} // End of if
} // End of for
}
}
// If there are warnings
if (warn) {

10
xCAT-UI/js/provision/images.js
View File

@@ -43,8 +43,7 @@ function loadImages(data) {
// Image attributes
var headers = new Object();
// Clear cookie containing list of images where their attributes
// need to be updated
// Clear cookie containing list of images where their attributes need to be updated
$.cookie('images2update', '');
// Clear hash table containing image attributes
origAttrs = '';
@@ -193,6 +192,7 @@ function loadImages(data) {
/**
* Enable editable columns
*/
// Do not make 1st, 2nd, 3rd, 4th, or 5th column editable
$('#imagesDataTable td:not(td:nth-child(1),td:nth-child(2))').editable(
function(value, settings) {
@@ -330,8 +330,7 @@ function updateImageAttrs() {
} // End of if
} // End of for
// Clear cookie containing list of images where
// their attributes need to be updated
// Clear cookie containing list of images where their attributes need to be updated
$.cookie('images2update', '');
}
@@ -378,8 +377,7 @@ function restoreImageAttrs() {
} // End of if
} // End of for
// Clear cookie containing list of images where
// their attributes need to be updated
// Clear cookie containing list of images where their attributes need to be updated
$.cookie('images2update', '');
}