diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css index 53ae285ba..b0753e056 100644 --- a/xCAT-UI/css/style.css +++ b/xCAT-UI/css/style.css @@ -719,7 +719,6 @@ table a:hover { vertical-align: top; float: left; position: relative; - margin: 15px 0px 15px 15px; overflow: auto; background-color: #CCCCFF; padding: 10px 0px 0px 5px; @@ -736,15 +735,19 @@ table a:hover { .discovercontent { width: 700px; display: inline-table; - padding: 20px; + padding: 0 0 0 20px; +} + +.discovercontent table{ + border : none; } .discovercontent td { - font: 12px verdana, arial, helvetica, sans-serif; + border : none; } .discovercontent th { font: normal bold 15px verdana, arial, helvetica, sans-serif; text-align: center; - padding: 20px 0px 10px 0px; + border: none; } \ No newline at end of file diff --git a/xCAT-UI/js/configure/configure.js b/xCAT-UI/js/configure/configure.js index de0bc445b..90e0b92a9 100644 --- a/xCAT-UI/js/configure/configure.js +++ b/xCAT-UI/js/configure/configure.js @@ -76,6 +76,9 @@ function loadConfigPage() { // Add the update tab tab.add('updateTab', 'Update', '', false); + + // Add the discover tab + tab.add('discoverTab', 'Discover', '', false); // Get list of tables and their descriptions $.ajax( { @@ -92,6 +95,7 @@ function loadConfigPage() { }); loadUpdatePage(); + loadDiscoverPage(); } /** diff --git a/xCAT-UI/js/configure/discover.js b/xCAT-UI/js/configure/discover.js index 035b3b5ff..8c55d67db 100644 --- a/xCAT-UI/js/configure/discover.js +++ b/xCAT-UI/js/configure/discover.js @@ -39,10 +39,10 @@ var discoverEnv; function loadDiscoverPage(){ currentStep = 0; discoverEnv = new Object(); - $('#content').append('
'); + $('#discoverTab').append('
'); updateDiscoverStep(); - $('#content').append('
'); + $('#discoverTab').append('
'); initSelectPlatform(); } @@ -79,7 +79,7 @@ function createDiscoverButtons(){ var nextButton = createNextButton(); var cancelButton = createButton('Cancel'); cancelButton.bind('click', function(){ - $('#content').empty(); + $('#discoverTab').empty(); for (var name in discoverEnv){ delete discoverEnv[name]; } diff --git a/xCAT-UI/js/ui.js b/xCAT-UI/js/ui.js index 729c43314..2376509ed 100644 --- a/xCAT-UI/js/ui.js +++ b/xCAT-UI/js/ui.js @@ -462,6 +462,7 @@ function initPage() { loadNodesPage(); } else if (page == 'configure.php') { includeJs("js/configure/update.js"); + includeJs("js/configure/discover.js"); headers.eq(1).css('background-color', '#A9D0F5'); loadConfigPage(); } else if (page == 'provision.php') { @@ -474,10 +475,6 @@ function initPage() { includeJs("js/monitor/gangliamon.js"); headers.eq(3).css('background-color', '#A9D0F5'); loadMonitorPage(); - } else if (page == 'discover.php'){ - includeJs("js/discover/discover.js"); - headers.eq(4).css('background-color', '#A9D0F5'); - loadDiscoverPage(); } else { headers.eq(0).css('background-color', '#A9D0F5'); loadNodesPage();