diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php
index 4ef9c0c43..9f89afd59 100644
--- a/modules/communication/communication.admin.controller.php
+++ b/modules/communication/communication.admin.controller.php
@@ -18,7 +18,7 @@
**/
function procCommunicationAdminInsertConfig() {
// 기본 정보를 받음
- $args = Context::gets('skin','colorset','editor_skin');
+ $args = Context::gets('skin','colorset','editor_skin','editor_colorset');
if(!$args->skin) $args->skin = "default";
if(!$args->colorset) $args->colorset = "white";
diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php
index 185d0d431..23eaf8d6b 100644
--- a/modules/communication/communication.view.php
+++ b/modules/communication/communication.view.php
@@ -125,6 +125,7 @@
$option->disable_html = true;
$option->height = 300;
$option->skin = $this->communication_config->editor_skin;
+ $option->colorset = $this->communication_config->editor_colorset;
$editor = $oEditorModel->getEditor($logged_info->member_srl, $option);
Context::set('editor', $editor);
diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html
index 3d96f34a9..c1bd08727 100644
--- a/modules/communication/tpl/index.html
+++ b/modules/communication/tpl/index.html
@@ -1,4 +1,5 @@
+
{$lang->communication} {$lang->cmd_management}
@@ -11,11 +12,16 @@
{$lang->editor_skin} |
- |
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 2b872a1ff..1271910a1 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -83,9 +83,11 @@
**/
function procMemberAdminInsertConfig() {
// 기본 정보를 받음
- $args = Context::gets('webmaster_name','webmaster_email','skin','colorset','enable_openid','enable_join','enable_confirm','enable_ssl','limit_day','after_login_url','after_logout_url','redirect_url','agreement','profile_image','profile_image_max_width','profile_image_max_height','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height','signature_max_height','editor_skin');
+ $args = Context::gets('webmaster_name','webmaster_email','skin','colorset','enable_openid','enable_join','enable_confirm','enable_ssl','limit_day','after_login_url','after_logout_url','redirect_url','agreement','profile_image','profile_image_max_width','profile_image_max_height','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height','signature_max_height','editor_skin','editor_colorset');
if(!$args->skin) $args->skin = "default";
if(!$args->colorset) $args->colorset = "white";
+ if(!$args->editor_skin) $args->editor_skin= "default";
+ if(!$args->editor_colorset) $args->editor_colorset = "white";
if($args->enable_join!='Y') $args->enable_join = 'N';
if($args->enable_ssl!='Y') $args->enable_ssl = 'N';
if($args->enable_openid!='Y') $args->enable_openid= 'N';
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 838f9bd4b..eef077373 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -114,6 +114,7 @@
$option->disable_html = true;
$option->height = 200;
$option->skin = $this->member_config->editor_skin;
+ $option->colorset = $this->member_config->editor_colorset;
$editor = $oEditorModel->getEditor($member_info->member_srl, $option);
Context::set('editor', $editor);
}
diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html
index 510047c21..203330d89 100644
--- a/modules/member/tpl/member_config.html
+++ b/modules/member/tpl/member_config.html
@@ -1,4 +1,5 @@
+
@@ -99,11 +100,16 @@
{$lang->editor_skin} |
-
+
+
+
+
|