use a tab to show the cluster setup wizard page

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8309 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005 2010-12-03 03:25:33 +00:00
parent 091fe027fe
commit 8439b96699
4 changed files with 15 additions and 11 deletions

View File

@ -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;
}

View File

@ -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();
}
/**

View File

@ -39,10 +39,10 @@ var discoverEnv;
function loadDiscoverPage(){
currentStep = 0;
discoverEnv = new Object();
$('#content').append('<div class="discoverstep" id="discoverStepDiv"></div>');
$('#discoverTab').append('<div class="discoverstep" id="discoverStepDiv"></div>');
updateDiscoverStep();
$('#content').append('<div class="discovercontent" id="discoverContentDiv"><div>');
$('#discoverTab').append('<div class="discovercontent" id="discoverContentDiv"><div>');
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];
}

View File

@ -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();