From 7d96cff1d11a92689fafde6bc4be13faae3cd3a6 Mon Sep 17 00:00:00 2001 From: phamt Date: Fri, 23 Jul 2010 18:47:54 +0000 Subject: [PATCH] Changed the class name for each plugin because Javascript gets confused and won't load the pages correctly. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6845 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/js/custom/blade.js | 10 +++++----- xCAT-UI/js/custom/fsp.js | 10 +++++----- xCAT-UI/js/custom/hmc.js | 10 +++++----- xCAT-UI/js/custom/ipmi.js | 10 +++++----- xCAT-UI/js/custom/ivm.js | 10 +++++----- xCAT-UI/js/custom/zvm.js | 10 +++++----- xCAT-UI/js/monitor/monitor.js | 12 ++++++------ xCAT-UI/js/nodes/nodes.js | 24 ++++++++++++------------ xCAT-UI/js/provision/provision.js | 12 ++++++------ 9 files changed, 54 insertions(+), 54 deletions(-) diff --git a/xCAT-UI/js/custom/blade.js b/xCAT-UI/js/custom/blade.js index 88f36ddd6..941cf4669 100644 --- a/xCAT-UI/js/custom/blade.js +++ b/xCAT-UI/js/custom/blade.js @@ -7,7 +7,7 @@ $(document).ready(function(){ * * @return Nothing */ -var blade = function() { +var bladePlugin = function() { }; @@ -18,7 +18,7 @@ var blade = function() { * Data from HTTP request * @return Nothing */ -blade.prototype.loadInventory = function(data) { +bladePlugin.prototype.loadInventory = function(data) { }; @@ -29,7 +29,7 @@ blade.prototype.loadInventory = function(data) { * Source node to clone * @return Nothing */ -blade.prototype.loadClonePage = function(node) { +bladePlugin.prototype.loadClonePage = function(node) { }; @@ -40,7 +40,7 @@ blade.prototype.loadClonePage = function(node) { * The provision tab ID * @return Nothing */ -blade.prototype.loadProvisionPage = function(tabId) { +bladePlugin.prototype.loadProvisionPage = function(tabId) { var errMsg; // Get the OS image names @@ -213,6 +213,6 @@ blade.prototype.loadProvisionPage = function(tabId) { * * @return Nothing */ -blade.prototype.loadResources = function() { +bladePlugin.prototype.loadResources = function() { }; \ No newline at end of file diff --git a/xCAT-UI/js/custom/fsp.js b/xCAT-UI/js/custom/fsp.js index 6877c8f66..b8ebc9a4b 100644 --- a/xCAT-UI/js/custom/fsp.js +++ b/xCAT-UI/js/custom/fsp.js @@ -7,7 +7,7 @@ $(document).ready(function(){ * * @return Nothing */ -var fsp = function() { +var fspPlugin = function() { }; @@ -18,7 +18,7 @@ var fsp = function() { * Data from HTTP request * @return Nothing */ -fsp.prototype.loadInventory = function(data) { +fspPlugin.prototype.loadInventory = function(data) { }; @@ -29,7 +29,7 @@ fsp.prototype.loadInventory = function(data) { * Source node to clone * @return Nothing */ -fsp.prototype.loadClonePage = function(node) { +fspPlugin.prototype.loadClonePage = function(node) { }; @@ -40,7 +40,7 @@ fsp.prototype.loadClonePage = function(node) { * The provision tab ID * @return Nothing */ -fsp.prototype.loadProvisionPage = function(tabId) { +fspPlugin.prototype.loadProvisionPage = function(tabId) { var errMsg; // Get the OS image names @@ -213,6 +213,6 @@ fsp.prototype.loadProvisionPage = function(tabId) { * * @return Nothing */ -fsp.prototype.loadResources = function() { +fspPlugin.prototype.loadResources = function() { }; \ No newline at end of file diff --git a/xCAT-UI/js/custom/hmc.js b/xCAT-UI/js/custom/hmc.js index 06407678c..b6473d7d5 100644 --- a/xCAT-UI/js/custom/hmc.js +++ b/xCAT-UI/js/custom/hmc.js @@ -7,7 +7,7 @@ $(document).ready(function(){ * * @return Nothing */ -var hmc = function() { +var hmcPlugin = function() { }; @@ -18,7 +18,7 @@ var hmc = function() { * Data from HTTP request * @return Nothing */ -hmc.prototype.loadInventory = function(data) { +hmcPlugin.prototype.loadInventory = function(data) { var args = data.msg.split(','); // Get tab ID @@ -63,7 +63,7 @@ hmc.prototype.loadInventory = function(data) { * Source node to clone * @return Nothing */ -hmc.prototype.loadClonePage = function(node) { +hmcPlugin.prototype.loadClonePage = function(node) { }; @@ -74,7 +74,7 @@ hmc.prototype.loadClonePage = function(node) { * The provision tab ID * @return Nothing */ -hmc.prototype.loadProvisionPage = function(tabId) { +hmcPlugin.prototype.loadProvisionPage = function(tabId) { var errMsg; // Get the OS image names @@ -247,6 +247,6 @@ hmc.prototype.loadProvisionPage = function(tabId) { * * @return Nothing */ -hmc.prototype.loadResources = function() { +hmcPlugin.prototype.loadResources = function() { }; \ No newline at end of file diff --git a/xCAT-UI/js/custom/ipmi.js b/xCAT-UI/js/custom/ipmi.js index e51d95160..f8f065bee 100644 --- a/xCAT-UI/js/custom/ipmi.js +++ b/xCAT-UI/js/custom/ipmi.js @@ -7,7 +7,7 @@ $(document).ready(function(){ * * @return Nothing */ -var ipmi = function() { +var ipmiPlugin = function() { }; @@ -18,7 +18,7 @@ var ipmi = function() { * Data from HTTP request * @return Nothing */ -ipmi.prototype.loadInventory = function(data) { +ipmiPlugin.prototype.loadInventory = function(data) { }; @@ -29,7 +29,7 @@ ipmi.prototype.loadInventory = function(data) { * Source node to clone * @return Nothing */ -ipmi.prototype.loadClonePage = function(node) { +ipmiPlugin.prototype.loadClonePage = function(node) { }; @@ -40,7 +40,7 @@ ipmi.prototype.loadClonePage = function(node) { * The provision tab ID * @return Nothing */ -ipmi.prototype.loadProvisionPage = function(tabId) { +ipmiPlugin.prototype.loadProvisionPage = function(tabId) { var errMsg; // Get the OS image names @@ -213,6 +213,6 @@ ipmi.prototype.loadProvisionPage = function(tabId) { * * @return Nothing */ -ipmi.prototype.loadResources = function() { +ipmiPlugin.prototype.loadResources = function() { }; \ No newline at end of file diff --git a/xCAT-UI/js/custom/ivm.js b/xCAT-UI/js/custom/ivm.js index 4f0073a8e..6e6fd1e00 100644 --- a/xCAT-UI/js/custom/ivm.js +++ b/xCAT-UI/js/custom/ivm.js @@ -7,7 +7,7 @@ $(document).ready(function(){ * * @return Nothing */ -var ivm = function() { +var ivmPlugin = function() { }; @@ -18,7 +18,7 @@ var ivm = function() { * Data from HTTP request * @return Nothing */ -ivm.prototype.loadInventory = function(data) { +ivmPlugin.prototype.loadInventory = function(data) { }; @@ -29,7 +29,7 @@ ivm.prototype.loadInventory = function(data) { * Source node to clone * @return Nothing */ -ivm.prototype.loadClonePage = function(node) { +ivmPlugin.prototype.loadClonePage = function(node) { }; @@ -40,7 +40,7 @@ ivm.prototype.loadClonePage = function(node) { * The provision tab ID * @return Nothing */ -ivm.prototype.loadProvisionPage = function(tabId) { +ivmPlugin.prototype.loadProvisionPage = function(tabId) { var errMsg; // Get the OS image names @@ -213,6 +213,6 @@ ivm.prototype.loadProvisionPage = function(tabId) { * * @return Nothing */ -ivm.prototype.loadResources = function() { +ivmPlugin.prototype.loadResources = function() { }; \ No newline at end of file diff --git a/xCAT-UI/js/custom/zvm.js b/xCAT-UI/js/custom/zvm.js index 4f7ccef36..38de90184 100644 --- a/xCAT-UI/js/custom/zvm.js +++ b/xCAT-UI/js/custom/zvm.js @@ -8,7 +8,7 @@ $(document).ready(function() { * * @return Nothing */ -var zvm = function() { +var zvmPlugin = function() { }; @@ -19,7 +19,7 @@ var zvm = function() { * Source node to clone * @return Nothing */ -zvm.prototype.loadClonePage = function(node) { +zvmPlugin.prototype.loadClonePage = function(node) { // Get nodes tab var tab = getNodesTab(); var newTabId = node + 'CloneTab'; @@ -279,7 +279,7 @@ zvm.prototype.loadClonePage = function(node) { * Data from HTTP request * @return Nothing */ -zvm.prototype.loadInventory = function(data) { +zvmPlugin.prototype.loadInventory = function(data) { var args = data.msg.split(','); // Get tab ID @@ -907,7 +907,7 @@ zvm.prototype.loadInventory = function(data) { * The provision tab ID * @return Nothing */ -zvm.prototype.loadProvisionPage = function(tabId) { +zvmPlugin.prototype.loadProvisionPage = function(tabId) { var errMsg; // Get the OS image names @@ -1359,7 +1359,7 @@ zvm.prototype.loadProvisionPage = function(tabId) { * * @return Nothing */ -zvm.prototype.loadResources = function() { +zvmPlugin.prototype.loadResources = function() { // Reset resource table setDiskDataTable(''); setNetworkDataTable(''); diff --git a/xCAT-UI/js/monitor/monitor.js b/xCAT-UI/js/monitor/monitor.js index 4bae01fbe..1b2a5a289 100644 --- a/xCAT-UI/js/monitor/monitor.js +++ b/xCAT-UI/js/monitor/monitor.js @@ -112,22 +112,22 @@ function loadMonitorPage() { var plugin; switch(hw) { case "blade": - plugin = new blade(); + plugin = new bladePlugin(); break; case "fsp": - plugin = new fsp(); + plugin = new fspPlugin(); break; case "hmc": - plugin = new hmc(); + plugin = new hmcPlugin(); break; case "ipmi": - plugin = new ipmi(); + plugin = new ipmiPlugin(); break; case "ivm": - plugin = new ivm(); + plugin = new ivmPlugin(); break; case "zvm": - plugin = new zvm(); + plugin = new zvmPlugin(); break; } diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js index 77f190342..d3fa07062 100644 --- a/xCAT-UI/js/nodes/nodes.js +++ b/xCAT-UI/js/nodes/nodes.js @@ -287,22 +287,22 @@ function loadNodes(data) { var plugin; switch(mgt) { case "blade": - plugin = new blade(); + plugin = new bladePlugin(); break; case "fsp": - plugin = new fsp(); + plugin = new fspPlugin(); break; case "hmc": - plugin = new hmc(); + plugin = new hmcPlugin(); break; case "ipmi": - plugin = new ipmi(); + plugin = new ipmiPlugin(); break; case "ivm": - plugin = new ivm(); + plugin = new ivmPlugin(); break; case "zvm": - plugin = new zvm(); + plugin = new zvmPlugin(); break; } @@ -613,22 +613,22 @@ function loadNode(e) { var plugin; switch(mgt) { case "blade": - plugin = new blade(); + plugin = new bladePlugin(); break; case "fsp": - plugin = new fsp(); + plugin = new fspPlugin(); break; case "hmc": - plugin = new hmc(); + plugin = new hmcPlugin(); break; case "ipmi": - plugin = new ipmi(); + plugin = new ipmiPlugin(); break; case "ivm": - plugin = new ivm(); + plugin = new ivmPlugin(); break; case "zvm": - plugin = new zvm(); + plugin = new zvmPlugin(); break; } diff --git a/xCAT-UI/js/provision/provision.js b/xCAT-UI/js/provision/provision.js index 36909f04e..206a5c24c 100644 --- a/xCAT-UI/js/provision/provision.js +++ b/xCAT-UI/js/provision/provision.js @@ -102,22 +102,22 @@ function loadProvisionPage() { var plugin; switch(hw) { case "blade": - plugin = new blade(); + plugin = new bladePlugin(); break; case "fsp": - plugin = new fsp(); + plugin = new fspPlugin(); break; case "hmc": - plugin = new hmc(); + plugin = new hmcPlugin(); break; case "ipmi": - plugin = new ipmi(); + plugin = new ipmiPlugin(); break; case "ivm": - plugin = new ivm(); + plugin = new ivmPlugin(); break; case "zvm": - plugin = new zvm(); + plugin = new zvmPlugin(); break; }