diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php index b1a97de71..0d6243113 100644 --- a/modules/editor/editor.controller.php +++ b/modules/editor/editor.controller.php @@ -86,6 +86,8 @@ class editorController extends editor else $module_srl = array($module_srl); $editor_config = new stdClass; + $editor_config->default_editor_settings = Context::get('default_editor_settings'); + if($editor_config->default_editor_settings !== 'Y') $editor_config->default_editor_settings = 'N'; $editor_config->editor_skin = Context::get('editor_skin'); $editor_config->comment_editor_skin = Context::get('comment_editor_skin'); $editor_config->content_style = Context::get('content_style'); diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php index d0dd2777b..272a014f9 100644 --- a/modules/editor/editor.view.php +++ b/modules/editor/editor.view.php @@ -108,7 +108,7 @@ class editorView extends editor $info = $oModuleModel->loadSkinInfo($this->module_path,$style,'styles'); $content_style_list[$style] = new stdClass(); $content_style_list[$style]->title = $info->title; - } + } Context::set('content_style_list', $content_style_list); // Get a group list $oMemberModel = getModel('member'); @@ -121,7 +121,7 @@ class editorView extends editor $security->encodeHTML('group_list..title'); $security->encodeHTML('group_list..description'); $security->encodeHTML('content_style_list..'); - $security->encodeHTML('editor_comment_colorset_list..title'); + $security->encodeHTML('editor_comment_colorset_list..title'); // Set a template file $oTemplate = &TemplateHandler::getInstance(); diff --git a/modules/editor/lang/en.php b/modules/editor/lang/en.php index cbdbe5a99..5cf1f7597 100644 --- a/modules/editor/lang/en.php +++ b/modules/editor/lang/en.php @@ -41,6 +41,7 @@ $lang->msg_auto_saved = 'Automatically Saved.'; $lang->cmd_disable = 'Inactive'; $lang->cmd_enable = 'Active'; $lang->cmd_select_cover = 'Be a cover image'; +$lang->default_editor_settings = 'Default settings for this module'; $lang->editor_skin = 'Editor Skin'; $lang->upload_file_grant = 'Permission to upload files'; $lang->enable_default_component_grant = 'Permission to use default components'; @@ -49,6 +50,7 @@ $lang->enable_html_grant = 'Permission to edit HTML'; $lang->enable_autosave = 'Enable Auto-Save'; $lang->height_resizable = 'Height Resizable'; $lang->editor_height = 'Height of Editor'; +$lang->about_default_editor_settings = 'Follow editor settings of Rhymix Admin page through whole site.'; $lang->about_content_font = 'Please use comma for multiple input.'; $lang->about_content_font_size = 'Please input units such as px or em.'; $lang->about_enable_autosave = 'You may decide whether the auto-save function will be used.'; diff --git a/modules/editor/lang/ko.php b/modules/editor/lang/ko.php index 3df0e1144..847580e6b 100644 --- a/modules/editor/lang/ko.php +++ b/modules/editor/lang/ko.php @@ -42,6 +42,7 @@ $lang->msg_auto_saved = '자동 저장되었습니다.'; $lang->cmd_disable = '비활성'; $lang->cmd_enable = '활성'; $lang->cmd_select_cover = '커버이미지로 선택'; +$lang->default_editor_settings = '기본 에디터 설정 사용'; $lang->editor_skin = '에디터 스킨'; $lang->upload_file_grant = '파일 첨부 권한'; $lang->enable_default_component_grant = '기본 컴포넌트 사용 권한'; @@ -50,6 +51,7 @@ $lang->enable_html_grant = 'HTML 편집 권한'; $lang->enable_autosave = '자동저장 사용'; $lang->height_resizable = '높이 조절 가능'; $lang->editor_height = '에디터 높이'; +$lang->about_default_editor_settings = '사이트 전체 에디터 설정을 통일하여서 모듈별 에디터 설정을 단순하게 합니다.'; $lang->about_content_font = '콤마(,)로 여러 폰트를 지정할 수 있습니다.'; $lang->about_content_font_size = '12px, 1em등 단위까지 포함해서 입력해주세요.'; $lang->about_enable_autosave = '글 작성 시 자동 저장 기능을 활성화 시킬 수 있습니다.'; diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html index 054403925..6cfdc6802 100644 --- a/modules/editor/tpl/editor_module_config.html +++ b/modules/editor/tpl/editor_module_config.html @@ -18,6 +18,15 @@ + {$lang->default_editor_settings} + + + + + {$lang->editor_skin} - + {$lang->content_style} - + {$lang->editor_height} px @@ -60,14 +69,14 @@ px - + content_font)}" placeholder="Ex) Tahoma, Geneva, sans-serif" /> {$lang->about_content_font} - + {$lang->about_content_font_size} @@ -122,3 +131,20 @@ + + \ No newline at end of file