diff -r 81842341dc5a -r adccf7c023ef src/cm/templates/site/macros/text_editor.html
--- a/src/cm/templates/site/macros/text_editor.html	Fri Apr 16 10:34:54 2010 +0200
+++ b/src/cm/templates/site/macros/text_editor.html	Tue Apr 20 10:34:56 2010 +0200
@@ -2,10 +2,13 @@
 <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/lib/markitup/1.1.5/markitup/jquery.markitup.js"></script>
 <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/markitup/sets.js"></script>
 
+<script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/ckeditor/ckeditor.js"></script>
+
 <link rel="stylesheet" type="text/css" href="{{ CM_MEDIA_PREFIX }}js/lib/markitup/1.1.5/markitup/skins/markitup/style.css" />
 <link rel="stylesheet" type="text/css" href="{{ CM_MEDIA_PREFIX }}css/markitup/style.css" />
 <link rel="stylesheet" type="text/css" href="{{ CM_MEDIA_PREFIX }}css/markitup/editor.css" />
 
+
 <script type="text/javascript" >
 
 /* yes 2 different variables */
@@ -26,7 +29,25 @@
 	                $('#id_content').markItUp(myMarkdownSettings);
 	                break;
 	            case 'html':
-	                $('#id_content').markItUp(myHTMLSettings);
+	                //$('#id_content').markItUp(myHTMLSettings);
+					CKEDITOR.replace( 'id_content',
+					    {
+							language : '{{ LANGUAGE_CODE }}',
+							toolbar : 'CMToolbar',
+							toolbar_CMToolbar : [['Source','-','Templates'], //'Save','NewPage','Preview','-',
+												 ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print'], //,'SpellChecker','Scayt'
+												 ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+												 //['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
+												 '/',
+												 ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
+												 ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
+												 ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+												 ['Link','Unlink','Anchor'],
+												 ['Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],'/', //'Image','Flash',
+												 ['Styles','Format','Font','FontSize'],
+												 ['TextColor','BGColor'],
+												 ['Maximize','ShowBlocks','-','About']]							
+					    });	                
 	                break;
 	        }
 	        return false;