diff --git a/VERSIONS_WIP/hackfes_add_special_char_ckeditor b/VERSIONS_WIP/hackfes_add_special_char_ckeditor new file mode 100644 index 0000000000000000000000000000000000000000..6bed7b521d534e2fc729bafc90bf942255f605b4 --- /dev/null +++ b/VERSIONS_WIP/hackfes_add_special_char_ckeditor @@ -0,0 +1 @@ + - hackfest : Ckeditor : ajout du bouton caratères spéciaux \ No newline at end of file diff --git a/library/ZendAfi/View/Helper/CkEditor.php b/library/ZendAfi/View/Helper/CkEditor.php index 395c7f26b28a3116d2ef0e107519ac0a384188f1..6beb989f124848f4bc8281454ca11d7ca2e3a4d4 100644 --- a/library/ZendAfi/View/Helper/CkEditor.php +++ b/library/ZendAfi/View/Helper/CkEditor.php @@ -50,7 +50,7 @@ class ZendAfi_View_Helper_CkEditor extends ZendAfi_View_Helper_BaseHelper '/', ['HorizontalRule'], ['Link','Unlink','Anchor'], - ['Image','Flash','Table','Iframe','oembed','Slideshow'], + ['Image','Flash','Table','Iframe','oembed','Slideshow', 'SpecialChar'], ]; $config['extraAllowedContent'] = [ @@ -83,11 +83,13 @@ class ZendAfi_View_Helper_CkEditor extends ZendAfi_View_Helper_BaseHelper $config['toolbar'][]=['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField']; } - $config['toolbar']=array_merge($config['toolbar'],['/', - ['Styles','FontSize','TextColor','BGColor'], - ['Bold','Italic','Underline','Strike'], - ['NumberedList','BulletedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock']]); + $config['toolbar']=array_merge($config['toolbar'], + ['/', + ['Styles','FontSize','TextColor','BGColor'], + ['Bold','Italic','Underline','Strike'], + ['NumberedList','BulletedList','-','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'] + ]); $config['extraPlugins'] = 'colordialog'; diff --git a/tests/application/modules/admin/controllers/CmsControllerListModeTest.php b/tests/application/modules/admin/controllers/CmsControllerListModeTest.php index 64d466ab2e6232a901384109c34ca7dffaa65e3c..37867fd569a70e3779d69f918a8723c2b21240b1 100644 --- a/tests/application/modules/admin/controllers/CmsControllerListModeTest.php +++ b/tests/application/modules/admin/controllers/CmsControllerListModeTest.php @@ -370,7 +370,6 @@ class CmsControllerListModeAdminBibSearchTest extends CmsControllerListModeTestC } - /** @test */ public function newsFromPortailShouldNotBePresent() { $this->assertNotXPathContentContains('//td', 'News from portail', $this->_response->getBody());