fix: impossibilité de désactiver la correction orthographique

fix: impossibilité de désactiver l'affichage des info de développement cleanup: meilleure lisibilité des barres d'outils feature: desactivation des plugins inutilisés
10 years ago · 27bd48c7de
7 changed files with 521 additions and 39 deletions
--- a/ckeditor4spip.js.html
+++ b/ckeditor4spip.js.html
@ -320,7 +320,7 @@ function fullInitCKEDITOR(editor_ids){

 			if ($('.after_'+editor_md5).length==0) {
 				$(editor_id).after('<span id="cke_cpt_'+ndx+'" class="after_'+editor_md5+'"></span>');
-	[(#CONFIG{ckeditor/ignoreversion}|non)
+	[(#CONFIG{ckeditor/ignoreversion}|=={'on'}|non)
 				if(CKEDITOR.version<CKEDITOR.ckpreferedversion){
 					var pref='<:ckeditor:version_preferee:>';
 					$('#cke_cpt_'+ndx).prepend(
--- a/ckeditor_fonctions.php
+++ b/ckeditor_fonctions.php
@ -273,6 +273,10 @@ function ckeditor_preparescript($config) {
 	static $init_done = false ;
 	if (!$init_done) {
 			$cke_cfg= array() ;
+			$removePlugins = array() ;
+			$allPlugins = array('about', 'blockquote', 'div', 'docprops', 'find', 'flash', 'horizontalrule', 'iframe', 'image', 'indent', 'justify', 'link', 'list', 'maximize', 'newpage', 'pagebreak', 'pastefromword', 'pastetext', 'placeholder', 'preview', 'print', 'removeformat', 'save', 'selection', 'showblocks', 'smiley', 'sourcearea', 'specialchar', 'table', 'templates', 'uicolor', 'undo', 'wsc', 'colorbutton','scayt','basicstyles','forms') ;
+			$requiredPlugins = array('clipboard','basicstyles','list','link','about') ; // requis par la barre d'outils basique
+
 			foreach($_COOKIE as $cookie => $value) { // fix pb avec la langue du dictionnaire
 				if (preg_match('~^scayt_~', $cookie)) {
 					@setcookie($cookie, '') ; // on efface les cookis du système SCAYT (Spell Check As You Type)
@ -332,6 +336,7 @@ function ckeditor_preparescript($config) {
 				}
 			}

+			$cke_cfg['forcePasteAsPlainText'] = ckeditor_lire_config('pastetext', _CKE_PASTETEXT_DEF) ;
 			$cfgCK_Smileys = ckeditor_cfgCK_Smileys() ;
 			if (is_array($GLOBALS['toolbars'])) {
 				$tbsize = 0 ;
@ -341,12 +346,13 @@ function ckeditor_preparescript($config) {
 					if (is_array($toolbar)) {
 						$thissize = 0 ;
 						foreach($toolbar as $tool => $item) {
+							if (($tool == 'PasteFromWord') && ($cke_cfg['forcePasteAsPlainText'])) continue ;
 							if (count($pluginsboutons) && ($tool == $plugposref) && ($plug_pos == 'avant')) {
 								$thissize += 24 * count($pluginsboutons) ;
 								$tb = array_merge($tb,$pluginsboutons) ;
 							}
-							if (ckeditor_lire_config("tool_$tool", $item[1]) &&
-								(!$html2spip || $item[2]) && // outil interdit par html2spip
+							if (ckeditor_lire_config("tool_$tool", $item[_CKE_DEFAULT]) &&
+								(!$html2spip || $item[_CKE_COMPAT]) && // outil interdit par html2spip
 								( // cas particulier d'outils absents ou désactivés
 									(($tool != 'Format') || ckeditor_lire_config("formats", _CKE_FORMATS_DEF)) &&
 									(($tool != 'Smiley') || $cfgCK_Smileys) &&
@ -375,8 +381,9 @@ function ckeditor_preparescript($config) {
 										$cke_cfg['smiley_path'] = $cfgCK_Smileys[2]  ;
 										break ;
 								} 
-								$thissize += $item[0] ;	
+								$thissize += $item[_CKE_SIZE] ;	
 								$tb[] = $tool ;
+								$requiredPlugins[] = $item[_CKE_PLUGIN] ;
 							}
 			
 							if (count($pluginsboutons) && ($tool == $plugposref) && ($plug_pos == 'apres')) {
@ -528,7 +535,7 @@ function ckeditor_preparescript($config) {
 			$cke_cfg['extraPlugins'] = join(',', array_keys($pluginsactifs)) ;
 			$cke_cfg['loadExtraPlugins'] = $pluginsactifs ;

-			if (ckeditor_lire_config('devtools', _CKE_DEVTOOLS_DEF)) {
+			if (ckeditor_lire_config('devtools', _CKE_DEVTOOLS_DEF)=='on') {
 				$cke_cfg['extraPlugins'] .= ($cke_cfg['extraPlugins']?',':'').'devtools' ;
 			}

@ -550,7 +557,7 @@ function ckeditor_preparescript($config) {
 			$ENTERMODE = array('ENTER_P'=>CKEDITOR_ENTER_P, 'ENTER_BR'=>CKEDITOR_ENTER_BR, 'ENTER_DIV'=>CKEDITOR_ENTER_DIV) ;
 			// dernières options de configurations
 			$cke_cfg['height'] = intval(ckeditor_lire_config('taille', _CKE_HAUTEUR_DEF)) ;
-			$cke_cfg['scayt_autoStartup'] = (ckeditor_lire_config('startspellcheck', _CKE_SCAYT_START_DEF)?true:false) ;
+			$cke_cfg['scayt_autoStartup'] = (ckeditor_lire_config('startspellcheck', _CKE_SCAYT_START_DEF)=='on') ;
 			$cke_cfg['scayt_sLang'] = ($config['scayt_sLang']?$config['scayt_sLang']:ckeditor_lire_config('spellchecklang', _CKE_SCAYT_LANG_DEF)) ;
 			$cke_cfg['resize_enabled'] = true ;
 			$cke_cfg['entities'] = false ;
@ -564,7 +571,11 @@ function ckeditor_preparescript($config) {
 			$cke_cfg['readOnly'] = false ;
 			$cke_cfg['spip_contexte'] = array('id'=>$config['id'], 'type'=>$config['type']) ;
 			$cke_cfg['forceEnterMode'] = true ;
-			$cke_cfg['forcePasteAsPlainText'] = ckeditor_lire_config('pastetext', _CKE_PASTETEXT_DEF) ;
+			$removePlugins = array_diff($allPlugins,$requiredPlugins) ;
+			if ($cke_cfg['forcePasteAsPlainText'] && ! in_array('pastefromword', $removePlugins)) {
+				$removePlugins[] = 'pastefromword';
+			}
+			$cke_cfg['removePlugins'] = join(',',$removePlugins) ;
 			if(ckeditor_lire_config('conversion', _CKE_CONVERSION_DEF)=='aucune')
 				$cke_cfg['fullPage'] = true ;

--- a/formulaires/configurer_ckeditor.php
+++ b/formulaires/configurer_ckeditor.php
@ -175,14 +175,15 @@ function formulaires_configurer_ckeditor_verifier_dist() {


 function formulaires_configurer_ckeditor_traiter_dist() {
+	print('request:'._request('startspellcheck').'<br/>') ;
 	ecrire_config('ckeditor/editmode',_request('editmode'));
 	ecrire_config('ckeditor/skin',_request('skin'));
 	ecrire_config('ckeditor/taille',_request('taille'));
 	ecrire_config('ckeditor/apercu',_request('apercu'));
-	ecrire_config('ckeditor/startspellcheck',_request('startspellcheck'));
+	ecrire_config('ckeditor/startspellcheck',_request('startspellcheck')=='on'?'on':'off');
 	ecrire_config('ckeditor/spellchecklang',_request('spellchecklang'));
-	ecrire_config('ckeditor/ignoreversion',_request('ignoreversion'));
-	ecrire_config('ckeditor/devtools',_request('devtools'));
+	ecrire_config('ckeditor/ignoreversion',_request('ignoreversion')=='on'?'on':'off');
+	ecrire_config('ckeditor/devtools',_request('devtools')=='on'?'on':'off');
 	return array('message_ok' => _T('ckeditor:ck_ok')) ;
 }

--- a/inc/ckeditor_constantes.php
+++ b/inc/ckeditor_constantes.php
@ -46,6 +46,11 @@ define('_CKE_TAGS_DEF', serialize(array( // le serialize est obligatoire puisque
 	))
 ) ;
 //define('_CKE_HTML2SPIP_DEF', false ) ;
+define('_CKE_SIZE',0);
+define('_CKE_DEFAULT',1);
+define('_CKE_COMPAT',2);
+define('_CKE_ICON',3);
+define('_CKE_PLUGIN',4);
 define('_CKE_CONVERSION_DEF', 'partielle') ;
 define('_CKE_HTML2SPIP_LIMITE_DEF', false ) ;
 define('_CKE_HTML2SPIP_IDENTITE', 'script;embed;param;object') ;
--- a/inc/toolbars.php
+++ b/inc/toolbars.php
@ -1,29 +1,494 @@
 <?php
-/* Description : 
- *     $toolbars = tableau de barres d'outils
- *     une barre d'outils = tableau dont les clés sont les noms des outils et les valeurs
- *     des tableaux : (0=>taille de l'outil, 1=>cet outil doit-il être activé par défaut, 2=>cet outil est-il compatible avec la typo spip, 3=>numéro de l'icons ou unset)
- */
-$GLOBALS['toolbars'] = array(
-	array('Source'=>array(66,0,0,0)),
-	array('SpipSave'=>array(24,0,1,2),'NewPage'=>array(24,0,1,3),'ZpipPreview'=>array(24,0,1,4)),
-	array('Templates'=>array(24,0,1,5)),
-	array('Cut'=>array(24,1,1,6),'Copy'=>array(24,1,1,7),'Paste'=>array(24,1,1,8),'PasteText'=>array(24,1,1,9),'PasteFromWord'=>array(24,0,0,10)),
-	array('Print'=>array(24,0,1,11),'SpellChecker'=>array(24,1,1,12),'Scayt'=>array(32,1,1,12)),
-	array('Undo'=>array(24,1,1,13),'Redo'=>array(24,1,1,14)),
-	array('Find'=>array(24,1,1,15),'Replace'=>array(24,1,1,16)),
-	array('SelectAll'=>array(24,1,1,17),'RemoveFormat'=>array(24,1,1,18)),
-	array('Form'=>array(24,0,0,47),'Checkbox'=>array(24,0,0,48),'Radio'=>array(24,0,0,49),'TextField'=>array(24,0,0,50),'Textarea'=>array(24,0,0,51),'Select'=>array(24,0,0,52),'Button'=>array(24,0,0,53),'ImageButton'=>array(24,0,0,54),'HiddenField'=>array(24,0,0,55)),
-	array('Bold'=>array(24,1,1,19),'Italic'=>array(24,1,1,20),'Underline'=>array(24,1,1,21),'Strike'=>array(24,1,0,22)),
-	array('Subscript'=>array(24,1,1,23),'Superscript'=>array(24,1,1,24)),
-	array('NumberedList'=>array(24,1,1,25),'BulletedList'=>array(24,1,1,26), 'Outdent'=>array(24,1,1,27),'Indent'=>array(24,1,1,28),'Blockquote'=>array(24,0,0,72)),
-	array('JustifyLeft'=>array(24,1,1,29),'JustifyCenter'=>array(24,1,1,30),'JustifyRight'=>array(24,1,1,31),'JustifyBlock'=>array(24,1,1,32)),
-	array('Spip'=>array(24,1,1,81),'Link'=>array(24,1,1,33),'Unlink'=>array(24,1,1,34),'Anchor'=>array(24,1,1,35),'Iframe'=>array(24,0,0,80)),
-	array('SpipModeles'=>array(88,1,1)),
-	array('SpipDoc'=>array(24,1,1,82),'Image'=>array(24,0,0,36),'Flash'=>array(24,0,1,37),'Table'=>array(24,1,1,38),'HorizontalRule'=>array(24,1,1,39),'Smiley'=>array(24,1,1,40),'SpecialChar'=>array(24,1,1,41),'PageBreak'=>array(24,0,0,42)),
-	array('Styles'=>array(91,1,0),'Format'=>array(91,1,1),'Font'=>array(91,1,0),'FontSize'=>array(56,1,0)),
-	array('TextColor'=>array(32,1,0,44),'BGColor'=>array(32,1,0,45)),
-	array('Maximize'=>array(24,1,1,55), 'ShowBlocks'=>array(24,0,1,71),'About'=>array(24,1,1,46))
-) ;
-
+	$GLOBALS['toolbars'] = array(
+		array(
+			'Source'=>array(
+				_CKE_SIZE=>'66',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>0,
+				_CKE_PLUGIN=>'sourcearea'
+			),
+		),
+		array(
+			'SpipSave'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>2
+			),
+			'NewPage'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>3,
+				_CKE_PLUGIN=>'newpage'
+			),
+			'ZpipPreview'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>4
+			),
+		),
+		array(
+			'Templates'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>5,
+				_CKE_PLUGIN=>'templates'
+			),
+		),
+		array(
+			'Cut'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>6,
+				_CKE_PLUGIN=>'clipboard'
+			),
+			'Copy'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>7,
+				_CKE_PLUGIN=>'clipboard'
+			),
+			'Paste'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>8,
+				_CKE_PLUGIN=>'clipboard'
+			),
+			'PasteText'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>9,
+				_CKE_PLUGIN=>'pastetext'
+			),
+			'PasteFromWord'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>10,
+				_CKE_PLUGIN=>'pastefromword'
+			),
+		),
+		array(
+			'Print'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>11,
+				_CKE_PLUGIN=>'print'
+			),
+			'SpellChecker'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>12,
+				_CKE_PLUGIN=>'wsc'
+			),
+			'Scayt'=>array(
+				_CKE_SIZE=>'32',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>12,
+				_CKE_PLUGIN=>'scayt'
+			),
+		),
+		array(
+			'Undo'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>13,
+				_CKE_PLUGIN=>'undo'
+			),
+			'Redo'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>14,
+				_CKE_PLUGIN=>'undo'
+			),
+		),
+		array(
+			'Find'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>15,
+				_CKE_PLUGIN=>'find'
+			),
+			'Replace'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>16,
+				_CKE_PLUGIN=>'find'
+			),
+		),
+		array(
+			'SelectAll'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>17,
+				_CKE_PLUGIN=>'selection'
+			),
+			'RemoveFormat'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>18,
+				_CKE_PLUGIN=>'removeformat'
+			),
+		),
+		array(
+			'Form'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>47,
+				_CKE_PLUGIN=>'forms'
+			),
+			'Checkbox'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>48,
+				_CKE_PLUGIN=>'forms'
+			),
+			'Radio'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>49,
+				_CKE_PLUGIN=>'forms'
+			),
+			'TextField'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>50,
+				_CKE_PLUGIN=>'forms'
+			),
+			'Textarea'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>51,
+				_CKE_PLUGIN=>'forms'
+			),
+			'Select'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>52,
+				_CKE_PLUGIN=>'forms'
+			),
+			'Button'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>53,
+				_CKE_PLUGIN=>'forms'
+			),
+			'ImageButton'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>54,
+				_CKE_PLUGIN=>'forms'
+			),
+			'HiddenField'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>55,
+				_CKE_PLUGIN=>'forms'
+			),
+		),
+		array(
+			'Bold'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>19,
+				_CKE_PLUGIN=>'basicstyles'
+			),
+			'Italic'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>20,
+				_CKE_PLUGIN=>'basicstyles'
+			),
+			'Underline'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>21,
+				_CKE_PLUGIN=>'basicstyles'
+			),
+			'Strike'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>22,
+				_CKE_PLUGIN=>'basicstyles'
+			),
+		),
+		array(
+			'Subscript'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>23,
+				_CKE_PLUGIN=>'basicstyles'
+			),
+			'Superscript'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>24,
+				_CKE_PLUGIN=>'basicstyles'
+			),
+		),
+		array(
+			'NumberedList'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>25,
+				_CKE_PLUGIN=>'list'
+			),
+			'BulletedList'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>26,
+				_CKE_PLUGIN=>'list'
+			),
+			'Outdent'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>27,
+				_CKE_PLUGIN=>'indent'
+			),
+			'Indent'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>28,
+				_CKE_PLUGIN=>'indent'
+			),
+			'Blockquote'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>72,
+				_CKE_PLUGIN=>'blockquote'
+			),
+		),
+		array(
+			'JustifyLeft'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>29,
+				_CKE_PLUGIN=>'justify'
+			),
+			'JustifyCenter'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>30,
+				_CKE_PLUGIN=>'justify'
+			),
+			'JustifyRight'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>31,
+				_CKE_PLUGIN=>'justify'
+			),
+			'JustifyBlock'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>32,
+				_CKE_PLUGIN=>'justify'
+			),
+		),
+		array(
+			'Spip'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>81
+			),
+			'Link'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>33,
+				_CKE_PLUGIN=>'link'
+			),
+			'Unlink'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>34,
+				_CKE_PLUGIN=>'link'
+			),
+			'Anchor'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>35,
+				_CKE_PLUGIN=>'link'
+			),
+			'Iframe'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>80,
+				_CKE_PLUGIN=>'iframe'
+			),
+		),
+		array(
+			'SpipModeles'=>array(
+				_CKE_SIZE=>'88',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1
+			),
+		),
+		array(
+			'SpipDoc'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>82
+			),
+			'Image'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>36,
+				_CKE_PLUGIN=>'image'
+			),
+			'Flash'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>37,
+				_CKE_PLUGIN=>'flash'
+			),
+			'Table'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>38,
+				_CKE_PLUGIN=>'table'
+			),
+			'HorizontalRule'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>39,
+				_CKE_PLUGIN=>'horizontalrule'
+			),
+			'Smiley'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>40,
+				_CKE_PLUGIN=>'smiley'
+			),
+			'SpecialChar'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>41,
+				_CKE_PLUGIN=>'specialchar'
+			),
+			'PageBreak'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>42,
+				_CKE_PLUGIN=>'pagebreak'
+			),
+		),
+		array(
+			'Styles'=>array(
+				_CKE_SIZE=>'91',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>0,
+				_CKE_PLUGIN=>'stylescombo'
+			),
+			'Format'=>array(
+				_CKE_SIZE=>'91',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_PLUGIN=>'format'
+			),
+			'Font'=>array(
+				_CKE_SIZE=>'91',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>0,
+				_CKE_PLUGIN=>'font'
+			),
+			'FontSize'=>array(
+				_CKE_SIZE=>'56',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>0,
+				_CKE_PLUGIN=>'font'
+			),
+		),
+		array(
+			'TextColor'=>array(
+				_CKE_SIZE=>'32',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>44,
+				_CKE_PLUGIN=>'colorbutton',
+			),
+			'BGColor'=>array(
+				_CKE_SIZE=>'32',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>0,
+				_CKE_ICON=>45,
+				_CKE_PLUGIN=>'colorbutton',
+			),
+		),
+		array(
+			'Maximize'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>55,
+				_CKE_PLUGIN=>'maximize'
+			),
+			'ShowBlocks'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>0,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>71,
+				_CKE_PLUGIN=>'showblocks'
+			),
+			'About'=>array(
+				_CKE_SIZE=>'24',
+				_CKE_DEFAULT=>1,
+				_CKE_COMPAT=>1,
+				_CKE_ICON=>46,
+				_CKE_PLUGIN=>'about'
+			),
+		),
+	) ;
 ?>
