From 69a94718d2676db2f71d2dafa10bf98809a41654 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 10 Apr 2009 01:54:46 +0000 Subject: [PATCH] =?UTF-8?q?xpresseditor=20=EC=97=90=EB=94=94=ED=84=B0=20?= =?UTF-8?q?=EC=8A=A4=ED=82=A8=EC=9D=B4=20=ED=8C=8C=EC=9D=BC=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=98=81=EC=97=AD=EC=9D=B4=20=EB=B0=80?= =?UTF-8?q?=EB=A6=AC=EB=8A=94=20=EB=AC=B8=EC=A0=9C,=20=EC=97=90=EB=94=94?= =?UTF-8?q?=ED=84=B0=EC=9D=98=20=EC=83=81=EB=8B=A8=20=EB=B6=80=EB=B6=84?= =?UTF-8?q?=EC=9D=B4=20=EA=B0=80=EB=A0=A4=EC=A7=80=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6075 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/xe_default/write_form.html | 2 +- modules/editor/skins/xpresseditor/blank.html | 1 + modules/editor/skins/xpresseditor/css/default.css | 4 ++-- modules/editor/skins/xpresseditor/css/style.css | 2 +- modules/editor/skins/xpresseditor/editor.html | 2 +- modules/editor/skins/xpresseditor/js/xe_interface.js | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/board/skins/xe_default/write_form.html b/modules/board/skins/xe_default/write_form.html index 1a7ab5cd0..a671a7d28 100644 --- a/modules/board/skins/xe_default/write_form.html +++ b/modules/board/skins/xe_default/write_form.html @@ -38,7 +38,7 @@ -
{$oDocument->getEditor()}
+
{$oDocument->getEditor()}
diff --git a/modules/editor/skins/xpresseditor/blank.html b/modules/editor/skins/xpresseditor/blank.html index 5635bcfdc..2aa433925 100644 --- a/modules/editor/skins/xpresseditor/blank.html +++ b/modules/editor/skins/xpresseditor/blank.html @@ -1,3 +1,4 @@ + diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css index 300b983e5..23be64396 100644 --- a/modules/editor/skins/xpresseditor/css/default.css +++ b/modules/editor/skins/xpresseditor/css/default.css @@ -352,7 +352,7 @@ .xpress-editor .tool li.extensions .layer li{ margin:2px 0;} /* File Uploader */ -.xpress-editor .fileUploader{ clear:both; position:relative; padding-top:5px; *zoom:1; *margin-bottom:5px;} +.xpress-editor .fileUploader{ clear:both; padding-top:5px; margin-bottom:20px;} .xpress-editor .fileUploader:after{ content:""; display:block; clear:both;} .xpress-editor .fileUploader .preview{ float:left; width:64px; height:64px; border:1px solid #ccc;; padding:2px; margin:0 10px 5px 10px;} .xpress-editor .fileUploader .preview.black { background-color:#000; border:1px solid #666;} @@ -367,4 +367,4 @@ .xpress-editor .fileUploader .file_attach_info{ clear:right; margin:5px 0;} /* Auto Save */ -.xpress-editor .autosave_message { display:none; background: #f6ffdb; padding:6px 10px; margin:0; line-height:1;} \ No newline at end of file +.xpress-editor .autosave_message { display:none; background: #f6ffdb; padding:6px 10px; margin:0; line-height:1;} diff --git a/modules/editor/skins/xpresseditor/css/style.css b/modules/editor/skins/xpresseditor/css/style.css index 6089b05c0..522bac462 100644 --- a/modules/editor/skins/xpresseditor/css/style.css +++ b/modules/editor/skins/xpresseditor/css/style.css @@ -2,7 +2,7 @@ /* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) 200812 */ html, -body{ height:100%;} +body{ height:100%; } #xpressInput{ margin:0 10px 0 0;} .xpressOutput{ font-size:12px; line-height:1.6; font-family:Dotum, AppleGothic, Sans-serif;} diff --git a/modules/editor/skins/xpresseditor/editor.html b/modules/editor/skins/xpresseditor/editor.html index 0c85edc37..b6b133e5a 100644 --- a/modules/editor/skins/xpresseditor/editor.html +++ b/modules/editor/skins/xpresseditor/editor.html @@ -491,4 +491,4 @@ var editor_path = "{$editor_path}"; var auto_saved_msg = "{$lang->msg_auto_saved}"; var oEditor = editorStart_xe("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", "{$editor_height}"); -//]]> \ No newline at end of file +//]]> diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js index 373edeef7..6cb3a7d61 100644 --- a/modules/editor/skins/xpresseditor/js/xe_interface.js +++ b/modules/editor/skins/xpresseditor/js/xe_interface.js @@ -5,7 +5,7 @@ xe.Editors = []; function editorStart_xe(editor_sequence, primary_key, content_key, editor_height) { var textarea = jQuery("#xpress-editor-"+editor_sequence); - var iframe = jQuery('