' + 'z/VM SMAPI is not responding to ' + hcp + '. It needs to be reset.
' @@ -195,8 +195,7 @@ function loadUserEntry(data) { var userEntry = data.rsp[0].split(node + ':'); // Remove loader - var loaderId = node + 'TabLoader'; - $('#' + loaderId).remove(); + $('#' + node + 'TabLoader').remove(); var toggleLinkId = node + 'ToggleLink'; $('#' + toggleLinkId).click(function() { @@ -251,14 +250,11 @@ function loadUserEntry(data) { /** * Save */ - var saveBtn = createButton('Save'); - saveBtn.hide(); + var saveBtn = createButton('Save').hide(); saveBtn.bind('click', function(event) { // Show loader - var statusId = node + 'StatusBar'; - var statusBarLoaderId = node + 'StatusBarLoader'; - $('#' + statusBarLoaderId).show(); - $('#' + statusId).show(); + $('#' + node + 'StatusBarLoader').show(); + $('#' + node + 'StatusBar').show(); // Replace user entry var newUserEntry = jQuery.trim(txtArea.val()) + '\n'; @@ -294,8 +290,7 @@ function loadUserEntry(data) { /** * Cancel */ - var cancelBtn = createButton('Cancel'); - cancelBtn.hide(); + var cancelBtn = createButton('Cancel').hide(); cancelBtn.bind('click', function(event) { txtArea.attr('readonly', 'readonly'); txtArea.css( { @@ -1571,10 +1566,8 @@ function openAddNicDialog(node, hcp) { incrementNodeProcess(node); // Show loader - var statusId = node + 'StatusBar'; - var statusBarLoaderId = node + 'StatusBarLoader'; - $('#' + statusBarLoaderId).show(); - $('#' + statusId).show(); + $('#' + node + 'StatusBarLoader').show(); + $('#' + node + 'StatusBar').show(); // Close dialog $(this).dialog( "close" ); @@ -1614,10 +1607,8 @@ function removeProcessor(node, address) { incrementNodeProcess(node); // Show loader - var statusId = node + 'StatusBar'; - var statusBarLoaderId = node + 'StatusBarLoader'; - $('#' + statusBarLoaderId).show(); - $('#' + statusId).show(); + $('#' + node + 'StatusBarLoader').show(); + $('#' + node + 'StatusBar').show(); } /** @@ -1647,10 +1638,8 @@ function removeDisk(node, address) { incrementNodeProcess(node); // Show loader - var statusId = node + 'StatusBar'; - var statusBarLoaderId = node + 'StatusBarLoader'; - $('#' + statusBarLoaderId).show(); - $('#' + statusId).show(); + $('#' + node + 'StatusBarLoader').show(); + $('#' + node + 'StatusBar').show(); } /** @@ -1683,10 +1672,8 @@ function removeNic(node, nic) { incrementNodeProcess(node); // Show loader - var statusId = node + 'StatusBar'; - var statusBarLoaderId = node + 'StatusBarLoader'; - $('#' + statusBarLoaderId).show(); - $('#' + statusId).show(); + $('#' + node + 'StatusBarLoader').show(); + $('#' + node + 'StatusBar').show(); } /** @@ -1826,9 +1813,9 @@ function loadDiskPoolTable(data) { var tmp = data.rsp[0].split(hcp + ': '); // Remove loader - var loaderID = 'zvmResourceLoader'; - if ($('#' + loaderID).length) { - $('#' + loaderID).remove(); + var loaderId = 'zvmResourceLoader'; + if ($('#' + loaderId).length) { + $('#' + loaderId).remove(); } // Resource tab ID @@ -1887,19 +1874,19 @@ function loadNetworkTable(data) { var tmp = data.rsp[0].split(hcp + ': '); // Remove loader - var loaderID = 'zvmResourceLoader'; - if ($('#' + loaderID).length) { - $('#' + loaderID).remove(); + var loaderId = 'zvmResourceLoader'; + if ($('#' + loaderId).length) { + $('#' + loaderId).remove(); } // Resource tab ID - var tabID = 'zvmResourceTab'; - var info = $('#' + tabID).find('.ui-state-highlight'); + var tabId = 'zvmResourceTab'; + var info = $('#' + tabId).find('.ui-state-highlight'); // If there is no info bar if (!info.length) { // Create info bar info = createInfoBar('Below are disks and networks found by the hardware control point. It shows disk pools defined in the EXTENT CONTROL file and LANs|VSWITCHes available to use.'); - $('#' + tabID).append(info); + $('#' + tabId).append(info); } // Get datatable @@ -1911,16 +1898,16 @@ function loadNetworkTable(data) { fieldSet.append(legend); // Create table - var tableID = 'zNetworkDataTable'; - var table = new DataTable(tableID); + var tableId = 'zNetworkDataTable'; + var table = new DataTable(tableId); table.init( [ 'Hardware control point', 'Type', 'Name', 'Details' ]); // Append datatable to tab fieldSet.append(table.object()); - $('#' + tabID).append(fieldSet); + $('#' + tabId).append(fieldSet); // Turn into datatable - dTable = $('#' + tableID).dataTable(); + dTable = $('#' + tableId).dataTable(); setNetworkDataTable(dTable); // Set the column width @@ -1953,12 +1940,10 @@ function connect2GuestLan(data) { var address = args[1].replace('addr=', ''); var lanName = args[2].replace('lan=', ''); var lanOwner = args[3].replace('owner=', ''); - - var statBarId = node + 'StatusBar'; // Write ajax response to status bar var prg = writeRsp(rsp, node + ': '); - $('#' + statBarId).append(prg); + $('#' + node + 'StatusBar').append(prg); // Connect NIC to Guest LAN $.ajax( { @@ -1989,12 +1974,10 @@ function connect2VSwitch(data) { var node = args[0].replace('node=', ''); var address = args[1].replace('addr=', ''); var vswitchName = args[2].replace('vsw=', ''); - - var statBarId = node + 'StatusBar'; // Write ajax response to status bar var prg = writeRsp(rsp, node + ': '); - $('#' + statBarId).append(prg); + $('#' + node + 'StatusBar').append(prg); // Connect NIC to VSwitch $.ajax( { diff --git a/xCAT-UI/js/monitor/gangliamon.js b/xCAT-UI/js/monitor/gangliamon.js index 322fd1d41..f7b544c97 100644 --- a/xCAT-UI/js/monitor/gangliamon.js +++ b/xCAT-UI/js/monitor/gangliamon.js @@ -102,36 +102,36 @@ function checkGangliaRPMs(data) { success : function(data) { if (data.rsp[0].indexOf("not-monitored") > -1) { // Create link to start Ganglia - var startLnk = $('Click here'); - startLnk.css( { - 'color' : 'blue', - 'text-decoration' : 'none' - }); - startLnk.click(function() { - // Turn on Ganglia for all nodes - monitorNode('', 'on'); - }); - - // Create warning bar - var warningBar = $(''); - var msg = $(''); - msg.append(''); - msg.append('Please start Ganglia Monitoring on xCAT. '); - msg.append(startLnk); - msg.append(' to start Ganglia Monitoring.'); - warningBar.append(msg); - warningBar.css('margin-bottom', '10px'); - - // If there are any warning messages, append this warning after it - var curWarnings = $('#gangliamon').find('.ui-state-error'); - var gangliaTab = $('#gangliamon'); - if (curWarnings.length) { - curWarnings.after(warningBar); - } else { - warningBar.prependTo(gangliaTab); + var startLnk = $('Click here'); + startLnk.css( { + 'color' : 'blue', + 'text-decoration' : 'none' + }); + startLnk.click(function() { + // Turn on Ganglia for all nodes + monitorNode('', 'on'); + }); + + // Create warning bar + var warningBar = $(''); + var msg = $(''); + msg.append(''); + msg.append('Please start Ganglia Monitoring on xCAT. '); + msg.append(startLnk); + msg.append(' to start Ganglia Monitoring.'); + warningBar.append(msg); + warningBar.css('margin-bottom', '10px'); + + // If there are any warning messages, append this warning after it + var curWarnings = $('#gangliamon').find('.ui-state-error'); + var gangliaTab = $('#gangliamon'); + if (curWarnings.length) { + curWarnings.after(warningBar); + } else { + warningBar.prependTo(gangliaTab); + } + } } - } - } }); } return; @@ -323,8 +323,7 @@ function loadNodes4Ganglia(data) { // Variable to send command and request node status var getNodeStatus = true; - var node; - var args; + var node, args; for ( var i in rsp) { // Get the node var pos = rsp[i].indexOf('Object name:'); diff --git a/xCAT-UI/js/nodes/rnetboot.js b/xCAT-UI/js/nodes/rnetboot.js index 277319964..56e1de127 100644 --- a/xCAT-UI/js/nodes/rnetboot.js +++ b/xCAT-UI/js/nodes/rnetboot.js @@ -33,8 +33,8 @@ function loadNetbootPage(tgtNodes) { var netbootForm = $(''); // Create status bar - var barId = 'netbootStatusBar' + inst; - var statusBar = createStatusBar(barId).hide(); + var statBarId = 'netbootStatusBar' + inst; + var statusBar = createStatusBar(statBarId).hide(); netbootForm.append(statusBar); // Create loader @@ -178,7 +178,7 @@ function loadNetbootPage(tgtNodes) { cmd : 'rnetboot', tgt : tgts, args : optStr, - msg : 'out=' + barId + ';cmd=rnetboot;tgt=' + tgts + msg : 'out=' + statBarId + ';cmd=rnetboot;tgt=' + tgts }, success : updateStatusBar diff --git a/xCAT-UI/js/ui.js b/xCAT-UI/js/ui.js index 8d3ad7d59..4fcc8cf9d 100644 --- a/xCAT-UI/js/ui.js +++ b/xCAT-UI/js/ui.js @@ -89,6 +89,7 @@ Tab.prototype.add = function(tabId, tabName, tabCont, closeable) { // Do not remove first tab if (tabIndex != 0) { tabs.tabs('remove', tabIndex); + tabs.tabs('select', 0); } }); } @@ -349,7 +350,7 @@ function createWarnBar(msg) { * * @param loaderId * Loader ID - * @return Nothing + * @return Loader */ function createLoader(loaderId) { var loader = $('
');