composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Various fixes an finishing touch to the setup: support of "named" root modules, streamlined back/next processing, cleaner "summary" screen, etc...

Browse Source 
SVN:trunk[1163]
This commit is contained in:
Denis Flaven
2011-04-01 10:02:40 +00:00
parent 237e36f562
commit 911d4177cc
8 changed files with 240 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
setup/setup.js
View File

@@ -8,6 +8,7 @@ function NameIsValid(name)
function DoGoBack(iStep)
{
$('input[name=operation]').val('step'+iStep);
$(':button').attr('disabled', 'disabled');
$('#theForm').submit(); // Submit the form
return true;
}
@@ -117,9 +118,13 @@ function DoSubmit(sMsg, iStep)
bResult = false;
}
}
if (bResult && (sMsg != ''))
if (bResult)
{
$('#setup').block({message: '<img src="../images/indicator.gif">&nbsp;'+sMsg});
$(':button').attr('disabled', 'disabled');
if ((sMsg != ''))
{
$('#setup').block({message: '<img src="../images/indicator.gif">&nbsp;'+sMsg});
}
}
return bResult;
}
@@ -130,7 +135,7 @@ function DoUpdateDBSchema()
{
// Call the asynchronous page that performs the creation/update of the DB Schema
$('#log').html('');
$('#setup').block({message: '<p>Updating DB schema...<br/><div id=\"progress\">0%</div></p>'});
$('#setup').block({message: '<p><span id="setup_msg">Updating DB schema...</span><br/><div id=\"progress\">0%</div></p>'});
$('#progress').progression( {Current:5, Maximum: 100, aBackgroundImg: 'orange-progress.gif', aTextColor: '#000000'} );
$('#log').load( 'ajax.dataloader.php',
{
@@ -158,7 +163,7 @@ function DoUpdateProfiles(response, status, xhr)
{
// Call the asynchronous page that performs the creation/update of the DB Schema
$('#log').html('');
$('#setup').block({message: '<p>Updating Profiles...<br/><div id=\"progress\">0%</div></p>'});
$('#setup_msg').text('Updating Profiles...');
$('#progress').progression( {Current:40, Maximum: 100, aBackgroundImg: 'orange-progress.gif', aTextColor: '#000000'} );
$('#log').load( 'ajax.dataloader.php',
{
@@ -208,7 +213,7 @@ function DoLoadDataAsynchronous(response, status, xhr)
else
{
$('#log').html('');
$('#setup').block({message: '<p>Loading data...<br/><div id=\"progress\">0%</div></p>'});
$('#setup_msg').text('Loading data...');
$('#progress').progression( {Current: 60, Maximum: 100, aBackgroundImg: 'orange-progress.gif', aTextColor: '#000000'} );
// $('#log').ajaxError(
// function(e, xhr, settings, exception)