From 69979f99ea62f46de1c51fccd27dd43dec63c655 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 19 Mar 2007 04:05:58 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@532
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 .../editor/components/urllink/tpl/popup.html  |   2 +-
 modules/editor/tpl/css/editor.css             |   7 ++
 modules/editor/tpl/editor.html                | 103 +++++++++---------
 3 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/modules/editor/components/urllink/tpl/popup.html b/modules/editor/components/urllink/tpl/popup.html
index 990660ef8..a5650af60 100644
--- a/modules/editor/components/urllink/tpl/popup.html
+++ b/modules/editor/components/urllink/tpl/popup.html
@@ -11,7 +11,7 @@
 
     <div class="editor_button_area">
       <input type="button" class="editor_button" value="{$lang->cmd_insert}" onclick="setText()" />
-      <intput type="button" class="editor_button" value="{$lang->cmd_close}" onclick="window.close()" />
+      <input type="button" class="editor_button" value="{$lang->cmd_close}" onclick="window.close()" />
     </div>
   </div>
 </form>
diff --git a/modules/editor/tpl/css/editor.css b/modules/editor/tpl/css/editor.css
index f32ba2d7f..bdaee5c1f 100644
--- a/modules/editor/tpl/css/editor.css
+++ b/modules/editor/tpl/css/editor.css
@@ -2,6 +2,13 @@ div.editor_content {
   margin:3px;
 }
 
+div.editor_area_1 {
+}
+
+div.editor_area_2 {
+  clear:left;
+}
+
 div.editor_fontbox {
   margin : 3px 3px 3px 0px;
   float:left;
diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html
index b20754c5d..5c2d3a2b0 100644
--- a/modules/editor/tpl/editor.html
+++ b/modules/editor/tpl/editor.html
@@ -10,56 +10,61 @@
 
 <!-- 에디터 -->
 <div class="editor_content">
-  <!-- 폰트 종류와 크기 -->
-  <div class="editor_fontbox">
-    <select onChange="editorChangeFontName(this,'{$upload_target_srl}')" id="editor_font_{$upload_target_srl}">
-      <option value="">{$lang->edit->fontname}</option>
-      <!--@foreach($lang->edit->fontlist as $key=>$obj)-->
-      <option style="font-family:{$obj}" value="{$obj}">{$obj}</option>
+
+  <div class="editor_area_1">
+    <!-- 폰트 종류와 크기 -->
+    <div class="editor_fontbox">
+      <select onChange="editorChangeFontName(this,'{$upload_target_srl}')" id="editor_font_{$upload_target_srl}">
+        <option value="">{$lang->edit->fontname}</option>
+        <!--@foreach($lang->edit->fontlist as $key=>$obj)-->
+        <option style="font-family:{$obj}" value="{$obj}">{$obj}</option>
+        <!--@end-->
+      </select>
+      <select onChange="editorChangeFontSize(this,'{$upload_target_srl}')" id="editor_fontsize_{$upload_target_srl}">
+        <option value="" selected>{$lang->edit->fontsize}</option>
+        <option value="1">8pt</option>
+        <option value="2">10pt</option>
+        <option value="3">12pt</option>
+        <option value="4">14pt</option>
+        <option value="5">18pt</option>
+        <option value="6">24pt</option>
+        <option value="7">36pt</option>
+      </select>
+    </div>
+
+    <!-- 에디팅 관련 아이콘 -->
+    <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" />
+    </div>
+
+    <!-- 에디팅 관련 문단 기능 (IE에서는 사용자 선택시 나타남) -->
+    <div id="editor_paragraph_{$upload_target_srl}" class="editor_iconbox" style="display:none">
+      <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" />
+    </div>
+
+    <!-- IE의 경우 엔터시 p 태그를 쓸지 br 태그로 변경을 할지 체크하는 항목 -->
+    <div class="editor_parabox" id="editor_use_paragraph_box_{$upload_target_srl}">
+      <input type="checkbox" name="use_paragraph" id="editor_use_paragraph_{$upload_target_srl}" onclick="editorUseParagraph(this,'{$upload_target_srl}');" />
+      <label for="editor_use_paragraph_{$upload_target_srl}">{$lang->edit->use_paragraph}</label>
+    </div>
+  </div>
+
+  <div class="editor_area_2">
+    <!-- 컴포넌트 -->
+    <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}" />
       <!--@end-->
-    </select>
-    <select onChange="editorChangeFontSize(this,'{$upload_target_srl}')" id="editor_fontsize_{$upload_target_srl}">
-      <option value="" selected>{$lang->edit->fontsize}</option>
-      <option value="1">8pt</option>
-      <option value="2">10pt</option>
-      <option value="3">12pt</option>
-      <option value="4">14pt</option>
-      <option value="5">18pt</option>
-      <option value="6">24pt</option>
-      <option value="7">36pt</option>
-    </select>
-  </div>
-
-  <!-- 에디팅 관련 아이콘 -->
-  <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" />
-  </div>
-
-  <!-- 컴포넌트 -->
-  <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}" />
-    <!--@end-->
-  </div>
-
-  <!-- 에디팅 관련 문단 기능 (IE에서는 사용자 선택시 나타남) -->
-  <div id="editor_paragraph_{$upload_target_srl}" class="editor_iconbox" style="display:none">
-    <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" />
-  </div>
-
-  <!-- IE의 경우 엔터시 p 태그를 쓸지 br 태그로 변경을 할지 체크하는 항목 -->
-  <div class="editor_parabox" id="editor_use_paragraph_box_{$upload_target_srl}">
-    <input type="checkbox" name="use_paragraph" id="editor_use_paragraph_{$upload_target_srl}" onclick="editorUseParagraph(this,'{$upload_target_srl}');" />
-    <label for="editor_use_paragraph_{$upload_target_srl}">{$lang->edit->use_paragraph}</label>
+    </div>
   </div>
     
   <!-- iframe -->