From 18d3fecd54e6499c6d7441f06995e1b432a4b841 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Thu, 10 Nov 2016 15:09:37 +0100
Subject: [PATCH] hackfest : add special char button to ckeditor
---
VERSIONS_WIP/hackfes_add_special_char_ckeditor | 1 +
library/ZendAfi/View/Helper/CkEditor.php | 14 ++++++++------
.../controllers/CmsControllerListModeTest.php | 1 -
3 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 VERSIONS_WIP/hackfes_add_special_char_ckeditor
diff --git a/VERSIONS_WIP/hackfes_add_special_char_ckeditor b/VERSIONS_WIP/hackfes_add_special_char_ckeditor
new file mode 100644
index 00000000000..6bed7b521d5
--- /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 395c7f26b28..6beb989f124 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 64d466ab2e6..37867fd569a 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());
--
GitLab