--- a/paquet.xml
+++ b/paquet.xml
@ -1,7 +1,7 @@
 <paquet
 	prefix="ckeditor"
 	categorie="edition"
-	version="0.16.9"
+	version="0.16.10"
 	etat="dev"
 	compatibilite="[3.0.5;3.0.*]"
 	logo="images/ckspip-logo.png"
--- a/plugin.xml
+++ b/plugin.xml
@ -1,7 +1,7 @@
 <plugin>
 	<nom><multi>[fr]CKEditor pour SPIP[en]CKEditor for SPIP[ar]CKEDITOR &#1604; SPIP</multi></nom>
 	<auteur>Auteurs : [Fr&#233;d&#233;ric Bonnaud->mailto:fred@lea-linux.org], [Mehdi Cherifi (Superyms)->mailto:superyms@gmail.com], [Emmanuel Dreyfus->mailto:manu@netbsd.org]</auteur>
-	<version>0.16.9</version>
+	<version>0.16.10</version>
 	<etat>test</etat>
 	<description>
 		<h3><multi>[fr]Int&#233;gration de l'&#233;diteur WYSIWYG CKEditor à SPIP 2.0.9+[en]Integration of WYSIWYG editor CKEditor with SPIP 2.0.9+[ar]&#1578;&#1603;&#1575;&#1605;&#1604; CKEditor &#1606;&#1575;&#1588;&#1585; &#1604;SPIP 2.0.9+ et SPIP 3.0.4+</multi></h3>