diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php index 177e1f741..0fd2f3621 100644 --- a/modules/communication/communication.admin.controller.php +++ b/modules/communication/communication.admin.controller.php @@ -19,7 +19,9 @@ **/ function procCommunicationAdminInsertConfig() { // get the default information - $args = Context::gets('skin','colorset','editor_skin','editor_colorset', 'mskin', 'layout_srl', 'mlayout_srl'); + $args = Context::gets('skin','colorset','editor_skin','sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl'); + $args->editor_colorset = $args->sel_editor_colorset; + unset($args->sel_editor_colorset); if(!$args->skin) $args->skin = 'default'; if(!$args->colorset) $args->colorset = 'white'; diff --git a/modules/communication/communication.admin.model.php b/modules/communication/communication.admin.model.php index 073b9b917..626d800bd 100644 --- a/modules/communication/communication.admin.model.php +++ b/modules/communication/communication.admin.model.php @@ -19,10 +19,22 @@ **/ function getCommunicationAdminColorset() { $skin = Context::get('skin'); + $type = Context::get('type') == 'P' ? 'P' : 'M'; + Context::set('type', $type); + + if($type == 'P') + { + $dir = 'skins'; + } + else + { + $dir = 'm.skins'; + } + if(!$skin) $tpl = ""; else { $oModuleModel = &getModel('module'); - $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin); + $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin, $dir); Context::set('skin_info', $skin_info); $oModuleModel = &getModel('module'); @@ -39,6 +51,7 @@ } $this->add('tpl', $tpl); + $this->add('type', $type); } } diff --git a/modules/communication/skins/default/send_message.html b/modules/communication/skins/default/send_message.html index c49eb25cb..4e6a90b16 100644 --- a/modules/communication/skins/default/send_message.html +++ b/modules/communication/skins/default/send_message.html @@ -1,6 +1,11 @@ -

{$lang->cmd_send_message}

-
+ + +
+

{$lang->cmd_send_message}

+
+ +

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/communication/tpl/colorset_list.html b/modules/communication/tpl/colorset_list.html index 22c8bd9fe..f32201e5d 100644 --- a/modules/communication/tpl/colorset_list.html +++ b/modules/communication/tpl/colorset_list.html @@ -5,8 +5,10 @@ {@ $_width = 200; $_height = 20; $_talign = "left"; }
- colorset==$val->name)-->checked="checked"/> - + colorset==$val->name)-->checked="checked"/> + mcolorset==$val->name)-->checked="checked"/> + +
{$val->title} diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html index e1bda3ddc..3e9d1c44f 100644 --- a/modules/communication/tpl/index.html +++ b/modules/communication/tpl/index.html @@ -1,76 +1,87 @@ -

{$lang->communication} {$lang->cmd_management}

-

{nl2br($lang->about_communication)}

-
+ +
+

{$lang->communication} {$lang->cmd_management}

+
+ +

{nl2br($lang->about_communication)}

+ +

{$XE_VALIDATOR_MESSAGE}

- + + -
- - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->editor_skin} - - - -
{$lang->layout} - -
{$lang->skin} - -
{$lang->colorset}
{$lang->mobile_layout} - -
{$lang->mobile_skin} - -
+ +
+ +
+ + + +
-
- +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+ +
+
diff --git a/modules/communication/tpl/js/communication_admin.js b/modules/communication/tpl/js/communication_admin.js index f98c745ac..405f3ce10 100644 --- a/modules/communication/tpl/js/communication_admin.js +++ b/modules/communication/tpl/js/communication_admin.js @@ -1,14 +1,32 @@ /* 스킨 컬러셋 구해옴 */ -function doGetSkinColorset(skin) { +function doGetSkinColorset(skin, type) { var params = new Array(); params['skin'] = skin; + params['type'] = type; - var response_tags = new Array('error','message','tpl'); + var response_tags = new Array('error','message','tpl', 'type'); exec_xml('communication', 'getCommunicationAdminColorset', params, doDisplaySkinColorset, response_tags); } function doDisplaySkinColorset(ret_obj) { var tpl = ret_obj["tpl"]; - jQuery('#communication_colorset').html(tpl); + var type = ret_obj['type']; + var $controls = null; + var $control_group = null; + + if(type == 'P'){ + $controls = jQuery('#communication_colorset'); + $control_group = jQuery('#__skin_colorset'); + }else{ + $controls = jQuery('#communication_mcolorset'); + $control_group = jQuery('#__mskin_colorset'); + } + + $controls.html(tpl); + if(tpl){ + $control_group.show(); + }else{ + $control_group.hide(); + } } diff --git a/modules/editor/tpl/js/editor_module_config.js b/modules/editor/tpl/js/editor_module_config.js index 3213e2502..343887d6c 100644 --- a/modules/editor/tpl/js/editor_module_config.js +++ b/modules/editor/tpl/js/editor_module_config.js @@ -36,7 +36,13 @@ function resultGetEditorSkinColorList(ret_obj,response_tags, params) { } var selectAttr = ""; for(var i=0;i'+it[i].title+'')); + var $options = $(''); + + if(params.selected_colorset == it[i].name){ + $options.attr('selected', 'selected'); + } + + selectbox.append($options); } selectbox.show(); }else{