diff --git a/xCAT-UI/js/custom/blade.js b/xCAT-UI/js/custom/blade.js index c554874ff..404a2f9f0 100644 --- a/xCAT-UI/js/custom/blade.js +++ b/xCAT-UI/js/custom/blade.js @@ -129,7 +129,7 @@ bladePlugin.prototype.loadProvisionPage = function(tabId) { statBar.append(loader); // Create info bar - var infoBar = createInfoBar('Provision a blade node.'); + var infoBar = createInfoBar('Provision a node on BladeCenter.'); provForm.append(infoBar); // Append to provision tab @@ -192,7 +192,7 @@ bladePlugin.prototype.loadResources = function() { var resrcForm = $('
'); resrcForm.append(infoBar); - $('#' + tabID).append(resrcForm); + $('#' + tabId).append(resrcForm); }; /** diff --git a/xCAT-UI/js/custom/fsp.js b/xCAT-UI/js/custom/fsp.js deleted file mode 100644 index 0a709e95d..000000000 --- a/xCAT-UI/js/custom/fsp.js +++ /dev/null @@ -1,205 +0,0 @@ -/** - * Execute when the DOM is fully loaded - */ -$(document).ready(function() { - // Load utility scripts -}); - -/** - * Constructor - * - * @return Nothing - */ -var fspPlugin = function() { - -}; - -/** - * Load node inventory - * - * @param data - * Data from HTTP request - * @return Nothing - */ -fspPlugin.prototype.loadInventory = function(data) { - // Get arguments - var args = data.msg.split(','); - // Get tab ID - var tabId = args[0].replace('out=', ''); - // Get node - var node = args[1].replace('node=', ''); - // Get node inventory - var inv = data.rsp; - - // Remove loader - $('#' + tabId).find('img').remove(); - - // Create division to hold inventory - var invDivId = tabId + 'Inventory'; - var invDiv = $('
'); - var info = createInfoBar('Under construction'); - invDiv.append(info); - - // Append to inventory form - $('#' + tabId).append(invDiv); -}; - -/** - * Load clone page - * - * @param node - * Source node to clone - * @return Nothing - */ -fspPlugin.prototype.loadClonePage = function(node) { - // Get nodes tab - var tab = getNodesTab(); - var newTabId = node + 'CloneTab'; - - // If there is no existing clone tab - if (!$('#' + newTabId).length) { - // Create status bar and hide it - var statBarId = node + 'CloneStatusBar'; - var statBar = $('
').hide(); - - // Create info bar - var infoBar = createInfoBar('Under construction'); - - // Create clone form - var cloneForm = $('
'); - cloneForm.append(statBar); - cloneForm.append(infoBar); - - // Add clone tab - tab.add(newTabId, 'Clone', cloneForm, true); - } - - tab.select(newTabId); -}; - -/** - * Load provision page - * - * @param tabId - * The provision tab ID - * @return Nothing - */ -fspPlugin.prototype.loadProvisionPage = function(tabId) { - // Get OS image names - $.ajax( { - url : 'lib/cmd.php', - dataType : 'json', - data : { - cmd : 'tabdump', - tgt : '', - args : 'osimage', - msg : '' - }, - - success : setOSImageCookies - }); - - // Get groups - $.ajax( { - url : 'lib/cmd.php', - dataType : 'json', - data : { - cmd : 'extnoderange', - tgt : '/.*', - args : 'subgroups', - msg : '' - }, - - success : setGroupsCookies - }); - - // Get provision tab instance - var inst = tabId.replace('fspProvisionTab', ''); - - // Create provision form - var provForm = $('
'); - - // Create status bar - var statBarId = 'fspProvisionStatBar' + inst; - var statBar = createStatusBar(statBarId).hide(); - provForm.append(statBar); - - // Create loader - var loader = createLoader('fspProvisionLoader' + inst).hide(); - statBar.append(loader); - - // Create info bar - var infoBar = createInfoBar('Provision a fsp node.'); - provForm.append(infoBar); - - // Append to provision tab - $('#' + tabId).append(provForm); - - // Create provision type drop down - var provType = $('
'); - var typeLabel = $(''); - var typeSelect = $(''); - var provNewNode = $(''); - var provExistNode = $(''); - typeSelect.append(provNewNode); - typeSelect.append(provExistNode); - provType.append(typeLabel); - provType.append(typeSelect); - provForm.append(provType); - - /** - * Create provision new node division - */ - // You should copy whatever is in this function, put it here, and customize it - var provNew = createProvisionNew('fsp', inst); - provForm.append(provNew); - - /** - * Create provision existing node division - */ - // You should copy whatever is in this function, put it here, and customize it - var provExisting = createProvisionExisting('fsp', inst); - provForm.append(provExisting); - - // Toggle provision new/existing on select - typeSelect.change(function() { - var selected = $(this).val(); - if (selected == 'new') { - provNew.toggle(); - provExisting.toggle(); - } else { - provNew.toggle(); - provExisting.toggle(); - } - }); -}; - -/** - * Load resources - * - * @return Nothing - */ -fspPlugin.prototype.loadResources = function() { - // Get resource tab ID - var tabId = 'fspResourceTab'; - // Remove loader - $('#' + tabId).find('img').remove(); - - // Create info bar - var infoBar = createInfoBar('Under construction'); - - // Create resource form - var resrcForm = $('
'); - resrcForm.append(infoBar); - - $('#' + tabId).append(resrcForm); -}; - -/** - * Add node range - * - * @return Nothing - */ -fspPlugin.prototype.addNode = function() { - openDialog('info', 'Under construction'); -}; \ No newline at end of file diff --git a/xCAT-UI/js/custom/hmc.js b/xCAT-UI/js/custom/hmc.js index 4ea626807..6af581fdf 100644 --- a/xCAT-UI/js/custom/hmc.js +++ b/xCAT-UI/js/custom/hmc.js @@ -165,7 +165,7 @@ hmcPlugin.prototype.loadProvisionPage = function(tabId) { statBar.append(loader); // Create info bar - var infoBar = createInfoBar('Provision an hmc node.'); + var infoBar = createInfoBar('Provision a node on System p.'); provForm.append(infoBar); // Append to provision tab diff --git a/xCAT-UI/js/custom/ipmi.js b/xCAT-UI/js/custom/ipmi.js index 3609be7fa..a9c4f3a14 100644 --- a/xCAT-UI/js/custom/ipmi.js +++ b/xCAT-UI/js/custom/ipmi.js @@ -129,7 +129,7 @@ ipmiPlugin.prototype.loadProvisionPage = function(tabId) { statBar.append(loader); // Create info bar - var infoBar = createInfoBar('Provision a ipmi node.'); + var infoBar = createInfoBar('Provision a node on iDataPlex.'); provForm.append(infoBar); // Append to provision tab diff --git a/xCAT-UI/js/custom/ivm.js b/xCAT-UI/js/custom/ivm.js deleted file mode 100644 index ef09ff18e..000000000 --- a/xCAT-UI/js/custom/ivm.js +++ /dev/null @@ -1,205 +0,0 @@ -/** - * Execute when the DOM is fully loaded - */ -$(document).ready(function() { - // Load utility scripts -}); - -/** - * Constructor - * - * @return Nothing - */ -var ivmPlugin = function() { - -}; - -/** - * Load node inventory - * - * @param data - * Data from HTTP request - * @return Nothing - */ -ivmPlugin.prototype.loadInventory = function(data) { - // Get arguments - var args = data.msg.split(','); - // Get tab ID - var tabId = args[0].replace('out=', ''); - // Get node - var node = args[1].replace('node=', ''); - // Get node inventory - var inv = data.rsp; - - // Remove loader - $('#' + tabId).find('img').remove(); - - // Create division to hold inventory - var invDivId = tabId + 'Inventory'; - var invDiv = $('
'); - var info = createInfoBar('Under construction'); - invDiv.append(info); - - // Append to inventory form - $('#' + tabId).append(invDiv); -}; - -/** - * Load clone page - * - * @param node - * Source node to clone - * @return Nothing - */ -ivmPlugin.prototype.loadClonePage = function(node) { - // Get nodes tab - var tab = getNodesTab(); - var newTabId = node + 'CloneTab'; - - // If there is no existing clone tab - if (!$('#' + newTabId).length) { - // Create status bar and hide it - var statBarId = node + 'CloneStatusBar'; - var statBar = $('
').hide(); - - // Create info bar - var infoBar = createInfoBar('Under construction'); - - // Create clone form - var cloneForm = $('
'); - cloneForm.append(statBar); - cloneForm.append(infoBar); - - // Add clone tab - tab.add(newTabId, 'Clone', cloneForm, true); - } - - tab.select(newTabId); -}; - -/** - * Load provision page - * - * @param tabId - * The provision tab ID - * @return Nothing - */ -ivmPlugin.prototype.loadProvisionPage = function(tabId) { - // Get OS image names - $.ajax( { - url : 'lib/cmd.php', - dataType : 'json', - data : { - cmd : 'tabdump', - tgt : '', - args : 'osimage', - msg : '' - }, - - success : setOSImageCookies - }); - - // Get groups - $.ajax( { - url : 'lib/cmd.php', - dataType : 'json', - data : { - cmd : 'extnoderange', - tgt : '/.*', - args : 'subgroups', - msg : '' - }, - - success : setGroupsCookies - }); - - // Get provision tab instance - var inst = tabId.replace('ivmProvisionTab', ''); - - // Create provision form - var provForm = $('
'); - - // Create status bar - var statBarId = 'ivmProvisionStatBar' + inst; - var statBar = createStatusBar(statBarId).hide(); - provForm.append(statBar); - - // Create loader - var loader = createLoader('ivmProvisionLoader' + inst).hide(); - statBar.append(loader); - - // Create info bar - var infoBar = createInfoBar('Provision a ivm node.'); - provForm.append(infoBar); - - // Append to provision tab - $('#' + tabId).append(provForm); - - // Create provision type drop down - var provType = $('
'); - var typeLabel = $(''); - var typeSelect = $(''); - var provNewNode = $(''); - var provExistNode = $(''); - typeSelect.append(provNewNode); - typeSelect.append(provExistNode); - provType.append(typeLabel); - provType.append(typeSelect); - provForm.append(provType); - - /** - * Create provision new node division - */ - // You should copy whatever is in this function, put it here, and customize it - var provNew = createProvisionNew('ivm', inst); - provForm.append(provNew); - - /** - * Create provision existing node division - */ - // You should copy whatever is in this function, put it here, and customize it - var provExisting = createProvisionExisting('ivm', inst); - provForm.append(provExisting); - - // Toggle provision new/existing on select - typeSelect.change(function() { - var selected = $(this).val(); - if (selected == 'new') { - provNew.toggle(); - provExisting.toggle(); - } else { - provNew.toggle(); - provExisting.toggle(); - } - }); -}; - -/** - * Load resources - * - * @return Nothing - */ -ivmPlugin.prototype.loadResources = function() { - // Get resource tab ID - var tabId = 'ivmResourceTab'; - // Remove loader - $('#' + tabId).find('img').remove(); - - // Create info bar - var infoBar = createInfoBar('Under construction'); - - // Create resource form - var resrcForm = $('
'); - resrcForm.append(infoBar); - - $('#' + tabId).append(resrcForm); -}; - -/** - * Add node range - * - * @return Nothing - */ -ivmPlugin.prototype.addNode = function() { - openDialog('info', 'Under construction'); -}; \ No newline at end of file diff --git a/xCAT-UI/js/custom/zvm.js b/xCAT-UI/js/custom/zvm.js index 4b41ca910..7911eabc0 100644 --- a/xCAT-UI/js/custom/zvm.js +++ b/xCAT-UI/js/custom/zvm.js @@ -844,7 +844,7 @@ zvmPlugin.prototype.loadProvisionPage = function(tabId) { statBar.append(loader); // Create info bar - var infoBar = createInfoBar('Provision a zVM node.'); + var infoBar = createInfoBar('Provision a node on System z.'); provForm.append(infoBar); // Append to provision tab diff --git a/xCAT-UI/js/monitor/monitor.js b/xCAT-UI/js/monitor/monitor.js index e8ef525e3..a2cc787f6 100644 --- a/xCAT-UI/js/monitor/monitor.js +++ b/xCAT-UI/js/monitor/monitor.js @@ -132,19 +132,15 @@ function loadMonitorPage() { resrcForm.append(resrcInfoBar); // Create radio buttons for platforms - var hwList = $('
    Platform to view:
'); - var ipmi = $('
  • ipmi
    • '); - var blade = $('
  • blade
    • '); - var hmc = $('
  • hmc
    • '); - var ivm = $('
  • ivm
    • '); - var fsp = $('
  • fsp
    • '); - var zvm = $('
  • zvm
    • '); + var hwList = $('
      Platforms available:
    '); + var ipmi = $('
  • iDataPlex
    • '); + var blade = $('
  • BladeCenter
    • '); + var hmc = $('
  • System p
    • '); + var zvm = $('
  • System z
    • '); hwList.append(ipmi); hwList.append(blade); hwList.append(hmc); - hwList.append(ivm); - hwList.append(fsp); hwList.append(zvm); resrcForm.append(hwList); @@ -169,18 +165,12 @@ function loadMonitorPage() { case "blade": plugin = new bladePlugin(); break; - case "fsp": - plugin = new fspPlugin(); - break; case "hmc": plugin = new hmcPlugin(); break; case "ipmi": plugin = new ipmiPlugin(); break; - case "ivm": - plugin = new ivmPlugin(); - break; case "zvm": plugin = new zvmPlugin(); break; diff --git a/xCAT-UI/js/provision/provision.js b/xCAT-UI/js/provision/provision.js index 1aedbae89..06368def1 100644 --- a/xCAT-UI/js/provision/provision.js +++ b/xCAT-UI/js/provision/provision.js @@ -83,18 +83,14 @@ function loadProvisionPage() { // Create radio buttons for platforms var hwList = $('
      Platforms available:
    '); - var ipmi = $('
  • ipmi
    • '); - var blade = $('
  • blade
    • '); - var hmc = $('
  • hmc
    • '); - var ivm = $('
  • ivm
    • '); - var fsp = $('
  • fsp
    • '); - var zvm = $('
  • zvm
    • '); + var ipmi = $('
  • iDataPlex
    • '); + var blade = $('
  • BladeCenter
    • '); + var hmc = $('
  • System p
    • '); + var zvm = $('
  • System z
    • '); hwList.append(ipmi); hwList.append(blade); hwList.append(hmc); - hwList.append(ivm); - hwList.append(fsp); hwList.append(zvm); provPg.append(hwList); @@ -123,18 +119,12 @@ function loadProvisionPage() { case "blade": plugin = new bladePlugin(); break; - case "fsp": - plugin = new fspPlugin(); - break; case "hmc": plugin = new hmcPlugin(); break; case "ipmi": plugin = new ipmiPlugin(); break; - case "ivm": - plugin = new ivmPlugin(); - break; case "zvm": plugin = new zvmPlugin(); break;