diff --git a/main/css/base.css b/main/css/base.css index 4abcedc524..bf9998fbf6 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -695,4 +695,8 @@ button:hover { div.system_announcement { background-color: #EEEEEE; +} + +.RequirementHeading, .RequirementText, .RequirementContent { + margin-top:12px; } \ No newline at end of file diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php index caa17f609f..b3a811a2b1 100755 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -52,7 +52,9 @@ if (is_int($global_error_code) && $global_error_code > 0) { $theme = 'chamilo/'; $css_path = 'main/css/'; $css_file = $css_path.$theme.'default.css'; - + + $css_base_file = $css_path.'base.css'; + $css_base_chamilo_file = $css_path.'base_chamilo.css'; $root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/'; $root_rel = htmlentities($_SERVER['PHP_SELF']); @@ -83,6 +85,17 @@ if (is_int($global_error_code) && $global_error_code > 0) { } else { $css_def = ''; } + + $css_base_chamilo_file = $root_sys.$css_base_chamilo_file; + if (file_exists($css_base_chamilo_file)) { + $css_def .= @file_get_contents($css_base_chamilo_file); + } + $css_base_file = $root_sys.$css_base_file; + if (file_exists($css_base_file)) { + $css_def .= @file_get_contents($css_base_file); + } + + $css_def = str_replace('behavior:url("/main/css/csshover3.htc");', '', $css_def); $css_def = str_replace('main/', $root_rel.'main/', $css_def); @@ -92,7 +105,6 @@ if (is_int($global_error_code) && $global_error_code > 0) { $global_error_message = array(); switch ($global_error_code) { - case 1: $global_error_message['section'] = $SectionSystemRequirementsProblem; $global_error_message['title'] = $IncorrectPhpVersionTitle; @@ -109,7 +121,6 @@ if (is_int($global_error_code) && $global_error_code > 0) { } $global_error_message['description'] = $IncorrectPhpVersionDescription; break; - case 2: $global_error_message['section'] = $SectionInstallation; $global_error_message['title'] = $InstallationTitle; @@ -122,7 +133,6 @@ if (is_int($global_error_code) && $global_error_code > 0) { '.$read_installation_guide.''; $global_error_message['description'] = $InstallationDescription; break; - case 3: case 4: case 5: @@ -153,7 +163,8 @@ if (is_int($global_error_code) && $global_error_code > 0) { $global_error_message['encoding'] = 'UTF-8'; $global_error_message['css'] = $css_def; - + $global_error_message['chamilo_logo'] = $root_rel.$css_path.$theme.'images/header-logo.png'; + // {ORGANISATION} moved from the header $global_error_message_page = @@ -173,6 +184,9 @@ if (is_int($global_error_code) && $global_error_code > 0) {
@@ -620,7 +621,8 @@ if ($_POST['step2']) {
'; ?> - '.$dbNameForm; ?>'.get_lang('ReadWarningBelow').')'; ?>
+ '.$dbNameForm; ?> + '.get_lang('ReadWarningBelow').')'; ?>
'.$dbStatsForm.''; diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 50c431eeea..d418e1ad53 100644 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -993,13 +993,15 @@ function display_language_selection_box($name = 'language_list', $default_langua */ function display_language_selection() { ?> - -:
++ +* @author Patrick Cool:
+, Ghent University */ function display_requirements($installType, $badUpdatePath, $updatePath = '', $update_from_version_8 = array(), $update_from_version_6 = array()) { - echo ' '.display_step_sequence().get_lang('Requirements')."
\n"; + echo '"; + echo ''.display_step_sequence().get_lang('Requirements')."
'; echo ''.get_lang('ReadThoroughly').''; // SERVER REQUIREMENTS echo '
'; echo get_lang('MoreDetails').' '.get_lang('ReadTheInstallGuide').'.
'."\n"; if ($installType == 'update') { echo get_lang('IfYouPlanToUpgradeFromOlderVersionYouMightWantToHaveAlookAtTheChangelog').'
'."\n"; } + echo ''.get_lang('ServerRequirements').'
'; @@ -1347,9 +1351,10 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u */ function display_license_agreement() { - echo ''.display_step_sequence().get_lang('Licence').'
'; + echo ''; ?>'.display_step_sequence().get_lang('Licence').'
'; echo ''.get_lang('DokeosLicenseInfo').'
'; echo ''; + echo '
@@ -1593,20 +1598,21 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo if (empty($dbUserForm)) { $dbUserForm = $singleDbForm ? $dbNameForm : $dbPrefixForm.'chamilo_user'; } - echo ' ' . display_step_sequence() .get_lang('DBSetting') . '
'; + echo ''; + echo '' . display_step_sequence() .get_lang('DBSetting') . '
'; echo get_lang('DBSettingUpgradeIntro'); - + echo ''; } else { - if (empty($dbPrefixForm)) { //make sure there is a default value for db prefix $dbPrefixForm = 'chamilo_'; } - echo '' . display_step_sequence() .get_lang('DBSetting') . '
'; + echo ''; + echo '' . display_step_sequence() .get_lang('DBSetting') . '
'; + echo ''; echo get_lang('DBSettingIntro'); + echo ''; } - - ?> -
+ ?>@@ -1744,9 +1750,12 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo if ($installType != 'update' && empty($languageForm)) { $languageForm = $_SESSION['install_language']; } - + echo ' \n'; echo "'; + echo '" . display_step_sequence() . get_lang("CfgSetting") . "
"; + echo ''; echo ''; echo "'.get_lang('ConfigSettingsInfo').' main/inc/conf/configuration.php
'; + echo '"; echo " "; @@ -1884,14 +1893,16 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo */ function display_after_install_message($installType, $nbr_courses) { ?> +
- ++ ++-
'; - //echo ''; echo ''.get_lang('SecurityAdvice').''; echo ': '; printf(get_lang('ToProtectYourSiteMakeXAndYReadOnly'), 'main/inc/conf/configuration.php', 'main/install/index.php');