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

Added selectable column to service tab on configure page.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12264 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt
2012-04-18 22:49:15 +00:00
parent 86b14c682a
commit 0e7ea664d4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xCAT-UI/js/custom/zvmUtils.js
View File

@@ -3424,15 +3424,15 @@ function configProfilePanel(panelId) {
// Create table
var tableId = 'zvmProfileTable';
var table = new DataTable(tableId);
table.init(['<input type="checkbox" onclick="selectAllCheckbox(event, $(this))">', 'Profile', 'Disk pool', 'Disk size', 'Directory entry']);
table.init(['<input type="checkbox" onclick="selectAllCheckbox(event, $(this))">', 'Profile', 'Selectable', 'Disk pool', 'Disk size', 'Directory entry']);
// Insert profiles into table
var profiles = $.cookie('profiles').split(',');
profiles.push('default'); // Add default profile
for (var i in profiles) {
if (profiles[i]) {
// Columns are: profile, disk pool, disk size, and directory entry
var cols = new Array(profiles[i], '', '', '');
// Columns are: profile, selectable, disk pool, disk size, and directory entry
var cols = new Array(profiles[i], '', '', '', '');
// Add remove button where id = user name
cols.unshift('<input type="checkbox" name="' + profiles[i] + '"/>');
@@ -3550,10 +3550,10 @@ function insertDirectoryentry(data) {
// Update the directory entry column
var dTable = $('#' + tableId).dataTable();
dTable.fnUpdate(entry, rowPos, 4, false);
dTable.fnUpdate(entry, rowPos, 5, false);
// Adjust table styling
$('#' + tableId + ' td:nth-child(5)').css({
$('#' + tableId + ' td:nth-child(6)').css({
'text-align': 'left'
});
adjustColumnSize(tableId);
@@ -3594,12 +3594,12 @@ function insertDiskInfo(data) {
tmp = info[i].split('=');
pool = jQuery.trim(tmp[1]);
dTable.fnUpdate(pool, rowPos, 2, false);
dTable.fnUpdate(pool, rowPos, 3, false);
} if (info[i].indexOf('eckd_size') > -1) {
tmp = info[i].split('=');
eckdSize = jQuery.trim(tmp[1]);
dTable.fnUpdate(eckdSize, rowPos, 3, false);
dTable.fnUpdate(eckdSize, rowPos, 4, false);
}
}

2
xCAT-UI/xcat/plugins/webportal.pm
View File

@@ -342,7 +342,7 @@ sub provzlinux {
$out = `moncfg gangliamon $node -r`;
# Show node information, e.g. IP, hostname, and root password
$out = `lsdef $node | egrep "ip=|hostnames="`;
$out = `lsdef $node -i ip,hostnames | egrep "ip=|hostnames="`;
my $rootpw = getsysrootpw();
println( $callback, "Your virtual machine is ready. It may take a few minutes before you can logon using VNC ($node:1). Below is your VM attributes." );
println( $callback, "$out" );