From e1485a6a69c4394f388d3a6078ac24196a0ca26c Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 22 Mar 2007 02:03:15 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@594
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 .../components/quotation/tpl/popup.html       |  4 +--
 .../editor/components/quotation/tpl/popup.js  |  2 +-
 modules/editor/tpl/editor.html                | 30 +++++++++----------
 modules/editor/tpl/js/editor.js               |  3 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/modules/editor/components/quotation/tpl/popup.html b/modules/editor/components/quotation/tpl/popup.html
index e4a2a2353..97feb4a64 100644
--- a/modules/editor/components/quotation/tpl/popup.html
+++ b/modules/editor/components/quotation/tpl/popup.html
@@ -7,9 +7,9 @@
     <div class="editor_title">{$lang->quotation}</div>
 
     <div class="header">{$lang->quotation_use_folder}</div>
-    <div class="body"><input type="checkbox" id="quotation_use" value="Y" checked="true" onclick="toggle_folder(this)" /></div>
+    <div class="body"><input type="checkbox" id="quotation_use" value="Y" onclick="toggle_folder(this)" /></div>
 
-    <div id="folder_area" style="display:block">
+    <div id="folder_area" style="display:none">
         <div class="header">{$lang->quotation_opener}</div>
         <div class="body"><input type="text" class="editor_input_long" id="quotation_opener" value="{$lang->quotation_cmd_opener}" /></div>
 
