From 41548b978b56ddf6ef2a44f5f2e8ccf4d0140347 Mon Sep 17 00:00:00 2001 From: xq2005 Date: Tue, 16 Aug 2011 08:38:46 +0000 Subject: [PATCH] add ganglia option on provision dialog git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10293 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/css/style.css | 5 ++++ xCAT-UI/js/nodes/nodes.js | 52 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css index a9d28c8c2..8f47ffcce 100644 --- a/xCAT-UI/css/style.css +++ b/xCAT-UI/css/style.css @@ -201,6 +201,11 @@ body { padding-left: 10px; } +#groups .groupdiv div{ + color: blue; + padding: 5px 0px 5px 20px; +} + #groups .groupdiv div:hover { background: #E7EBFF; cursor: pointer; diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js index 0769e1711..94992c6f6 100644 --- a/xCAT-UI/js/nodes/nodes.js +++ b/xCAT-UI/js/nodes/nodes.js @@ -230,7 +230,7 @@ function loadGroups(data) { var grouplist= $('
'); // Create a link for each group for (var i = groups.length; i--;) { - grouplist.append('
' + groups[i] + '
'); + grouplist.append('
' + groups[i] + '
'); } $('#groups').append(grouplist); @@ -3259,7 +3259,7 @@ function openQuickProvisionDia(tgtnodes){ showstr += 'TFTP Server:'; showstr += 'NFS Server:'; showstr += ''; - showstr += '
'; + showstr += '
'; diaDiv.append(showstr); diaDiv.dialog({ modal: true, @@ -3272,7 +3272,11 @@ function openQuickProvisionDia(tgtnodes){ }); $('#deployDiv select').parent().append(createLoader()); - + $('#deployDiv select').bind('change', function(){ + $('#deployDiv #advoption').html(''); + provisionAdvOption($(this).val()); + }); + $.ajax({ url : 'lib/cmd.php', dataType : 'json', @@ -3301,6 +3305,8 @@ function openQuickProvisionDia(tgtnodes){ $('#deployDiv select').append(''); } + $('#deployDiv select').trigger('change'); + $('#deployDiv').dialog( "option", "buttons", {'Ok': function(){quickProvision();}, 'Cancel': function(){$(this).remove();}} ); @@ -3308,6 +3314,46 @@ function openQuickProvisionDia(tgtnodes){ }); } +function provisionAdvOption(imagename){ + $.ajax({ + url : 'lib/cmd.php', + dataType : 'json', + data : { + cmd : 'lsdef', + tgt : '', + args : '-t;osimage;' + imagename + ';-i;osname,provmethod', + msg : '' + }, + + success : function(data){ + var index = 0; + var osname = ''; + var provmethod = ''; + var tempstr = ''; + var position = 0; + for (index = 0; index < data.rsp.length; index++){ + tempstr = data.rsp[index]; + if (-1 != tempstr.indexOf('osname')){ + position = tempstr.indexOf('='); + osname = tempstr.substr(position + 1); + } + if (-1 != tempstr.indexOf('provmethod')){ + position = tempstr.indexOf('='); + provmethod = tempstr.substr(position + 1); + } + } + + $('#deployDiv #advoption').empty(); + if ('aix' == osname.toLowerCase()){ + return; + } + + if ('install' == provmethod){ + $('#deployDiv #advoption').html('Install Ganglia.'); + } + } + }); +} /** * get all needed field for provsion and send the command to server *