Removing the "fix" CSS files cllas #3544

Author: jmontoyaa

main/inc/global_error_message.inc.php

@@ -53,8 +53,8 @@
 	$css_path = 'main/css/';
 	$css_file = $css_path.$theme.'default.css';
 
-	$css_base_file         = $css_path.'fix.css';
-	$css_base_chamilo_file = $css_path.'fix_chamilo.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']);
@@ -78,24 +78,21 @@
 	}
 
 	$installation_guide_url = $root_rel.'documentation/installation_guide.html';
-
-	$css_file = $root_sys.$css_file;
-	if (file_exists($css_file)) {
-		$css_def = @file_get_contents($css_file);
-	} else {
-		$css_def = '';
-	}
 
+	$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;
+    $css_base_file = $root_sys.$css_base_file;
     if (file_exists($css_base_file)) {
         $css_def .= @file_get_contents($css_base_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);

main/inc/header.inc.php

@@ -110,16 +110,6 @@
 //Course CSS
 echo '@import "'.api_get_path(WEB_CSS_PATH).$my_style.'/course.css";';
 
-//Fix CSS
-echo '@import "'.api_get_path(WEB_CSS_PATH).'fix.css";';
-
-//Fix chamilo CSS
-if (in_array(api_get_visual_theme(), array('chamilo','chamilo_red','chamilo_blue','chamilo_orange','chamilo_green','chamilo_electric_blue'))) {
-    echo '@import "'.api_get_path(WEB_CSS_PATH).'fix_chamilo.css";';
-} else {
-    echo '@import "'.api_get_path(WEB_CSS_PATH).'fix_classic.css";';
-}
-
 if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
     echo 'img, div { behavior: url('.api_get_path(WEB_LIBRARY_PATH).'javascript/iepngfix/iepngfix.htc) } ';
 }

main/inc/reduced_header.inc.php

@@ -106,15 +106,6 @@
 
 //Default CSS
 echo '@import "'.api_get_path(WEB_CSS_PATH).$my_style.'/default.css";';
-
-//Fix CSS
-echo '@import "'.api_get_path(WEB_CSS_PATH).'fix.css";';
-//Fix chamilo CSS
-if (in_array(api_get_visual_theme(), array('chamilo','chamilo_red','chamilo_blue','chamilo_orange','chamilo_green','chamilo_electric_blue'))) {
-    echo '@import "'.api_get_path(WEB_CSS_PATH).'fix_chamilo.css";';
-} else {
-    echo '@import "'.api_get_path(WEB_CSS_PATH).'fix_classic.css";';
-}
 ?>
 /*]]>*/
 </style>

main/install/index.php

@@ -307,9 +307,9 @@
 	<title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
 	<style type="text/css" media="screen, projection">
 		/*<![CDATA[*/
-		@import "../css/<?php echo api_get_visual_theme(); ?>/default.css";
-        @import "../css/fix_chamilo.css";
-        @import "../css/fix.css";
+		@import "../css/base.css";
+		@import "../css/base_chamilo.css";        
+		@import "../css/<?php echo api_get_visual_theme(); ?>/default.css";        
 		/*]]>*/
 	</style>
 	<script type="text/javascript" src="../inc/lib/javascript/jquery.js"></script>