diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index 37d3275705..b06af7228e 100755 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -947,8 +947,8 @@ this lets the navigation menu appear to the left: margin-left: -5%; } #toolnav { float: right; width: 180px; padding: 0; margin: 0; - margin-left: -5%; /* the difference to make the left colum appear flush left */ -} + margin-left: -5%; /* the difference to make the left colum appear flush left +}*/ /* Hide from IE5-mac. Only IE-win sees this. \*/ * html #toolnav { margin-right: 0px; diff --git a/main/css/chamilo_electric_blue/default.css b/main/css/chamilo_electric_blue/default.css index 4e2497597c..adffeeceb8 100755 --- a/main/css/chamilo_electric_blue/default.css +++ b/main/css/chamilo_electric_blue/default.css @@ -936,8 +936,8 @@ this lets the navigation menu appear to the left: margin-left: -5%; } #toolnav { float: right; width: 180px; padding: 0; margin: 0; - margin-left: -5%; /* the difference to make the left colum appear flush left */ -} + margin-left: -5%; /* the difference to make the left colum appear flush left +}*/ /* Hide from IE5-mac. Only IE-win sees this. \*/ * html #toolnav { margin-right: 0px; diff --git a/main/css/chamilo_green/default.css b/main/css/chamilo_green/default.css index 3eadedfcba..e49c0873bb 100755 --- a/main/css/chamilo_green/default.css +++ b/main/css/chamilo_green/default.css @@ -940,8 +940,8 @@ this lets the navigation menu appear to the left: margin-left: -5%; } #toolnav { float: right; width: 180px; padding: 0; margin: 0; - margin-left: -5%; /* the difference to make the left colum appear flush left */ -} + margin-left: -5%; /* the difference to make the left colum appear flush left +}*/ /* Hide from IE5-mac. Only IE-win sees this. \*/ * html #toolnav { margin-right: 0px; diff --git a/main/css/chamilo_orange/default.css b/main/css/chamilo_orange/default.css index 4f89d4f3f1..c9e2c97ba1 100755 --- a/main/css/chamilo_orange/default.css +++ b/main/css/chamilo_orange/default.css @@ -934,8 +934,8 @@ this lets the navigation menu appear to the left: margin-left: -5%; } #toolnav { float: right; width: 180px; padding: 0; margin: 0; - margin-left: -5%; /* the difference to make the left colum appear flush left */ -} + margin-left: -5%; /* the difference to make the left colum appear flush left +}*/ /* Hide from IE5-mac. Only IE-win sees this. \*/ * html #toolnav { margin-right: 0px; diff --git a/main/css/chamilo_red/default.css b/main/css/chamilo_red/default.css index 4ea6f7eb79..8a33be8e33 100755 --- a/main/css/chamilo_red/default.css +++ b/main/css/chamilo_red/default.css @@ -941,8 +941,8 @@ this lets the navigation menu appear to the left: margin-left: -5%; } #toolnav { float: right; width: 180px; padding: 0; margin: 0; - margin-left: -5%; /* the difference to make the left colum appear flush left */ -} + margin-left: -5%; /* the difference to make the left colum appear flush left +}*/ /* Hide from IE5-mac. Only IE-win sees this. \*/ * html #toolnav { margin-right: 0px; diff --git a/main/css/medical/images/default.css b/main/css/medical/images/default.css index a3176ea7ef..9a0eaf7ba4 100755 --- a/main/css/medical/images/default.css +++ b/main/css/medical/images/default.css @@ -535,8 +535,8 @@ this lets the navigation menu appear to the left: margin-left: -5%; } #toolnav { float: right; width: 180px; padding: 0; margin: 0; - margin-left: -5%; /* the difference to make the left colum appear flush left */ -} + margin-left: -5%; /* the difference to make the left colum appear flush left +}*/ /* Hide from IE5-mac. Only IE-win sees this. \*/ * html #toolnav { margin-right: 0px;} diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css index d76adcf421..8a4eb9ca38 100644 --- a/main/css/public_admin/default.css +++ b/main/css/public_admin/default.css @@ -785,8 +785,8 @@ this lets the navigation menu appear to the left: margin-left: -5%; } #toolnav { float: right; width: 180px; padding: 0; margin: 0; - margin-left: -5%; /* the difference to make the left colum appear flush left */ -} + margin-left: -5%; /* the difference to make the left colum appear flush left +}*/ /* Hide from IE5-mac. Only IE-win sees this. \*/ * html #toolnav { margin-right: 0px; diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css index dbebb1c295..54c66135b8 100644 --- a/main/css/silver_line/default.css +++ b/main/css/silver_line/default.css @@ -714,8 +714,8 @@ float:right; margin-left: -5%; } #toolnav { float: right; width: 180px; padding: 0; margin: -7px 0 0 -5%; - margin-left: -5%; /* the difference to make the left colum appear flush left */ -} + margin-left: -5%; /* the difference to make the left colum appear flush left +}*/ /* Hide from IE5-mac. Only IE-win sees this. \*/ * html #toolnav { margin-right: 0px; diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css index 4dc79d9e02..1b8d702bce 100644 --- a/main/css/sober_brown/default.css +++ b/main/css/sober_brown/default.css @@ -758,8 +758,8 @@ this lets the navigation menu appear to the left: margin-left: -5%; } #toolnav { float: right; width: 180px; padding: 0; margin: 0; - margin-left: -5%; /* the difference to make the left colum appear flush left */ -} + margin-left: -5%; /* the difference to make the left colum appear flush left +}*/ /* Hide from IE5-mac. Only IE-win sees this. \*/ * html #toolnav { margin-right: 0px; diff --git a/main/inc/lib/fckeditor/fcktemplates.xml.php b/main/inc/lib/fckeditor/fcktemplates.xml.php index 7565df445c..4ef00d7864 100755 --- a/main/inc/lib/fckeditor/fcktemplates.xml.php +++ b/main/inc/lib/fckeditor/fcktemplates.xml.php @@ -86,7 +86,18 @@ function loadCSS($css_name) { // Reseting the body's background color to be in white, see Task #1885 and http://www.chamilo.org/en/node/713 $template_css .= "\n".'body { background: #fff; } /* Resetting the background. */'."\n"; - return ' '; + // Removing system-specific styles and cleaning, see task #1282. + $regex = array( + '/\/\*(.+?)\*\//sm' => '', // Removing comments. + '/\r\n/sm' => "\n", // New lines in Unix style. + '/\r/sm' => "\n", // New lines in Unix style. + '/\s*\n/sm' => "\n", // Stripping whitespace from empty lines. + '/\n{2}/sm' => "\n\n" // Removing duplicate empty lines. + + ); + $template_css = preg_replace(array_keys($regex), $regex, $template_css); +//var_dump($template_css); + return "\n".''."\n"; } /**