diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index e7305fdc4..d24030d18 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -148,7 +148,8 @@
'colorset',
'profile_image', 'profile_image_max_width', 'profile_image_max_height',
'image_name', 'image_name_max_width', 'image_name_max_height',
- 'image_mark', 'image_mark_max_width', 'image_mark_max_height'
+ 'image_mark', 'image_mark_max_width', 'image_mark_max_height',
+ 'signature_editor_skin', 'sel_editor_colorset'
);
$list_order = Context::get('list_order');
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index feca88ca6..7e6e91794 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -48,7 +48,7 @@
if(!$config->profile_image_max_height) $config->profile_image_max_height = 80;
if(!$config->skin) $config->skin = 'default';
if(!$config->colorset) $config->colorset = 'white';
- if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = "xpresseditor";
+ if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'xpresseditor';
if(!$config->group_image_mark) $config->group_image_mark = "N";
if (!$config->identifier) $config->identifier = 'user_id';
@@ -62,6 +62,9 @@
$config->layout_srl = $defaultModuleInfo->layout_srl;
}
+ if (!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'xpresseditor';
+ if (!$config->sel_editor_colorset) $config->sel_editor_colorset = 'white';
+
return $config;
}
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index fd2002ed7..6f535501d 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -142,8 +142,8 @@
$option->resizable = false;
$option->disable_html = true;
$option->height = 200;
- $option->skin = $member_config->editor_skin;
- $option->colorset = $member_config->editor_colorset;
+ $option->skin = $member_config->signature_editor_skin;
+ $option->colorset = $member_config->sel_editor_colorset;
$editor = $oEditorModel->getEditor($member_info->member_srl, $option);
Context::set('editor', $editor);
}
diff --git a/modules/member/tpl/js/member_admin_config.js b/modules/member/tpl/js/member_admin_config.js
index b888e1a0f..deeed6ba1 100644
--- a/modules/member/tpl/js/member_admin_config.js
+++ b/modules/member/tpl/js/member_admin_config.js
@@ -86,20 +86,7 @@ jQuery(function($){
});
});
- suForm.find('._imageType')
- .find('input:checkbox:not(:checked)').closest('tr')
- .find('._subItem').hide().end()
- .end()
- .end()
- .find('input:checkbox')
- .change(function(){
- var $subItem = $(this).closest('tr').find('._subItem');
- if($(this).is(':checked')) $subItem.show();
- else $subItem.hide();
- })
- .end();
-
- $('a.modalAnchor._extendFormEdit').bind('before-open.mw', function(event){
+ $('a.modalAnchor._extendFormEdit').bind('before-open.mw', function(event){
var memberFormSrl = $(event.target).parent().attr('id');
var checked = $(event.target).closest('tr').find('input:radio:checked').val();
diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html
index a62239394..0d490100e 100644
--- a/modules/member/tpl/member_config.html
+++ b/modules/member/tpl/member_config.html
@@ -1,4 +1,5 @@