From d6291a65a3ea31cd77796059685361459790a468 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 9 Apr 2011 15:12:20 +0000
Subject: [PATCH] Change to replace fckeditor with ckeditor by default

---
 htdocs/lib/doleditor.class.php | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php
index 8caf4e079cb..448ed29b78f 100644
--- a/htdocs/lib/doleditor.class.php
+++ b/htdocs/lib/doleditor.class.php
@@ -50,7 +50,7 @@ class DolEditor
 
     /**
      *      Create an object to build an HTML area to edit a large string content
-     *      
+     *
      *      @param 	htmlname		        Nom formulaire html WYSIWIG
      *      @param 	content			        Contenu edition WYSIWIG
      *      @param	width					Largeur en pixel de la zone edition (auto by default)
@@ -152,15 +152,35 @@ class DolEditor
             {
             	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
 
+            	//$skin='kama';
+            	//$skin='office2003';
+            	//$skin='v2';
+            	$skin='kama';
+
             	print '<script type="text/javascript">
             			jQuery(document).ready(function () {
             				CKEDITOR.replace(\''.$this->htmlname.'\',
             					{
-            						customConfig : \''.DOL_URL_ROOT.'/theme/'.$conf->theme.'/ckeditor/config.js\',
+            						customConfig : \''.dol_buildpath('/theme/'.$conf->theme.'/ckeditor/config.js',1).'\',
             						toolbar: \''.$this->toolbarname.'\',
             						toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
             						width: '.($this->width ? $this->width : '\'\'').',
-            						height: '.$this->height.'
+            						height: '.$this->height.',
+            						skin: \''.$skin.'\',
+                                    on :   {
+                                                instanceReady : function( ev )
+                                                {
+                                                    // Output paragraphs as <p>Text</p>.
+                                                    this.dataProcessor.writer.setRules( \'p\',
+                                                        {
+                                                            indent : false,
+                                                            breakBeforeOpen : true,
+                                                            breakAfterOpen : false,
+                                                            breakBeforeClose : false,
+                                                            breakAfterClose : true
+                                                        });
+                                                }
+                                            }
             					});
 
             			});