diff --git a/common/css/default.css b/common/css/default.css index d6dd87403..ce5749b1e 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -26,7 +26,7 @@ form { margin:0; padding:0; } *:first-child+html .inputTypeText { font-size:9pt; } .inputTypeText:hover, .inputTypeText:focus { background:#f4f4f4; } -.inputTypeTextArea { border:1px solid !important; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6 !important; background:#ffffff; font-size:1em; _font-size:9pt;} +.inputTypeTextArea { border:1px solid !important; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6 !important; background:#ffffff; font-size:1em; _font-size:9pt; height:100px;} *:first-child+html .inputTypeTextArea { font-size:9pt; } .w40 { width:40px; } diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index 947227bc7..804cd33c5 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -67,9 +67,11 @@ function editorGetSelectedNode(editor_sequence) { /** * editor 시작 (editor_sequence로 iframe객체를 얻어서 쓰기 모드로 전환) **/ +var _editorFontColor = new Array(); function editorStart(editor_sequence, primary_key, content_key, editor_height, font_color) { if(typeof(font_color)=='undefined') font_color = '#000'; + _editorFontColor[editor_sequence] = font_color; // iframe obj를 찾음 var iframe_obj = editorGetIFrame(editor_sequence); @@ -519,11 +521,11 @@ function showEditorExtension(evt,editor_sequence){ } } -function showPreviewContent(ret_obj,response_tags, params, fo_obj) { - var preview_obj = editorGetPreviewArea(params.editor_sequence); - if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+params.editor_sequence).style.display='none'; -// alert(ret_obj.content); - xInnerHtml(preview_obj, ret_obj.content); +function showPreviewContent(editor_sequence) { + if(typeof(editor_sequence)=='undefined') return; + if(typeof(_editorFontColor[editor_sequence])=='undefined') return; + var preview_obj = editorGetPreviewArea(editor_sequence); + preview_obj.contentWindow.document.body.style.color = _editorFontColor[editor_sequence]; } function setPreviewHeight(editor_sequence){ diff --git a/modules/editor/tpl/preview.html b/modules/editor/tpl/preview.html index ce0fc1b4a..15e26a14f 100644 --- a/modules/editor/tpl/preview.html +++ b/modules/editor/tpl/preview.html @@ -1 +1,4 @@ -{$content} \ No newline at end of file + +{$content} diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index 17dc1205f..39d1214b5 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -145,7 +145,7 @@
{$lang->about_member_description}