From 1753ca7f021ff4aba1790ad379fae2af600ad614 Mon Sep 17 00:00:00 2001 From: phamt Date: Tue, 28 Sep 2010 20:24:31 +0000 Subject: [PATCH] Removed href="#" from all links because it forces the page to initialize it's position, which could be annoying to the user. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7708 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/css/style.css | 6 ++++++ xCAT-UI/js/configure/configure.js | 2 +- xCAT-UI/js/configure/update.js | 2 +- xCAT-UI/js/custom/zvm.js | 16 +++++++-------- xCAT-UI/js/custom/zvmUtils.js | 2 +- xCAT-UI/js/nodes/nodes.js | 34 +++++++++++++++---------------- 6 files changed, 34 insertions(+), 28 deletions(-) diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css index 45efcd060..9d7dc9908 100644 --- a/xCAT-UI/css/style.css +++ b/xCAT-UI/css/style.css @@ -46,6 +46,7 @@ font: 14px verdana, arial, helvetica, sans-serif; color: #424242; padding: 11px 30px; + cursor: pointer; } #header ul a:hover { @@ -71,6 +72,7 @@ color: #0000FF; text-decoration: none; display: block; + cursor: pointer; } #header div a:hover { @@ -118,6 +120,7 @@ body { display: inline-table; padding: 5px 15px 15px 5px; text-decoration: none; + cursor: pointer; } #groups a:hover { @@ -248,6 +251,7 @@ span.ui-icon-info { font: 12px verdana, arial, helvetica, sans-serif; text-decoration: none; color: #0000FF; + cursor: pointer; } .tab a:hover { @@ -278,6 +282,7 @@ span.ui-icon-info { .actionBar a { color: #424242; + cursor: pointer; } /****************** Status bar ******************/ @@ -416,6 +421,7 @@ span.ui-icon-info { .datatable a { text-decoration: none; color: #000FF; + cursor: pointer; } .datatable a:hover { diff --git a/xCAT-UI/js/configure/configure.js b/xCAT-UI/js/configure/configure.js index 3f67db686..b67272c5a 100644 --- a/xCAT-UI/js/configure/configure.js +++ b/xCAT-UI/js/configure/configure.js @@ -123,7 +123,7 @@ function loadTableNames(data) { for ( var i = 0; i < tables.length; i++) { // Create a link for each table var args = tables[i].split(':'); - var link = $('' + args[0] + ''); + var link = $('' + args[0] + ''); // Open table on click link.bind('click', function(e) { diff --git a/xCAT-UI/js/configure/update.js b/xCAT-UI/js/configure/update.js index f4efe7a0b..39be01c08 100644 --- a/xCAT-UI/js/configure/update.js +++ b/xCAT-UI/js/configure/update.js @@ -280,7 +280,7 @@ function ShowUpdateResult(data) } } - $('#update').append('Response Detail:'); + $('#update').append('Response Detail:'); $('#update a').bind('click', function(){ $('#resDetail').show(); }); diff --git a/xCAT-UI/js/custom/zvm.js b/xCAT-UI/js/custom/zvm.js index d631fd0e2..86f46d284 100644 --- a/xCAT-UI/js/custom/zvm.js +++ b/xCAT-UI/js/custom/zvm.js @@ -328,7 +328,7 @@ zvmPlugin.prototype.loadInventory = function(data) { * Show user entry */ var toggleLinkId = node + 'ToggleLink'; - var toggleLink = $('Show directory entry'); + var toggleLink = $('Show directory entry'); toggleLink.one('click', function(event) { // Toggle inventory division $('#' + invDivId).toggle(); @@ -525,7 +525,7 @@ zvmPlugin.prototype.loadInventory = function(data) { } procType = $('' + temp + ''); procAddr = $(''); - procLink = $('' + args[1] + ''); + procLink = $('' + args[1] + ''); // Append context menu to link procLink.contextMenu(contextMenu, { @@ -567,7 +567,7 @@ zvmPlugin.prototype.loadInventory = function(data) { /** * Add processor */ - var addProcLink = $('Add temporary processor'); + var addProcLink = $('Add temporary processor'); addProcLink.bind('click', function(event) { openAddProcDialog(node); }); @@ -628,7 +628,7 @@ zvmPlugin.prototype.loadInventory = function(data) { // Get DASD virtual device, type, volume ID, access, and size dasdVDev = $(''); - dasdLink = $('' + args[1] + ''); + dasdLink = $('' + args[1] + ''); // Append context menu to link dasdLink.contextMenu(contextMenu, { @@ -659,7 +659,7 @@ zvmPlugin.prototype.loadInventory = function(data) { /** * Add disk */ - var addDasdLink = $('Add disk'); + var addDasdLink = $('Add disk'); addDasdLink.bind('click', function(event) { var hcp = attrs['hcp'][0].split('.'); openAddDiskDialog(node, hcp[0]); @@ -720,7 +720,7 @@ zvmPlugin.prototype.loadInventory = function(data) { // Get NIC virtual device, type, port name, and number of devices nicVDev = $(''); - nicLink = $('' + args[1] + ''); + nicLink = $('' + args[1] + ''); // Append context menu to link nicLink.contextMenu(contextMenu, { @@ -754,7 +754,7 @@ zvmPlugin.prototype.loadInventory = function(data) { /** * Add NIC */ - var addNicLink = $('Add NIC'); + var addNicLink = $('Add NIC'); addNicLink.bind('click', function(event) { var hcp = attrs['hcp'][0].split('.'); openAddNicDialog(node, hcp[0]); @@ -1080,7 +1080,7 @@ zvmPlugin.prototype.addNode = function() { var node = args[1].replace('node=', ''); // If there was an error, do not continue - if (rsp.length) {s + if (rsp.length) { openDialog('warn', '(Error) Failed to create node definition'); } else { openDialog('info', 'Node definitions created for ' + node); diff --git a/xCAT-UI/js/custom/zvmUtils.js b/xCAT-UI/js/custom/zvmUtils.js index 0654b520e..1b4d86e7c 100644 --- a/xCAT-UI/js/custom/zvmUtils.js +++ b/xCAT-UI/js/custom/zvmUtils.js @@ -2136,7 +2136,7 @@ function createZProvisionNew(inst) { /** * Add disks */ - var addDiskLink = $('Add disk'); + var addDiskLink = $('Add disk'); addDiskLink.bind('click', function(event) { // Create a row var diskRow = $(''); diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js index 6b2a9ab34..f2baf4cb2 100644 --- a/xCAT-UI/js/nodes/nodes.js +++ b/xCAT-UI/js/nodes/nodes.js @@ -108,7 +108,7 @@ function loadGroups(data) { // Create a link for each group for ( var i = groups.length; i--;) { var subItem = $('
  • '); - var link = $('' + groups[i] + ''); + var link = $('' + groups[i] + ''); subItem.append(link); subUL.append(subItem); } @@ -152,7 +152,7 @@ function loadGroups(data) { }); // Create link to add nodes - var addNodeLink = $('Add node'); + var addNodeLink = $('Add node'); addNodeLink.bind('click', function(event) { var info = createInfoBar('Select the hardware management for the new node range'); var addNodeForm = $('
    '); @@ -262,8 +262,8 @@ function loadNodes(data) { // Add column for check box, node, ping, and power sorted.unshift('', 'node', - 'ping', - 'power'); + 'ping', + 'power'); // Create a datatable var dTable = new DataTable('nodesDataTable'); @@ -276,7 +276,7 @@ function loadNodes(data) { // Create a check box var checkBx = ''; // Open node onclick - var nodeLink = $('' + node + '').bind('click', loadNode); + var nodeLink = $('' + node + '').bind('click', loadNode); row.push(checkBx, nodeLink, '', ''); // Go through each header @@ -309,12 +309,12 @@ function loadNodes(data) { /* * Power */ - var powerLnk = $('Power'); + var powerLnk = $('Power'); /* * Power on */ - var powerOnLnk = $('Power on'); + var powerOnLnk = $('Power on'); powerOnLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); if (tgtNodes) { @@ -325,7 +325,7 @@ function loadNodes(data) { /* * Power off */ - var powerOffLnk = $('Power off'); + var powerOffLnk = $('Power off'); powerOffLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); if (tgtNodes) { @@ -336,7 +336,7 @@ function loadNodes(data) { /* * Clone */ - var cloneLnk = $('Clone'); + var cloneLnk = $('Clone'); cloneLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable').split(','); for ( var i = 0; i < tgtNodes.length; i++) { @@ -372,7 +372,7 @@ function loadNodes(data) { /* * Delete */ - var deleteLnk = $('Delete'); + var deleteLnk = $('Delete'); deleteLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); if (tgtNodes) { @@ -383,7 +383,7 @@ function loadNodes(data) { /* * Unlock */ - var unlockLnk = $('Unlock'); + var unlockLnk = $('Unlock'); unlockLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); if (tgtNodes) { @@ -394,7 +394,7 @@ function loadNodes(data) { /* * Run script */ - var scriptLnk = $('Run script'); + var scriptLnk = $('Run script'); scriptLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); if (tgtNodes) { @@ -405,7 +405,7 @@ function loadNodes(data) { /* * Update node */ - var updateLnk = $('Update'); + var updateLnk = $('Update'); updateLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); if (tgtNodes) { @@ -416,7 +416,7 @@ function loadNodes(data) { /* * Set boot state */ - var setBootStateLnk = $('Set boot state'); + var setBootStateLnk = $('Set boot state'); setBootStateLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); if (tgtNodes) { @@ -428,7 +428,7 @@ function loadNodes(data) { /* * Boot to network */ - var boot2NetworkLnk = $('Boot to network'); + var boot2NetworkLnk = $('Boot to network'); boot2NetworkLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); if (tgtNodes) { @@ -439,7 +439,7 @@ function loadNodes(data) { /* * Open the Rcons page */ - var rcons = $('Open Rcons'); + var rcons = $('Open Rcons'); rcons.bind('click', function(event){ var tgtNodes = getNodesChecked('nodesDataTable'); if (tgtNodes) { @@ -450,7 +450,7 @@ function loadNodes(data) { /* * Advanced */ - var advancedLnk = $('Advanced'); + var advancedLnk = $('Advanced'); // Power actions var powerActions = [ powerOnLnk, powerOffLnk ];