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

---
 classes/template/TemplateHandler.class.php     |   2 +-
 .../urllink/{urllink.gif => icon.gif}          | Bin
 modules/editor/editor.view.php                 |   6 ++++--
 modules/editor/tpl/editor.html                 |  17 +++++++++--------
 .../images/multimedia_icon.gif}                | Bin
 5 files changed, 14 insertions(+), 11 deletions(-)
 rename modules/editor/components/urllink/{urllink.gif => icon.gif} (100%)
 rename modules/editor/{components/multimedialink/icon.gif => tpl/images/multimedia_icon.gif} (100%)

diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index 34e787952..c14446801 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -123,7 +123,7 @@
 
             if(substr($path,0,1)=='/' || eregi(":\/\/",$path)) return $str1;
 
-            $path = preg_replace('/^([\.\/]+)/','',$path);
+            $path = preg_replace('/^(\.\/|\/)/','',$path);
             $path = '<?=$this->tpl_path?>'.$path;
             return str_replace($str2, $path, $str1);
         }
diff --git a/modules/editor/components/urllink/urllink.gif b/modules/editor/components/urllink/icon.gif
similarity index 100%
rename from modules/editor/components/urllink/urllink.gif
rename to modules/editor/components/urllink/icon.gif
diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php
index 8ef694a24..adf5fdac0 100644
--- a/modules/editor/editor.view.php
+++ b/modules/editor/editor.view.php
@@ -22,8 +22,10 @@
             Context::set('allow_fileupload', $allow_fileupload);
 
             // 에디터 컴포넌트를 구함
-            $component_list = FileHandler::readDir($this->module_path.'components');
-            debugPrint($component_list);
+            if(!Context::get('component_list')) {
+                $component_list = FileHandler::readDir($this->module_path.'components');
+                Context::set('component_list', $component_list);
+            }
 
             // 템플릿을 미리 컴파일해서 컴파일된 소스를 return
             $tpl_path = $this->module_path.'tpl';
diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html
index e786a306f..23702da2c 100644
--- a/modules/editor/tpl/editor.html
+++ b/modules/editor/tpl/editor.html
@@ -32,19 +32,20 @@
 
   <!-- 에디팅 관련 아이콘 -->
   <div class="editor_iconbox">
-    <img src="./images/font_color.gif" alt="{$lang->edit->help_fontcolor}" class="editor_icon" id="editor_ForeColor_{$upload_target_srl}" />
-    <img src="./images/font_bg_color.gif" alt="{$lang->edit->help_fontbgcolor}" class="editor_icon" id="editor_BackColor_{$upload_target_srl}" />
     <img src="./images/bold.gif" alt="{$lang->edit->help_bold}" class="editor_icon" id="editor_Bold_{$upload_target_srl}" />
     <img src="./images/italic.gif" alt="{$lang->edit->help_italic}" class="editor_icon" id="editor_Italic_{$upload_target_srl}" />
     <img src="./images/underline.gif" alt="{$lang->edit->help_underline}" class="editor_icon" id="editor_Underline_{$upload_target_srl}" />
     <img src="./images/strike.gif" alt="{$lang->edit->help_strike}" class="editor_icon" id="editor_StrikeThrough_{$upload_target_srl}" />
-    <img src="./images/add_url.gif" alt="{$lang->edit->help_add_url}" class="editor_icon" id="editor_addurl_{$upload_target_srl}" />
-    <img src="./images/add_image.gif" alt="{$lang->edit->help_add_image}" class="editor_icon" id="editor_addimage_{$upload_target_srl}" />
-    <img src="./images/add_multi.gif" alt="{$lang->edit->help_add_multimedia}" class="editor_icon" id="editor_addmultimedia_{$upload_target_srl}" />
-    <img src="./images/emoticon.gif" alt="{$lang->edit->help_add_emoticon}" class="editor_icon" id="editor_addemoticon_{$upload_target_srl}" />
-    <img src="./images/quotation.gif" alt="{$lang->edit->help_add_quotation}" class="editor_icon" id="editor_quotation_{$upload_target_srl}" />
-    <img src="./images/html_add.gif" alt="{$lang->edit->help_add_html}" class="editor_icon" id="editor_addhtml_{$upload_target_srl}" />
   </div>
+
+  <!-- 컴포넌트 -->
+  <div id="editor_component_{$upload_target_srl}" class="editor_component">
+    <!--@foreach($component_list as $component)-->
+    <img src="../components/{$component}/icon.gif" alt="{$component}" class="editor_icon" />
+    <!--@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="editor_justifyleft_{$upload_target_srl}" />
     <img src="./images/align_center.gif" alt="{$lang->edit->help_align_center}" id="editor_justifycenter_{$upload_target_srl}" />
diff --git a/modules/editor/components/multimedialink/icon.gif b/modules/editor/tpl/images/multimedia_icon.gif
similarity index 100%
rename from modules/editor/components/multimedialink/icon.gif
rename to modules/editor/tpl/images/multimedia_icon.gif