From 2e14a6f795d5e4208e23480afb5ff55e4ab216fe Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 May 2011 15:54:28 +0200
Subject: [PATCH] Fixing installation styles due the new base.css and
 base_chamilo.css

---
 main/css/base.css                     |  4 +++
 main/inc/global_error_message.inc.php | 26 +++++++++++++----
 main/install/index.php                | 10 ++++---
 main/install/install.lib.php          | 41 +++++++++++++++++----------
 4 files changed, 56 insertions(+), 25 deletions(-)

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) {
 					<a href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
 			$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) {
 		<div id="wrapper">
 			<div id="header">
 				<div id="header1">	
+				    <div id="logo">    
+                        <img vspace="10" hspace="10" alt="Chamilo" src="{CHAMILO_LOGO}">        
+                    </div>
 				</div>
 				<div class="clear"></div>
 				<div id="header2"></div>
@@ -188,7 +202,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 
 			<div id="main">
 				<div style="text-align: center;">
-						<div class="warning-message">{DESCRIPTION}</div>
+						{DESCRIPTION}
 						{CODE}
 				</div>
 			</div>
diff --git a/main/install/index.php b/main/install/index.php
index d6e1ac6351..d6a040e89d 100755
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -605,11 +605,12 @@ if ($_POST['step2']) {
 
 	//STEP 6 : LAST CHECK BEFORE INSTALL
 ?>
-
+    <div class="RequirementHeading">
 	<h2><?php echo display_step_sequence().get_lang('LastCheck'); ?></h2>
-
+	</div>
+    <div class="RequirementContent">
 	<?php echo get_lang('HereAreTheValuesYouEntered'); ?>
-	<br />
+	</div>
 	<strong><?php echo get_lang('PrintThisPageToRememberPassAndOthers'); ?></strong>
 
 	<blockquote>
@@ -620,7 +621,8 @@ if ($_POST['step2']) {
 	<?php echo get_lang('DBLogin').' : '.$dbUsernameForm; ?><br />
 	<?php echo get_lang('DBPassword').' : '.str_repeat('*', api_strlen($dbPassForm)); ?><br />
 	<?php if (!empty($dbPrefixForm)) echo get_lang('DbPrefixForm').' : '.$dbPrefixForm.'<br />'; ?>
-	<?php echo get_lang('MainDB').' : <strong>'.$dbNameForm; ?></strong><?php if ($installType == 'new') echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)'; ?><br />
+	<?php echo get_lang('MainDB').' : <strong>'.$dbNameForm; ?></strong>
+	<?php if ($installType == 'new') echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)'; ?><br />
 	<?php
 	if (!$singleDbForm) {
 		echo get_lang('StatDB').' : <strong>'.$dbStatsForm.'</strong>';
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() { ?>
     <h2><?php get_lang('WelcomeToTheDokeosInstaller'); ?></h2>
-    <h2><?php echo display_step_sequence(); ?><?php echo get_lang('InstallationLanguage'); ?></h2>
-    <p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
+    <div class="RequirementHeading">
+        <h2><?php echo display_step_sequence(); ?><?php echo get_lang('InstallationLanguage'); ?></h2>
+        <p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
     <form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
 <?php display_language_selection_box('language_list', api_get_interface_language()); ?>
     <button type="submit" name="step1" class="next" value="<?php get_lang('Next'); ?> &gt;"><?php echo get_lang('Next'); ?></button>
     <input type="hidden" name="is_executable" id="is_executable" value="-" />
     </form>
+    </div>
 <?php
 }
 
@@ -1016,14 +1018,16 @@ function display_language_selection() { ?>
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  */
 function display_requirements($installType, $badUpdatePath, $updatePath = '', $update_from_version_8 = array(), $update_from_version_6 = array()) {
-    echo '<h2>'.display_step_sequence().get_lang('Requirements')."</h2>\n";
+    echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('Requirements')."</h2></div>";
 
+    echo '<div class="RequirementText">';
     echo '<strong>'.get_lang('ReadThoroughly').'</strong><br />';
     echo get_lang('MoreDetails').' <a href="../../documentation/installation_guide.html" target="_blank">'.get_lang('ReadTheInstallGuide').'</a>.<br />'."\n";
     
     if ($installType == 'update')  {
         echo get_lang('IfYouPlanToUpgradeFromOlderVersionYouMightWantToHaveAlookAtTheChangelog').'<br />'."\n";
     }
+    echo '</div>';
 
     //	SERVER REQUIREMENTS
     echo '<div class="RequirementHeading"><h2>'.get_lang('ServerRequirements').'</h2>';
@@ -1347,9 +1351,10 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
  */
 
 function display_license_agreement() {
-    echo '<h2>'.display_step_sequence().get_lang('Licence').'</h2>';
+    echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('Licence').'</h2>';
     echo '<p>'.get_lang('DokeosLicenseInfo').'</p>';
     echo '<p><a href="../../documentation/license.html" target="_blank">'.get_lang('PrintVers').'</a></p>';
+    echo '</div>';
     ?>
     <table>
         <tr><td>
@@ -1593,20 +1598,21 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
         if (empty($dbUserForm)) {
             $dbUserForm = $singleDbForm ? $dbNameForm : $dbPrefixForm.'chamilo_user';
         }
-        echo '<h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2>';
+        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
+        echo '<div class="RequirementContent">';
         echo get_lang('DBSettingUpgradeIntro');
-
+        echo '</div>';
     } else {
-
         if (empty($dbPrefixForm)) { //make sure there is a default value for db prefix
             $dbPrefixForm = 'chamilo_';
         }
-        echo '<h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2>';
+        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2>';
+        echo '</div>';
+        echo '<div class="RequirementContent">';
         echo get_lang('DBSettingIntro');
+        echo '</div>';                
     }
-
-    ?>
-    <br /><br />
+    ?>    
     </td>
     </tr>
     <tr>
@@ -1744,9 +1750,12 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
     if ($installType != 'update' && empty($languageForm)) {
         $languageForm = $_SESSION['install_language'];
     }
-
+    echo '<div class="RequirementHeading">';
     echo "<h2>" . display_step_sequence() . get_lang("CfgSetting") . "</h2>";
+    echo '</div>';
+    echo '<div class="RequirementContent">';
     echo '<p>'.get_lang('ConfigSettingsInfo').' <strong>main/inc/conf/configuration.php</strong></p>';
+    echo '</div>';
 
     echo "</td></tr>\n<tr><td>";
     echo "<table width=\"100%\">";
@@ -1884,14 +1893,16 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
  */
 function display_after_install_message($installType, $nbr_courses) {
     ?>
+    <div class="RequirementHeading">
     <h2><?php echo display_step_sequence() . get_lang('CfgSetting'); ?></h2>
-
+    </div>
+    
+    <div class="RequirementContent">
     <?php echo get_lang('FirstUseTip'); ?>
+    </div>
 
-    <br /><br />
     <?php
     echo '<div class="warning-message">';
-    //echo '<img src="../img/message_warning.png" style="float:left; margin-right:10px;" alt="'.get_lang('Warning').'"/>';
     echo '<strong>'.get_lang('SecurityAdvice').'</strong>';
     echo ': ';
     printf(get_lang('ToProtectYourSiteMakeXAndYReadOnly'), 'main/inc/conf/configuration.php', 'main/install/index.php');