From 63160bf5bfda91f31be7124ff34618361e264e8f Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 27 Jun 2017 18:16:12 +0900
Subject: [PATCH] Implement simple toolbar option for CKEditor

---
 modules/editor/skins/ckeditor/css/default.css |  2 ++
 modules/editor/skins/ckeditor/editor.html     | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 modules/editor/skins/ckeditor/css/default.css

diff --git a/modules/editor/skins/ckeditor/css/default.css b/modules/editor/skins/ckeditor/css/default.css
old mode 100755
new mode 100644
index a9afbba8c..a89efd8b3
--- a/modules/editor/skins/ckeditor/css/default.css
+++ b/modules/editor/skins/ckeditor/css/default.css
@@ -1 +1,3 @@
 p.editor_autosaved_message.autosave_message {display:none;background: #f6ffdb;padding:6px 10px;margin:0;line-height:1;}
+span.cke_combo__fontsize .cke_combo_button { width: 64px; }
+span.cke_combo__fontsize .cke_combo_text { width: 30px; }
diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index c93a95a98..aad591628 100644
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -100,6 +100,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
 	            fontSize_defaultLabel: default_font_size,
 	            fontSize_sizes: font_sizes,
 				toolbarCanCollapse: true,
+				allowedContent: true,
 				language: "{str_replace('jp','ja',$lang_type)}"
 			},
 			loadXeComponent: true,
@@ -135,7 +136,17 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
 		<!--@endif-->
 
 		settings.ckeconfig.toolbarStartupExpanded = {$editor_toolbar_hide ? 'false' : 'true'};
-		
+
+		<!--@if($editor_toolbar === 'simple')-->
+			settings.ckeconfig.toolbar = [
+				{ name: 'styles', items: [ 'Font', 'FontSize', '-', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor' ] },
+				{ name: 'paragraph', items: [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight' ] },
+				{ name: 'clipboard', items: [ 'Cut', 'Copy', 'Paste' ] },
+				{ name: 'insert', items: [ 'Link', 'Image', 'Table' ] },
+				{ name: 'tools', items: [ 'Maximize', '-', 'Source' ] }
+			];
+		<!--@endif-->
+
 		<!--@if(!$html_mode)-->
 			settings.ckeconfig.removeButtons = 'Save,Preview,Print,Cut,Copy,Paste,Source';
 		<!--@endif-->