diff --git a/xCAT-UI/js/custom/hmc.js b/xCAT-UI/js/custom/hmc.js index 6a58cfe5b..2d2f1e2cb 100644 --- a/xCAT-UI/js/custom/hmc.js +++ b/xCAT-UI/js/custom/hmc.js @@ -19,8 +19,8 @@ var hmcPlugin = function() { * @return Nothing */ hmcPlugin.prototype.loadInventory = function(data) { + // Get arguments var args = data.msg.split(','); - // Get tab ID var tabId = args[0].replace('out=', ''); // Get node @@ -33,26 +33,45 @@ hmcPlugin.prototype.loadInventory = function(data) { $('#' + loaderId).remove(); // Create division to hold inventory - var invDivId = node + 'Inventory'; + var invDivId = tabId + 'Inventory'; var invDiv = $('
'); - var fieldSet = $('
'); - var legend = $('Inventory'); - fieldSet.append(legend); - var oList = $('
    '); - var item, label, input, args; - - // Loop through each property + var fieldSet, legend, oList, item; + + // Loop through each line for ( var k = 0; k < inv.length; k++) { - // Create a list item for each property - item = $('
  1. '); - item.append(inv[k].replace(node + ': ', '')); - oList.append(item); + // Remove the node name in front + var str = inv[k].replace(node + ': ', ''); + + // If the string is a header + if (str.indexOf('I/O Bus Information') > -1 || str.indexOf('Machine Configuration Info') > -1) { + // Create a fieldset + fieldSet = $('
    '); + legend = $('' + str + ''); + fieldSet.append(legend); + oList = $('
      '); + fieldSet.append(oList); + invDiv.append(fieldSet); + } else { + // If no fieldset is defined + if (!fieldSet) { + // Define fieldset + fieldSet = $('
      '); + legend = $('General'); + fieldSet.append(legend); + oList = $('
        '); + fieldSet.append(oList); + invDiv.append(fieldSet); + } + + // Append the string to a list + item = $('
      1. '); + item.append(str); + oList.append(item); + } } // Append to inventory form - fieldSet.append(oList); - invDiv.append(fieldSet); $('#' + tabId).append(invDiv); }; diff --git a/xCAT-UI/js/monitor/monitor.js b/xCAT-UI/js/monitor/monitor.js index 1b2a5a289..f3a9488cf 100644 --- a/xCAT-UI/js/monitor/monitor.js +++ b/xCAT-UI/js/monitor/monitor.js @@ -69,7 +69,7 @@ function loadMonitorPage() { var resrcForm = $('
        '); // Create info bar - var resrcInfoBar = createInfoBar('Select a hardware to view its resources'); + var resrcInfoBar = createInfoBar('Select a platform to view its resources'); resrcForm.append(resrcInfoBar); // Create drop-down menu diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js index c0341b5d6..bea3f0028 100644 --- a/xCAT-UI/js/nodes/nodes.js +++ b/xCAT-UI/js/nodes/nodes.js @@ -616,11 +616,11 @@ function loadNode(e) { // the node name may contain special char(such as '.','#'), so we can not use the node name as a id. var myTab = getNodesTab(); var inst = 0; - var newTabId = 'NodeTab' + inst; + var newTabId = 'nodeTab' + inst; while ($('#' + newTabId).length) { // If one already exists, generate another one inst = inst + 1; - newTabId = 'NodeTab' + inst; + newTabId = 'nodeTab' + inst; } // Reset node process $.cookie(node + 'Processes', 0); @@ -2216,6 +2216,7 @@ function getRowNum(nodeName){ } return -1; } + function selectAllCheckbox(event, obj){ var status = obj.attr('checked'); $('#nodesDataTable :checkbox').attr('checked', status); diff --git a/xCAT-UI/js/provision/provision.js b/xCAT-UI/js/provision/provision.js index 206a5c24c..e0df3284e 100644 --- a/xCAT-UI/js/provision/provision.js +++ b/xCAT-UI/js/provision/provision.js @@ -61,7 +61,7 @@ function loadProvisionPage() { var div = $('
        '); provForm.append(div); - var label = $('Select the hardware to provision:'); + var label = $('Select a platform to provision:'); var hw = $(''); var ipmi = $(''); var blade = $('');