diff --git a/modules/editor/components/quotation/tpl/popup.js b/modules/editor/components/quotation/tpl/popup.js
index da354b3f9..74a77ac39 100644
--- a/modules/editor/components/quotation/tpl/popup.js
+++ b/modules/editor/components/quotation/tpl/popup.js
@@ -130,7 +130,7 @@ function insertQuotation() {
 
     if(!content) content = "&nbsp;";
 
-    var text = "\n<div editor_component=\"quotation\" use_folder=\""+use_folder+"\" folder_opener=\""+folder_opener+"\" folder_closer=\""+folder_closer+"\" bold=\""+bold+"\" color=\""+color+"\" margin=\""+margin+"\" padding=\""+padding+"\" border_style=\""+border_style+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\""+style+"\">"+content+"</div>\n";
+    var text = "\n<div editor_component=\"quotation\" use_folder=\""+use_folder+"\" folder_opener=\""+folder_opener+"\" folder_closer=\""+folder_closer+"\" bold=\""+bold+"\" color=\""+color+"\" margin=\""+margin+"\" padding=\""+padding+"\" border_style=\""+border_style+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\""+style+"\">"+content+"</div>\n<br />";
 
     if(selected_node) {
         selected_node.setAttribute("use_folder", use_folder);
diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html
index 28ba82658..26179676b 100644
--- a/modules/editor/tpl/editor.html
+++ b/modules/editor/tpl/editor.html
@@ -40,23 +40,23 @@
 
     <!-- 에디팅 관련 아이콘 -->
     <div class="editor_iconbox">
-      <img src="./images/bold.gif" alt="{$lang->edit->help_bold}" class="editor_icon" id="component_{$upload_target_srl}_Bold" />
-      <img src="./images/italic.gif" alt="{$lang->edit->help_italic}" class="editor_icon" id="component_{$upload_target_srl}_Italic" />
-      <img src="./images/underline.gif" alt="{$lang->edit->help_underline}" class="editor_icon" id="component_{$upload_target_srl}_Underline" />
-      <img src="./images/strike.gif" alt="{$lang->edit->help_strike}" class="editor_icon" id="component_{$upload_target_srl}_StrikeThrough" />
-      <img src="./images/undo.gif" alt="{$lang->edit->help_undo}" class="editor_icon" id="component_{$upload_target_srl}_undo" />
-      <img src="./images/redo.gif" alt="{$lang->edit->help_redo}" class="editor_icon" id="component_{$upload_target_srl}_redo" />
+      <img src="./images/bold.gif" title="{$lang->edit->help_bold}" class="editor_icon" id="component_{$upload_target_srl}_Bold" />
+      <img src="./images/italic.gif" title="{$lang->edit->help_italic}" class="editor_icon" id="component_{$upload_target_srl}_Italic" />
+      <img src="./images/underline.gif" title="{$lang->edit->help_underline}" class="editor_icon" id="component_{$upload_target_srl}_Underline" />
+      <img src="./images/strike.gif" title="{$lang->edit->help_strike}" class="editor_icon" id="component_{$upload_target_srl}_StrikeThrough" />
+      <img src="./images/undo.gif" title="{$lang->edit->help_undo}" class="editor_icon" id="component_{$upload_target_srl}_undo" />
+      <img src="./images/redo.gif" title="{$lang->edit->help_redo}" class="editor_icon" id="component_{$upload_target_srl}_redo" />
     </div>
 
     <!-- 에디팅 관련 문단 기능 (IE에서는 사용자 선택시 나타남) -->
     <div id="editor_paragraph_{$upload_target_srl}" class="editor_iconbox">
-      <img src="./images/align_left.gif" alt="{$lang->edit->help_align_left}" id="component_{$upload_target_srl}_justifyleft" />
-      <img src="./images/align_center.gif" alt="{$lang->edit->help_align_center}" id="component_{$upload_target_srl}_justifycenter" />
-      <img src="./images/align_right.gif" alt="{$lang->edit->help_align_right}" id="component_{$upload_target_srl}_justifyright" />
-      <img src="./images/remove_indent.gif" alt="{$lang->edit->help_remove_indent}" id="component_{$upload_target_srl}_outdent" />
-      <img src="./images/add_indent.gif" alt="{$lang->edit->help_add_indent}" id="component_{$upload_target_srl}_indent" />
-      <img src="./images/list_number.gif" alt="list number" id="component_{$upload_target_srl}_insertorderedlist" />
-      <img src="./images/list_bullet.gif" alt="list bullet" id="component_{$upload_target_srl}_insertunorderedlist" />
+      <img src="./images/align_left.gif" title="{$lang->edit->help_align_left}" id="component_{$upload_target_srl}_justifyleft" />
+      <img src="./images/align_center.gif" title="{$lang->edit->help_align_center}" id="component_{$upload_target_srl}_justifycenter" />
+      <img src="./images/align_right.gif" title="{$lang->edit->help_align_right}" id="component_{$upload_target_srl}_justifyright" />
+      <img src="./images/remove_indent.gif" title="{$lang->edit->help_remove_indent}" id="component_{$upload_target_srl}_outdent" />
+      <img src="./images/add_indent.gif" title="{$lang->edit->help_add_indent}" id="component_{$upload_target_srl}_indent" />
+      <img src="./images/list_number.gif" title="list number" id="component_{$upload_target_srl}_insertorderedlist" />
+      <img src="./images/list_bullet.gif" title="list bullet" id="component_{$upload_target_srl}_insertunorderedlist" />
     </div>
 
   </div>
@@ -65,7 +65,7 @@
     <!-- 컴포넌트 -->
     <div id="editor_component_{$upload_target_srl}" class="editor_iconbox">
       <!--@foreach($component_list as $component)-->
-      <img src="../components/{$component}/icon.gif" alt="{$component}" class="editor_icon" id="component_{$upload_target_srl}_{$component}" />
+      <img src="../components/{$component}/icon.gif" title="{$component}" class="editor_icon" id="component_{$upload_target_srl}_{$component}" />
       <!--@end-->
     </div>
   </div>
@@ -91,7 +91,7 @@
   <input type="hidden" name="act" value="procUploadFile" />
 
   <!-- 미리보기 -->
-  <div class="editor_preview_uploaded" id="preview_uploaded_{$upload_target_srl}"><img src="./images/blank.gif" width="100" height="100"  alt="preview" /></div>
+  <div class="editor_preview_uploaded" id="preview_uploaded_{$upload_target_srl}"><img src="./images/blank.gif" width="100" height="100"  title="preview" /></div>
 
   <!-- 파일 업로드 영역 -->
   <div class="editor_uploader">
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index c2295ac26..39517209f 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -54,6 +54,7 @@ function editorStart(upload_target_srl) {
         '<link rel="stylesheet" href="'+editor_path+'/css/editor.css" type="text/css" />'+
         '</head><body style="background-color:#FFFFFF;font-family:'+default_font+';font-size:9pt;" upload_target_srl="'+upload_target_srl+'">'+
         content+
+        "\n"+
         '</body></html>'+
         '';
     contentDocument.designMode = 'on';
@@ -112,7 +113,7 @@ function editorGetContent(upload_target_srl) {
     html = xInnerHtml(iframe_obj.contentWindow.document.body);
     if(!html) return;
 
-    return html.trim();
+    return html;
 }
 
 // 에디터 내의 선택된 부분의 html 코드를 return