diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php
index 27943a4b79..0422e29bf9 100644
--- a/main/exercice/exercise.lib.php
+++ b/main/exercice/exercise.lib.php
@@ -1,4 +1,4 @@
-<?php // $Id: exercise.lib.php 10281 2006-11-30 23:06:46Z develop-it $
+<?php // $Id: exercise.lib.php 10514 2006-12-15 16:13:53Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -101,9 +101,10 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false)
 			{
 	        #$comment = $objAnswerTmp->selectComment(1);
 	        //
+	
 	$upload_path = api_get_path(REL_COURSE_PATH).$_SESSION['_course']['path'].'/document/';
 	$oFCKeditor = new FCKeditor("choice[".$questionId."]") ;
-	$oFCKeditor->BasePath = api_get_path(WEB_LIBRARY_PATH)."fckeditor/";
+	$oFCKeditor->BasePath	= api_get_path(WEB_PATH) . 'main/inc/lib/fckeditor/' ;
 	//$oFCKeditor->Config['CustomConfigurationsPath'] = api_get_path(WEB_PATH)."claroline/inc/lib/fckeditor_new/myconfig.js?".time(); //to clear cache we use time() but always clear history manually
 	/*
 	$oFCKeditor->Config['ImageBrowserURL'] = $oFCKeditor->BasePath . "editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/php/connector.php&ServerPath=/$upload_path/";
@@ -136,6 +137,8 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false)
 			$oFCKeditor->Config['VideoUploadURL'] = $oFCKeditor->BasePath . "editor/filemanager/upload/php/upload.php?Type=Video&ServerPath=$upload_path" ;
 
 	$oFCKeditor->ToolbarSet = 'Comment' ;*/
+	$oFCKeditor->Config['CustomConfigurationsPath'] = api_get_path(REL_PATH)."main/inc/lib/fckeditor/myconfig.js";
+	$oFCKeditor->ToolbarSet = "Small";
 	$oFCKeditor->Width  = '800';
 	$oFCKeditor->Height = '300';
 	$oFCKeditor->Value	= '' ;
diff --git a/main/exercice/feedback.php b/main/exercice/feedback.php
index 764db4645b..992eb80e0c 100644
--- a/main/exercice/feedback.php
+++ b/main/exercice/feedback.php
@@ -39,7 +39,7 @@ Display::display_header($nameTools,"Exercise");
 	$ans =  $objAnswerTmp->answer[$i];
 	$fck_attribute['Width'] = '600';
 	$fck_attribute['Height'] = '200';
-	$fck_attribute['ToolbarSet'] = 'Comment';
+	$fck_attribute['ToolbarSet'] = 'Small';
 	$form = new FormValidator('feedbackform','post',$_SERVER['PHP_SELF']."?modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
 	$obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST');
 $renderer =& $obj_registration_form->defaultRenderer();
diff --git a/main/exercice/statement_admin.inc.php b/main/exercice/statement_admin.inc.php
index 1b0c8eadaf..fdd0d5c1f4 100644
--- a/main/exercice/statement_admin.inc.php
+++ b/main/exercice/statement_admin.inc.php
@@ -1,4 +1,4 @@
-<?php // $Id: statement_admin.inc.php 10234 2006-11-28 13:43:34Z develop-it $
+<?php // $Id: statement_admin.inc.php 10514 2006-12-15 16:13:53Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -49,6 +49,9 @@ if(!defined('ALLOWED_TO_INCLUDE'))
 //debug var. Set to 0 if you don't want any debug display
 $debug = 0;
 
+$fck_attribute['Width'] = '700';
+$fck_attribute['Height'] = '300';
+$fck_attribute['ToolbarSet'] = 'Small';
 
 // the question form has been submitted
 // this question form is the one below.
@@ -256,9 +259,7 @@ $user = array("questionDescription"=>$questionDescription,
                     "questionName"=>$questionName,
                     "answerType"=>$defaultType);
 
-$fck_attribute['Width'] = '600';
-$fck_attribute['Height'] = '300';
-$fck_attribute['ToolbarSet'] = 'Question';
+
 $form = new FormValidator('introduction_text','post',$_SERVER['PHP_SELF']."?modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
 //$renderer =&$form->defaultRenderer();
 //$renderer->setElementTemplate('<div align ="left">{element}</div>');
@@ -271,8 +272,8 @@ $form = new FormValidator('introduction_text','post',$_SERVER['PHP_SELF']."?modi
 //$form->addelement('static','label1',get_lang('Question'));
 $form->addelement('text','questionName',get_lang('Question'));
 $form->addelement('hidden','myid',$_REQUEST['myid']);
-//$form->add_html_editor('questionDescription',get_lang('QuestionDescription'),false);
-$form->addElement('html_editor','questionDescription',get_lang('QuestionDescription'),false);
+$form->add_html_editor('questionDescription', get_lang('questionDescription'));
+//$form->addElement('html_editor','questionDescription',get_lang('QuestionDescription'),false);
 if($okPicture)
 	{
 	$form->addelement('checkbox','deletePicture',get_lang('DeletePicture'));
diff --git a/main/inc/lib/fckeditor/myconfig.js b/main/inc/lib/fckeditor/myconfig.js
index f4f986657c..c4da5b868e 100644
--- a/main/inc/lib/fckeditor/myconfig.js
+++ b/main/inc/lib/fckeditor/myconfig.js
@@ -31,12 +31,15 @@ FCKConfig.ToolbarSets["Question"] = [
 	['Style','FontFormat','FontName','FontSize'],['Attachment']
 ] ;
 
-
 FCKConfig.ToolbarSets["Middle"] = [
 	['FontSize'],['Bold','Italic','TextColor'],['OrderedList','UnorderedList'],
 	['Rule','Link','Table'],['Image','Flash']
 ] ;
 
+FCKConfig.ToolbarSets["Small"] = [
+	['Bold','Italic','Underline','StrikeThrough','Link','Image','Flash','OrderedList','UnorderedList','Table','OrderedList','UnorderedList']
+] ;
+
 FCKConfig.ToolbarSets["Full"] = [
 	['Save','Templates','PasteWord','Link','-','Image','Flash','Video','MP3','Table','Rule','-','Subscript', 'Superscript','-','OrderedList','UnorderedList','Outdent','Indent','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],'/',['FontName','FontSize','Bold','Italic','Underline','StrikeThrough','TextColor', 'BGColor','-','Source']
 ] ;
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 36c29e5ba3..6b1ade8138 100644
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -5053,8 +5053,7 @@ class learnpath {
 		$tbl_lp_item = Database::get_course_table('lp_item');
 		$tbl_doc = Database::get_course_table(TABLE_DOCUMENT);
 		
-		$path_parts = pathinfo($extra_info[16]);
-		
+		$path_parts = pathinfo($extra_info['dir']);		
 		$no_display_edit_textarea=false;
 		
 		//If action==edit document
@@ -5317,6 +5316,7 @@ class learnpath {
 									
 									
 									if(!$no_display_edit_textarea){
+										
 										$oFCKeditor = new FCKeditor('content_lp') ;
 										$oFCKeditor->BasePath	= api_get_path(WEB_PATH) . 'main/inc/lib/fckeditor/' ;
 										$oFCKeditor->Height		= '400';
diff --git a/main/newscorm/lp_controller.php b/main/newscorm/lp_controller.php
index ae42cbdf86..629afe149b 100644
--- a/main/newscorm/lp_controller.php
+++ b/main/newscorm/lp_controller.php
@@ -42,7 +42,8 @@ if ($is_allowed_in_course == false){
 	Display::display_footer();
 }
 
-require_once(api_get_path(LIBRARY_PATH) . "/fckeditor.lib.php");
+//require_once(api_get_path(LIBRARY_PATH) . "/fckeditor.lib.php");
+require_once(api_get_path(LIBRARY_PATH) . "/fckeditor/fckeditor.php");
 $lpfound = false;
 
 $myrefresh = 0;
diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php
index ef160395ad..61e62c7f1b 100644
--- a/main/newscorm/lp_view.php
+++ b/main/newscorm/lp_view.php
@@ -165,7 +165,7 @@ if($_SESSION['oLP']->mode == 'fullscreen'){
 		$audio_recorder_studentview = false;
 	}
 	?>
-	<frameset rows="150,600">
+	<frameset rows="150,*">
 		<frame id="header" src="lp_header.php" border="0" frameborder="0" scrolling="no" />
 		<frameset cols="195,*">
 			<frameset rows="<?php echo($displayAudioRecorder?'60,':'');?>475,95,80,*">