From 24b43cc9f9ac3cde7aab03785a85688660a97e3e Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 22 Mar 2012 13:54:06 +0100 Subject: [PATCH] Fixing installation UI --- main/inc/global_error_message.inc.php | 41 +++++++++++++-------------- main/install/index.php | 20 ++++--------- 2 files changed, 25 insertions(+), 36 deletions(-) diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php index 016172d050..e27282e0e1 100644 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -51,10 +51,12 @@ 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_file = $css_path.$theme.'default.css'; + $bootstrap_file = $css_path.'bootstrap.css'; + $css_base_file = $css_path.'base.css'; $css_base_chamilo_file = $css_path.'base_chamilo.css'; + + $css_list = array($css_file, $css_base_file, $css_base_chamilo_file, $bootstrap_file); $root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/'; $root_rel = htmlentities($_SERVER['PHP_SELF']); @@ -80,20 +82,13 @@ if (is_int($global_error_code) && $global_error_code > 0) { $installation_guide_url = $root_rel.'documentation/installation_guide.html'; $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); + foreach ($css_list as $css_item) { + $css_base_chamilo_file = $root_sys.$css_item; + if (file_exists($css_base_chamilo_file)) { + $css_def .= @file_get_contents($css_base_chamilo_file); + } } - - $css_file = $root_sys.$css_file; - if (file_exists($css_file)) { - $css_def .= @file_get_contents($css_file); - } - + $css_def = str_replace('behavior:url("/main/css/csshover3.htc");', '', $css_def); $css_def = str_replace('main/', $root_rel.'main/', $css_def); $css_def = str_replace('images/', $root_rel.$css_path.$theme.'images/', $css_def); @@ -169,7 +164,7 @@ if (is_int($global_error_code) && $global_error_code > 0) { // {ORGANISATION} moved from the header $global_error_message_page = << + {TITLE} @@ -209,10 +204,14 @@ if (is_int($global_error_code) && $global_error_code > 0) {
- +
+
+
+  
{POWERED_BY} +
+
+ +
EOM; diff --git a/main/install/index.php b/main/install/index.php index ea95b981be..ba5126b2dc 100644 --- a/main/install/index.php +++ b/main/install/index.php @@ -299,16 +299,12 @@ if ($encryptPassForm == '1') { } elseif ($encryptPassForm == '0') { $encryptPassForm = 'none'; } - ?> - - + — <?php echo get_lang('ChamiloInstallation').' — '.get_lang('Version_').' '.$new_version; ?>