');
+ $oPage->add(
+<<Prerequisites validation:
$sTitle
+
+HTML
+ );
foreach($aErrors as $sText)
{
$oPage->error($sText);
@@ -285,11 +286,11 @@ class WizStepInstallOrUpgrade extends WizardStep
if ($oCheck->iSeverity == CheckResult::ERROR)
{
$bCanBackup = false;
- $sMySQLDumpMessage .= '
Warning: '.$oCheck->sLabel;
+ $sMySQLDumpMessage .= '
Error:'.$oCheck->sLabel.'
';
}
else
{
- $sMySQLDumpMessage .= '
'.$oCheck->sLabel.' ';
+ $sMySQLDumpMessage .= '
Success:'.$oCheck->sLabel.'
';
}
}
$sChecked = ($bCanBackup && $bDBBackup) ? ' checked ' : '';
@@ -622,10 +623,17 @@ EOF
{
// No changes detected... or no way to tell because of the lack of a manifest or previous source dir
// Use the "compatible" datamodel as-is.
- $oPage->p("
![](\"../images/validation_ok.png\"/)
The datamodel will be upgraded from version $sInstalledDataModelVersion to version $sUpgradeDMVersion.");
- $oPage->add('
');
- $oPage->add('
');
- $oPage->add('
');
+ $sCompatibleDMDirToDisplay = utils::HtmlEntities($sCompatibleDMDir);
+ $sUpgradeDMVersionToDisplay = utils::HtmlEntities($sUpgradeDMVersion);
+ $oPage->add(
+<<The datamodel will be upgraded from version $sInstalledDataModelVersion to version $sUpgradeDMVersion.
+
+
+
+HTML
+ );
+
}
// Check if there are "extensions" to preserve and if it's possible
@@ -641,7 +649,7 @@ EOF
$oPage->p("Cannot copy the extensions from '$sPreviousVersionDir/extensions' to '".APPROOT."extensions' due to the following access rights issue(s):");
foreach($aErrors as $sDir => $oCheckResult)
{
- $oPage->p('
'.$oCheckResult->sLabel);
+ $oPage->add('
Error:'.$oCheckResult->sLabel.'
');
}
}
else
@@ -1053,7 +1061,7 @@ EOF
{
case CheckResult::INFO:
$sStatus = 'ok';
- $sMessage = json_encode('
'.$oCheck->sLabel);
+ $sMessage = json_encode('
'.$oCheck->sLabel.'
');
break;
@@ -1061,7 +1069,7 @@ EOF
case CheckResult::ERROR:
case CheckResult::WARNING:
$sStatus = 'ko';
- $sMessage = json_encode('
'.$oCheck->sLabel);
+ $sMessage = json_encode('
'.$oCheck->sLabel.'
');
}
$oPage->add_ready_script(
@@ -1180,7 +1188,7 @@ EOF
{
case CheckResult::INFO:
$sStatus = 'ok';
- $sMessage = json_encode('
'.$oCheck->sLabel);
+ $sMessage = json_encode('
'.$oCheck->sLabel.'
');
break;
@@ -1188,7 +1196,7 @@ EOF
case CheckResult::ERROR:
case CheckResult::WARNING:
$sStatus = 'ko';
- $sMessage = json_encode('
'.$oCheck->sLabel);
+ $sMessage = json_encode('
'.$oCheck->sLabel.'
');
}
$oPage->add_ready_script(
@@ -2433,7 +2441,7 @@ JS
$("#wiz_form").data("installation_status", "running");
WizardUpdateButtons();
$('#setup_msg').html('$sMessage');
- $('#progress').progression( {Current:{$aRes['percentage-completed']}, Maximum: 100, aBackgroundImg: GetAbsoluteUrlAppRoot()+'setup/orange-progress.gif', aTextColor: '#000000'} );
+ $('#progress').progression( {Current:{$aRes['percentage-completed']}, Maximum: 100, aBackground: '#FBD38D', aTextColor: '#000000'} );
//$("#percentage").html('{$aRes['percentage-completed']} % completed
{$aRes['next-step-label']}');
ExecuteStep('{$aRes['next-step']}');
@@ -2446,7 +2454,7 @@ EOF
$oPage->add_ready_script(
<<