From 5215f35fdc3fef539194ad96497afb09508ea2f7 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 16 Mar 2007 01:20:49 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@466
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 editor/default/editor.css                   |  2 +-
 editor/default/editor.html                  | 53 +++++++++++----------
 editor/default/editor_uploader.html         |  0
 modules/board/skins/default/write_form.html |  1 -
 modules/pagemaker/tpl.admin/write_form.html |  1 -
 5 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100644 editor/default/editor_uploader.html

diff --git a/editor/default/editor.css b/editor/default/editor.css
index 2b70a4461..821c37996 100644
--- a/editor/default/editor.css
+++ b/editor/default/editor.css
@@ -155,7 +155,7 @@ input.editor_input {
 }
 
 .uploaded_file_list {
-  width:100%;
+  width:250px;
   height:120px;
 }
 
diff --git a/editor/default/editor.html b/editor/default/editor.html
index 7bb190e7f..4a549e239 100644
--- a/editor/default/editor.html
+++ b/editor/default/editor.html
@@ -75,36 +75,37 @@
 <div class="editor_uploader_box">
   <table>
   <tr valign="top">
-    <td width="125"><div id="uploaded_file_preview_box_{$upload_target_srl}" class="uploaded_file_preview_box"></div></td>
-    <td width="150">
-      <div class="editor_align_icon">
-        <img src="./images/icon_align_article.gif" border="0" onclick="editor_insert_file('{$upload_target_srl}', '');" alt="{$lang->edit->icon_align_article}"/>
-        {$lang->edit->icon_align_article}
-      </div>
-      <div class="editor_align_icon">
-        <img src="./images/icon_align_left.gif" border="0" onclick="editor_insert_file('{$upload_target_srl}', 'left');" alt="{$lang->edit->icon_align_left}"/>
-        {$lang->edit->icon_align_left}
-      </div>
-      <div class="editor_align_icon">
-        <img src="./images/icon_align_middle.gif" border="0" onclick="editor_insert_file('{$upload_target_srl}', 'middle');" alt="{$lang->edit->icon_align_middle}"/>
-        {$lang->edit->icon_align_middle}
-      </div>
-      <div class="editor_align_icon">
-        <img src="./images/icon_align_right.gif" border="0" onclick="editor_insert_file('{$upload_target_srl}', 'right');" alt="{$lang->edit->icon_align_right}"/>
-        {$lang->edit->icon_align_right}
-      </div>
-    </td>
-    <td><select id='uploaded_file_list_{$upload_target_srl}' size='9' class="uploaded_file_list" onclick="editor_preview(this, '{$upload_target_srl}')"></select></td>
-  </tr>
-  <tr>
     <td>
+      <select id='uploaded_file_list_{$upload_target_srl}' size='9' class="uploaded_file_list" onclick="editor_preview(this, '{$upload_target_srl}')"></select><br />
+      <input type="file" name="file" onchange="editor_file_upload(this, '{$upload_target_srl}')" value="{$lang->edit->upload}" /><br />
       <input type="button" value="{$lang->edit->delete_selected}" onclick="editor_remove_file('{$upload_target_srl}');return false;" />
-    </td>
-    <td>
       <input type="button" value="{$lang->edit->link_selected}" onclick="editor_insert_file('{$upload_target_srl}');return false;" />
     </td>
-    <td align="right">
-      <input type="file" name="file" onchange="editor_file_upload(this, '{$upload_target_srl}')" value="{$lang->edit->upload}" />
+    <td>
+      
+      <table>
+      <tr>
+        <td><div id="uploaded_file_preview_box_{$upload_target_srl}" class="uploaded_file_preview_box"></div></td>
+        <td>
+          <div class="editor_align_icon">
+            <img src="./images/icon_align_article.gif" border="0" onclick="editor_insert_file('{$upload_target_srl}', '');" alt="{$lang->edit->icon_align_article}"/>
+            {$lang->edit->icon_align_article}
+          </div>
+          <div class="editor_align_icon">
+            <img src="./images/icon_align_left.gif" border="0" onclick="editor_insert_file('{$upload_target_srl}', 'left');" alt="{$lang->edit->icon_align_left}"/>
+            {$lang->edit->icon_align_left}
+          </div>
+          <div class="editor_align_icon">
+            <img src="./images/icon_align_middle.gif" border="0" onclick="editor_insert_file('{$upload_target_srl}', 'middle');" alt="{$lang->edit->icon_align_middle}"/>
+            {$lang->edit->icon_align_middle}
+          </div>
+          <div class="editor_align_icon">
+            <img src="./images/icon_align_right.gif" border="0" onclick="editor_insert_file('{$upload_target_srl}', 'right');" alt="{$lang->edit->icon_align_right}"/>
+            {$lang->edit->icon_align_right}
+          </div>
+        </td>
+      </tr>
+      </table>
     </td>
   </tr>
   </table>
diff --git a/editor/default/editor_uploader.html b/editor/default/editor_uploader.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/modules/board/skins/default/write_form.html b/modules/board/skins/default/write_form.html
index 108e1d64c..8a6a0f860 100644
--- a/modules/board/skins/default/write_form.html
+++ b/modules/board/skins/default/write_form.html
@@ -70,7 +70,6 @@
     <td>
       {@$upload_target_srl = $document_srl}
       <!--#include("$editor_path/editor.html")-->
-      <!--#include("$editor_path/editor_uploader.html")-->
     </td>
   </tr>
   <tr>
diff --git a/modules/pagemaker/tpl.admin/write_form.html b/modules/pagemaker/tpl.admin/write_form.html
index 06d7e398a..860ad09bb 100644
--- a/modules/pagemaker/tpl.admin/write_form.html
+++ b/modules/pagemaker/tpl.admin/write_form.html
@@ -47,7 +47,6 @@
     <td>
       {@upload_target_srl = $document_srl}
       <!--#include("$editor_path/editor.html")-->
-      <!--#include("$editor_path/editor_uploader.html")-->
     </td>
   </tr>
   <tr>