From ebcf19b9ec8068f9a528c561cef2901bbaa4798f Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 9 Dec 2017 02:19:23 +0900
Subject: [PATCH] Fix #958 missing option for comment content style

---
 modules/editor/lang/en.php          |  7 ++++---
 modules/editor/lang/ko.php          |  3 ++-
 modules/editor/tpl/admin_index.html | 23 ++++++++++++++++++++---
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/modules/editor/lang/en.php b/modules/editor/lang/en.php
index d970c3066..2419c8867 100644
--- a/modules/editor/lang/en.php
+++ b/modules/editor/lang/en.php
@@ -1,8 +1,8 @@
 <?php
 $lang->editor_component = 'Editor Component';
-$lang->main_editor = 'Main editor';
-$lang->comment_editor = 'Comment editor';
-$lang->editor_option = 'Editor Options';
+$lang->main_editor = 'Main Editor';
+$lang->comment_editor = 'Comment Editor';
+$lang->editor_common_settings = 'Common Settings';
 $lang->guide_choose_main_editor = 'Main editor';
 $lang->guide_set_height_main_editor = 'Main editor height';
 $lang->guide_set_main_editor_toolbar = 'Main editor toolbar';
@@ -15,6 +15,7 @@ $lang->guide_additional_mobile_css = 'Additional CSS Files for Mobile';
 $lang->guide_additional_plugins = 'Load additional plugins';
 $lang->guide_remove_plugins = 'Remove plugins';
 $lang->guide_choose_text_formatting = 'Text formatting style';
+$lang->guide_choose_comment_text_formatting = 'Text formatting style';
 $lang->guide_choose_font_preview = 'Preview';
 $lang->guide_choose_font_body = 'Default font';
 $lang->guide_choose_font_size_body = 'Default font size';
diff --git a/modules/editor/lang/ko.php b/modules/editor/lang/ko.php
index 325bda73c..2e80a7ebb 100644
--- a/modules/editor/lang/ko.php
+++ b/modules/editor/lang/ko.php
@@ -3,7 +3,6 @@ $lang->editor_now = '현재 설정 상태';
 $lang->editor_component = '에디터 컴포넌트';
 $lang->main_editor = '본문 에디터';
 $lang->comment_editor = '댓글 에디터';
-$lang->editor_option = '에디터 옵션';
 $lang->guide_choose_main_editor = '본문 에디터';
 $lang->guide_set_height_main_editor = '본문 에디터 높이';
 $lang->guide_set_main_editor_toolbar = '본문 에디터 도구상자';
@@ -13,12 +12,14 @@ $lang->guide_set_comment_editor_toolbar = '댓글 에디터 도구상자';
 $lang->editor_toolbar_default = '기본';
 $lang->editor_toolbar_simple = '간단';
 $lang->editor_toolbar_hide = '숨김';
+$lang->editor_common_settings = '공통 설정';
 $lang->guide_additional_css = 'CSS 파일 추가';
 $lang->about_additional_css = '웹폰트 등의 CSS를 에디터 내부에서 추가로 로딩하려면 한 줄에 하나씩 URL을 입력해 주십시오.';
 $lang->guide_additional_mobile_css = '모바일 CSS 파일 추가';
 $lang->guide_additional_plugins = '추가 플러그인 로드';
 $lang->guide_remove_plugins = '플러그인 제거';
 $lang->guide_choose_text_formatting = '본문 서식';
+$lang->guide_choose_comment_text_formatting = '댓글 서식';
 $lang->guide_choose_font_preview = '미리보기';
 $lang->guide_choose_font_body = '본문 글꼴';
 $lang->guide_choose_font_size_body = '글꼴 크기';
diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html
index 776762c8a..799c9a000 100644
--- a/modules/editor/tpl/admin_index.html
+++ b/modules/editor/tpl/admin_index.html
@@ -27,12 +27,13 @@
 
 <!-- Editor Option -->
 <section class="section">
-	<h1>{$lang->editor_option}</h1>
 	<form action="./" method="post" ruleset="generalConfig" class="x_form-horizontal">
 		<input type="hidden" name="module" value="editor" />
 		<input type="hidden" name="act" value="procEditorAdminGeneralConfig" />
 		<input type="hidden" name="xe_validator_id" value="modules/editor/tpl/admin_index/1" />
 
+		<h1>{$lang->main_editor}</h1>
+		
 		<div class="x_control-group">
 			<label for="change_lang_type" class="x_control-label">{$lang->guide_choose_main_editor}</label>
 			<div class="x_controls">
@@ -71,6 +72,19 @@
 				</p>
 			</div>
 		</div>
+		<div class="x_control-group">
+			<label class="x_control-label">{$lang->guide_choose_text_formatting}</label>
+			<div class="x_controls">
+					<!--@foreach($content_style_list as $key => $val)-->
+					<label class="x_inline">
+						<input type="radio" name="content_style" value="{$key}" id="style_{$key}" checked="checked"|cond="$key==$editor_config->content_style||!$editor_config->content_style && $key=='ckeditor_light'"> {$val->title}
+					</label>
+					<!--@end-->
+			</div>
+		</div>
+		
+		<h1>{$lang->comment_editor}</h1>
+	
 		<div class="x_control-group">
 			<label for="sel_comment_editor_colorset" class="x_control-label">{$lang->guide_choose_comment_editor}</label>
 			<div class="x_controls">
@@ -111,15 +125,18 @@
 			</div>
 		</div>
 		<div class="x_control-group">
-			<label class="x_control-label">{$lang->guide_choose_text_formatting}</label>
+			<label class="x_control-label">{$lang->guide_choose_comment_text_formatting}</label>
 			<div class="x_controls">
 					<!--@foreach($content_style_list as $key => $val)-->
 					<label class="x_inline">
-						<input type="radio" name="content_style" value="{$key}" id="style_{$key}" checked="checked"|cond="$key==$editor_config->content_style||!$editor_config->content_style && $key=='ckeditor_light'"> {$val->title}
+						<input type="radio" name="comment_content_style" value="{$key}" id="style_{$key}" checked="checked"|cond="$key==$editor_config->comment_content_style||!$editor_config->comment_content_style && $key=='ckeditor_light'"> {$val->title}
 					</label>
 					<!--@end-->
 			</div>
 		</div>
+		
+		<h1>{$lang->editor_common_settings}</h1>
+		
 		<div class="x_control-group">
 			<label class="x_control-label">{$lang->guide_choose_font_body}</label>
 			<div class="x_controls">