From 4446ee2266e8e955c11d731d96b67666ee1216b6 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 16 Mar 2007 05:34:51 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@486 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/board.view.php | 4 ++-- .../{tpl/popup => component}/add_emoticon.php | 0 .../editor/{tpl/popup => component}/add_html.php | 0 .../editor/{tpl/popup => component}/add_image.php | 0 .../editor/{tpl/popup => component}/add_multi.php | 0 .../{tpl/popup => component}/add_quotation.php | 0 modules/editor/{tpl/popup => component}/add_url.php | 0 .../editor/{tpl/popup => component}/color_box.php | 0 .../{tpl/popup => component}/emoticon/msn001.gif | Bin .../{tpl/popup => component}/emoticon/msn002.gif | Bin .../{tpl/popup => component}/emoticon/msn003.gif | Bin .../{tpl/popup => component}/emoticon/msn004.gif | Bin .../{tpl/popup => component}/emoticon/msn005.gif | Bin .../{tpl/popup => component}/emoticon/msn006.gif | Bin .../{tpl/popup => component}/emoticon/msn007.gif | Bin .../{tpl/popup => component}/emoticon/msn008.gif | Bin .../{tpl/popup => component}/emoticon/msn009.gif | Bin .../{tpl/popup => component}/emoticon/msn010.gif | Bin .../{tpl/popup => component}/emoticon/msn011.gif | Bin .../{tpl/popup => component}/emoticon/msn012.gif | Bin .../{tpl/popup => component}/emoticon/msn013.gif | Bin .../{tpl/popup => component}/emoticon/msn014.gif | Bin .../{tpl/popup => component}/emoticon/msn015.gif | Bin .../{tpl/popup => component}/emoticon/msn016.gif | Bin .../{tpl/popup => component}/emoticon/msn017.gif | Bin .../{tpl/popup => component}/emoticon/msn018.gif | Bin .../{tpl/popup => component}/emoticon/msn019.gif | Bin .../{tpl/popup => component}/emoticon/msn020.gif | Bin .../{tpl/popup => component}/emoticon/msn021.gif | Bin .../{tpl/popup => component}/emoticon/msn022.gif | Bin .../{tpl/popup => component}/emoticon/msn023.gif | Bin .../{tpl/popup => component}/emoticon/msn024.gif | Bin .../{tpl/popup => component}/emoticon/msn025.gif | Bin .../{tpl/popup => component}/emoticon/msn026.gif | Bin .../{tpl/popup => component}/emoticon/msn027.gif | Bin .../{tpl/popup => component}/emoticon/msn028.gif | Bin .../{tpl/popup => component}/emoticon/msn029.gif | Bin .../{tpl/popup => component}/emoticon/msn030.gif | Bin .../{tpl/popup => component}/emoticon/msn031.gif | Bin .../{tpl/popup => component}/emoticon/msn032.gif | Bin .../{tpl/popup => component}/emoticon/msn033.gif | Bin .../{tpl/popup => component}/emoticon/msn034.gif | Bin .../{tpl/popup => component}/emoticon/msn035.gif | Bin .../{tpl/popup => component}/emoticon/msn036.gif | Bin .../{tpl/popup => component}/emoticon/msn037.gif | Bin .../{tpl/popup => component}/emoticon/msn038.gif | Bin .../{tpl/popup => component}/emoticon/msn039.gif | Bin .../{tpl/popup => component}/emoticon/msn040.gif | Bin modules/pagemaker/pagemaker.view.php | 5 +++++ modules/pagemaker/tpl.admin/write_form.html | 5 +---- 50 files changed, 8 insertions(+), 6 deletions(-) rename modules/editor/{tpl/popup => component}/add_emoticon.php (100%) rename modules/editor/{tpl/popup => component}/add_html.php (100%) rename modules/editor/{tpl/popup => component}/add_image.php (100%) rename modules/editor/{tpl/popup => component}/add_multi.php (100%) rename modules/editor/{tpl/popup => component}/add_quotation.php (100%) rename modules/editor/{tpl/popup => component}/add_url.php (100%) rename modules/editor/{tpl/popup => component}/color_box.php (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn001.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn002.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn003.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn004.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn005.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn006.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn007.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn008.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn009.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn010.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn011.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn012.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn013.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn014.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn015.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn016.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn017.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn018.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn019.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn020.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn021.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn022.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn023.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn024.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn025.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn026.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn027.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn028.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn029.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn030.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn031.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn032.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn033.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn034.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn035.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn036.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn037.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn038.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn039.gif (100%) rename modules/editor/{tpl/popup => component}/emoticon/msn040.gif (100%) diff --git a/modules/board/board.view.php b/modules/board/board.view.php index a59fe2b4a..ede863e2a 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -187,7 +187,7 @@ Context::set('document_srl',$document_srl); Context::set('document', $document); - // 에디터 모듈의 dispEditor를 호출하여 세팅 + // 에디터 모듈의 getEditor를 호출하여 세팅 $oEditorView = &getView('editor'); $editor = $oEditorView->getEditor($document_srl, $this->grant->fileupload); Context::set('editor', $editor); @@ -463,7 +463,7 @@ Context::set('comment_srl', $comment_srl); } - // 에디터 모듈의 dispEditor를 호출하여 세팅 + // 에디터 모듈의 getEditor를 호출하여 세팅 $oEditorView = &getView('editor'); $comment_editor = $oEditorView->getEditor($comment_srl, $this->grant->fileupload); Context::set('comment_editor', $comment_editor); diff --git a/modules/editor/tpl/popup/add_emoticon.php b/modules/editor/component/add_emoticon.php similarity index 100% rename from modules/editor/tpl/popup/add_emoticon.php rename to modules/editor/component/add_emoticon.php diff --git a/modules/editor/tpl/popup/add_html.php b/modules/editor/component/add_html.php similarity index 100% rename from modules/editor/tpl/popup/add_html.php rename to modules/editor/component/add_html.php diff --git a/modules/editor/tpl/popup/add_image.php b/modules/editor/component/add_image.php similarity index 100% rename from modules/editor/tpl/popup/add_image.php rename to modules/editor/component/add_image.php diff --git a/modules/editor/tpl/popup/add_multi.php b/modules/editor/component/add_multi.php similarity index 100% rename from modules/editor/tpl/popup/add_multi.php rename to modules/editor/component/add_multi.php diff --git a/modules/editor/tpl/popup/add_quotation.php b/modules/editor/component/add_quotation.php similarity index 100% rename from modules/editor/tpl/popup/add_quotation.php rename to modules/editor/component/add_quotation.php diff --git a/modules/editor/tpl/popup/add_url.php b/modules/editor/component/add_url.php similarity index 100% rename from modules/editor/tpl/popup/add_url.php rename to modules/editor/component/add_url.php diff --git a/modules/editor/tpl/popup/color_box.php b/modules/editor/component/color_box.php similarity index 100% rename from modules/editor/tpl/popup/color_box.php rename to modules/editor/component/color_box.php diff --git a/modules/editor/tpl/popup/emoticon/msn001.gif b/modules/editor/component/emoticon/msn001.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn001.gif rename to modules/editor/component/emoticon/msn001.gif diff --git a/modules/editor/tpl/popup/emoticon/msn002.gif b/modules/editor/component/emoticon/msn002.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn002.gif rename to modules/editor/component/emoticon/msn002.gif diff --git a/modules/editor/tpl/popup/emoticon/msn003.gif b/modules/editor/component/emoticon/msn003.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn003.gif rename to modules/editor/component/emoticon/msn003.gif diff --git a/modules/editor/tpl/popup/emoticon/msn004.gif b/modules/editor/component/emoticon/msn004.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn004.gif rename to modules/editor/component/emoticon/msn004.gif diff --git a/modules/editor/tpl/popup/emoticon/msn005.gif b/modules/editor/component/emoticon/msn005.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn005.gif rename to modules/editor/component/emoticon/msn005.gif diff --git a/modules/editor/tpl/popup/emoticon/msn006.gif b/modules/editor/component/emoticon/msn006.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn006.gif rename to modules/editor/component/emoticon/msn006.gif diff --git a/modules/editor/tpl/popup/emoticon/msn007.gif b/modules/editor/component/emoticon/msn007.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn007.gif rename to modules/editor/component/emoticon/msn007.gif diff --git a/modules/editor/tpl/popup/emoticon/msn008.gif b/modules/editor/component/emoticon/msn008.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn008.gif rename to modules/editor/component/emoticon/msn008.gif diff --git a/modules/editor/tpl/popup/emoticon/msn009.gif b/modules/editor/component/emoticon/msn009.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn009.gif rename to modules/editor/component/emoticon/msn009.gif diff --git a/modules/editor/tpl/popup/emoticon/msn010.gif b/modules/editor/component/emoticon/msn010.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn010.gif rename to modules/editor/component/emoticon/msn010.gif diff --git a/modules/editor/tpl/popup/emoticon/msn011.gif b/modules/editor/component/emoticon/msn011.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn011.gif rename to modules/editor/component/emoticon/msn011.gif diff --git a/modules/editor/tpl/popup/emoticon/msn012.gif b/modules/editor/component/emoticon/msn012.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn012.gif rename to modules/editor/component/emoticon/msn012.gif diff --git a/modules/editor/tpl/popup/emoticon/msn013.gif b/modules/editor/component/emoticon/msn013.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn013.gif rename to modules/editor/component/emoticon/msn013.gif diff --git a/modules/editor/tpl/popup/emoticon/msn014.gif b/modules/editor/component/emoticon/msn014.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn014.gif rename to modules/editor/component/emoticon/msn014.gif diff --git a/modules/editor/tpl/popup/emoticon/msn015.gif b/modules/editor/component/emoticon/msn015.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn015.gif rename to modules/editor/component/emoticon/msn015.gif diff --git a/modules/editor/tpl/popup/emoticon/msn016.gif b/modules/editor/component/emoticon/msn016.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn016.gif rename to modules/editor/component/emoticon/msn016.gif diff --git a/modules/editor/tpl/popup/emoticon/msn017.gif b/modules/editor/component/emoticon/msn017.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn017.gif rename to modules/editor/component/emoticon/msn017.gif diff --git a/modules/editor/tpl/popup/emoticon/msn018.gif b/modules/editor/component/emoticon/msn018.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn018.gif rename to modules/editor/component/emoticon/msn018.gif diff --git a/modules/editor/tpl/popup/emoticon/msn019.gif b/modules/editor/component/emoticon/msn019.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn019.gif rename to modules/editor/component/emoticon/msn019.gif diff --git a/modules/editor/tpl/popup/emoticon/msn020.gif b/modules/editor/component/emoticon/msn020.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn020.gif rename to modules/editor/component/emoticon/msn020.gif diff --git a/modules/editor/tpl/popup/emoticon/msn021.gif b/modules/editor/component/emoticon/msn021.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn021.gif rename to modules/editor/component/emoticon/msn021.gif diff --git a/modules/editor/tpl/popup/emoticon/msn022.gif b/modules/editor/component/emoticon/msn022.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn022.gif rename to modules/editor/component/emoticon/msn022.gif diff --git a/modules/editor/tpl/popup/emoticon/msn023.gif b/modules/editor/component/emoticon/msn023.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn023.gif rename to modules/editor/component/emoticon/msn023.gif diff --git a/modules/editor/tpl/popup/emoticon/msn024.gif b/modules/editor/component/emoticon/msn024.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn024.gif rename to modules/editor/component/emoticon/msn024.gif diff --git a/modules/editor/tpl/popup/emoticon/msn025.gif b/modules/editor/component/emoticon/msn025.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn025.gif rename to modules/editor/component/emoticon/msn025.gif diff --git a/modules/editor/tpl/popup/emoticon/msn026.gif b/modules/editor/component/emoticon/msn026.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn026.gif rename to modules/editor/component/emoticon/msn026.gif diff --git a/modules/editor/tpl/popup/emoticon/msn027.gif b/modules/editor/component/emoticon/msn027.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn027.gif rename to modules/editor/component/emoticon/msn027.gif diff --git a/modules/editor/tpl/popup/emoticon/msn028.gif b/modules/editor/component/emoticon/msn028.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn028.gif rename to modules/editor/component/emoticon/msn028.gif diff --git a/modules/editor/tpl/popup/emoticon/msn029.gif b/modules/editor/component/emoticon/msn029.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn029.gif rename to modules/editor/component/emoticon/msn029.gif diff --git a/modules/editor/tpl/popup/emoticon/msn030.gif b/modules/editor/component/emoticon/msn030.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn030.gif rename to modules/editor/component/emoticon/msn030.gif diff --git a/modules/editor/tpl/popup/emoticon/msn031.gif b/modules/editor/component/emoticon/msn031.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn031.gif rename to modules/editor/component/emoticon/msn031.gif diff --git a/modules/editor/tpl/popup/emoticon/msn032.gif b/modules/editor/component/emoticon/msn032.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn032.gif rename to modules/editor/component/emoticon/msn032.gif diff --git a/modules/editor/tpl/popup/emoticon/msn033.gif b/modules/editor/component/emoticon/msn033.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn033.gif rename to modules/editor/component/emoticon/msn033.gif diff --git a/modules/editor/tpl/popup/emoticon/msn034.gif b/modules/editor/component/emoticon/msn034.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn034.gif rename to modules/editor/component/emoticon/msn034.gif diff --git a/modules/editor/tpl/popup/emoticon/msn035.gif b/modules/editor/component/emoticon/msn035.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn035.gif rename to modules/editor/component/emoticon/msn035.gif diff --git a/modules/editor/tpl/popup/emoticon/msn036.gif b/modules/editor/component/emoticon/msn036.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn036.gif rename to modules/editor/component/emoticon/msn036.gif diff --git a/modules/editor/tpl/popup/emoticon/msn037.gif b/modules/editor/component/emoticon/msn037.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn037.gif rename to modules/editor/component/emoticon/msn037.gif diff --git a/modules/editor/tpl/popup/emoticon/msn038.gif b/modules/editor/component/emoticon/msn038.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn038.gif rename to modules/editor/component/emoticon/msn038.gif diff --git a/modules/editor/tpl/popup/emoticon/msn039.gif b/modules/editor/component/emoticon/msn039.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn039.gif rename to modules/editor/component/emoticon/msn039.gif diff --git a/modules/editor/tpl/popup/emoticon/msn040.gif b/modules/editor/component/emoticon/msn040.gif similarity index 100% rename from modules/editor/tpl/popup/emoticon/msn040.gif rename to modules/editor/component/emoticon/msn040.gif diff --git a/modules/pagemaker/pagemaker.view.php b/modules/pagemaker/pagemaker.view.php index 6cf82c28e..4a96b1828 100644 --- a/modules/pagemaker/pagemaker.view.php +++ b/modules/pagemaker/pagemaker.view.php @@ -94,6 +94,11 @@ Context::set('document_srl',$document_srl); Context::set('document', $document); + // 에디터 모듈의 getEditor를 호출하여 세팅 + $oEditorView = &getView('editor'); + $editor = $oEditorView->getEditor($document_srl, true); + Context::set('editor', $editor); + $this->setTemplateFile('write_form'); } diff --git a/modules/pagemaker/tpl.admin/write_form.html b/modules/pagemaker/tpl.admin/write_form.html index 5fcc20ccf..791402f0c 100644 --- a/modules/pagemaker/tpl.admin/write_form.html +++ b/modules/pagemaker/tpl.admin/write_form.html @@ -44,10 +44,7 @@ {$lang->content} - - {@upload_target_srl = $document_srl} - - + {$editor} {$lang->cmd_send_trackback}