From c82126a198ef88777a4dd0ce4beb2427a43b3856 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sun, 22 Jul 2012 18:22:42 -0500 Subject: [PATCH] Improved installation process a little showing current step and please wait message - refs #3285 --- main/css/base.css | 4 +++- main/install/index.php | 18 ++++++++++++++++-- main/install/install.lib.php | 13 ++----------- main/lang/english/install.inc.php | 7 +++++-- main/lang/english/registration.inc.php | 2 +- main/lang/english/trad4all.inc.php | 2 +- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/main/css/base.css b/main/css/base.css index f4dbc8aee0..f5b7f654f3 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -4492,4 +4492,6 @@ data table select#question_type_hidden option[value="14"] {background-image: url(../img/icons/32/mcmagl.gif);} } - +.btn-success.btn-install{ + float: right; +} diff --git a/main/install/index.php b/main/install/index.php index 78ffe2d94b..fb4c042910 100644 --- a/main/install/index.php +++ b/main/install/index.php @@ -500,7 +500,7 @@ if ($encryptPassForm == '1') { $update_from_version = isset($update_from_version) ? $update_from_version : null; $instalation_type_label = get_lang('UpdateFromDokeosVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : ''); } - if (!empty($instalation_type_label)) { + if (!empty($instalation_type_label) && empty($_POST['step6'])) { echo '

'.$instalation_type_label.'

'; } ?> @@ -720,6 +720,19 @@ if (@$_POST['step2']) { //STEP 6 : INSTALLATION PROCESS + $current_step = 7; + $msg = get_lang('InstallExecution'); + if ($installType == 'update') { + $msg = get_lang('UpdateExecution'); + } + echo '
'. + '

'.display_step_sequence() . $msg.'

'. + '
'.get_lang('PleaseWaitThisCouldTakeAWhile').'
'; + '
'; + // Push the web server to send these strings before we start the real + // installation process + flush(); ob_flush(); + if ($installType == 'update') { require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; @@ -829,8 +842,9 @@ if (@$_POST['step2']) { include 'install_db.inc.php'; include 'install_files.inc.php'; } - $current_step = 7; display_after_install_message($installType); + //Hide the "please wait" message sent previously + echo ''; } elseif (@$_POST['step1'] || $badUpdatePath) { //STEP 1 : REQUIREMENTS diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 0adc0b8da9..a17e156084 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -2024,16 +2024,7 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo * After installation is completed (step 6), this message is displayed. */ function display_after_install_message($installType) { - ?> -
-

-
- -
- -
- - '.get_lang('FirstUseTip').''; echo '
'; echo ''.get_lang('SecurityAdvice').''; echo ': '; @@ -2041,7 +2032,7 @@ function display_after_install_message($installType) { echo '
'; ?>
- + %s will be created"; $ADatabaseWithTheSameNameAlreadyExists = "A database with the same name already exists."; $UserXCantHaveAccessInTheDatabaseX = "User %s doesn't have access in the database %s"; $DatabaseXCantBeCreatedUserXDoestHaveEnoughPermissions = "Database %s can't be created, user %s doesn't have enough permissions"; -$CourseTestWasCreated = "Course test was created"; -?> \ No newline at end of file +$CourseTestWasCreated = "A test course has been created successfully"; +$InstallExecution = "Installation process execution"; +$UpdateExecution = "Update process execution"; +$PleaseWaitThisCouldTakeAWhile = "Please wait. This could take a while..."; +?> diff --git a/main/lang/english/registration.inc.php b/main/lang/english/registration.inc.php index 975f6c2168..b740d098ae 100644 --- a/main/lang/english/registration.inc.php +++ b/main/lang/english/registration.inc.php @@ -148,7 +148,7 @@ $SubscribeUserToCourseAsTeacher = "Enroll teachers"; $SendMessage = "Send message"; $PasswordEncryptedForSecurity = "Your password is encrypted for security reasons. Thus, after pressing the link an e-mail will be sent to you again with your password."; $UsersUnsubscribed = "The selected users have been unsubscribed from the training"; -$SystemUnableToSendEmailContact = "Portal unable to send email contact"; +$SystemUnableToSendEmailContact = "This platform was unable to send the email. Please contact"; $OpenIDCouldNotBeFoundPleaseRegister = "This OpenID could not be found in our database. Please register for a new account. If you have already an account with us, please edit your profile inside your account to add this OpenID"; $UsernameMaxXCharacters = "The login needs to be maximum %s characters long"; $PictureUploaded = "Your picture has been uploaded"; diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php index 6fcf6820d1..05afefe158 100644 --- a/main/lang/english/trad4all.inc.php +++ b/main/lang/english/trad4all.inc.php @@ -1202,7 +1202,7 @@ $XStarsOutOf5 = "%s stars out of 5"; $Visit = "Visit"; $Visits = "Visits"; $YourVote = "Your vote"; -$HottestCourses = "Hottest courses"; +$HottestCourses = "Most popular courses"; $SentAtX = "Sent at: %s"; $dateTimeFormatShort = "%b %d, %Y at %I:%M %p"; $dateTimeFormatShortTimeFirst = "%I:%M %p, %b %d %Y";