From 69f30ea239b8987304401105d4ff47cf021ce3bb Mon Sep 17 00:00:00 2001 From: zero Date: Thu, 19 Apr 2007 07:14:35 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1240 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/blog/blog.class.php | 1 - modules/blog/blog.controller.php | 58 --------------- modules/blog/blog.view.php | 32 +------- modules/blog/lang/ko.lang.php | 3 + modules/blog/schemas/blog_category.xml | 10 +++ modules/blog/tpl/blog_info.html | 4 - modules/blog/tpl/blog_insert.html | 7 -- modules/blog/tpl/category_list.html | 85 ++++++++++------------ modules/blog/tpl/category_update_form.html | 21 ------ modules/blog/tpl/filter/insert_blog.xml | 1 - modules/menu/tpl/menu_management.html | 1 - 11 files changed, 53 insertions(+), 170 deletions(-) create mode 100644 modules/blog/schemas/blog_category.xml delete mode 100644 modules/blog/tpl/category_update_form.html diff --git a/modules/blog/blog.class.php b/modules/blog/blog.class.php index bd13797d1..c5c9e6989 100644 --- a/modules/blog/blog.class.php +++ b/modules/blog/blog.class.php @@ -12,7 +12,6 @@ var $skin = "default"; ///< 스킨 이름 var $list_count = 1; ///< 한 페이지에 나타날 글의 수 var $page_count = 10; ///< 페이지의 수 - var $category_list = NULL; ///< 카테고리 목록 var $editor = 'default'; ///< 에디터 종류 diff --git a/modules/blog/blog.controller.php b/modules/blog/blog.controller.php index f1d14d031..49def0ef6 100644 --- a/modules/blog/blog.controller.php +++ b/modules/blog/blog.controller.php @@ -325,7 +325,6 @@ // 기본 값외의 것들을 정리 $extra_var = delObjectVars(Context::getRequestVars(), $args); - if($extra_var->use_category!='Y') $extra_var->use_category = 'N'; unset($extra_var->mo); unset($extra_var->act); unset($extra_var->page); @@ -392,62 +391,5 @@ $this->add('page',Context::get('page')); $this->setMessage('success_deleted'); } - - /** - * @brief 카테고리 추가 - **/ - function procBlogAdminInsertCategory() { - // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리 - $module_srl = Context::get('module_srl'); - $category_title = Context::get('category_title'); - - // module_srl이 있으면 원본을 구해온다 - $oDocumentController = &getController('document'); - $output = $oDocumentController->insertCategory($module_srl, $category_title); - if(!$output->toBool()) return $output; - - $this->add('page',Context::get('page')); - $this->add('module_srl',$module_srl); - $this->setMessage('success_registed'); - } - - /** - * @brief 카테고리의 내용 수정 - **/ - function procBlogAdminUpdateCategory() { - $module_srl = Context::get('module_srl'); - $category_srl = Context::get('category_srl'); - $mode = Context::get('mode'); - - $oDocumentModel = &getModel('document'); - $oDocumentController = &getController('document'); - - switch($mode) { - case 'up' : - $output = $oDocumentController->moveCategoryUp($category_srl); - $msg_code = 'success_moved'; - break; - case 'down' : - $output = $oDocumentController->moveCategoryDown($category_srl); - $msg_code = 'success_moved'; - break; - case 'delete' : - $output = $oDocumentController->deleteCategory($category_srl); - $msg_code = 'success_deleted'; - break; - case 'update' : - $selected_category = $oDocumentModel->getCategory($category_srl); - $args->category_srl = $selected_category->category_srl; - $args->title = Context::get('category_title'); - $args->list_order = $selected_category->list_order; - $output = $oDocumentController->updateCategory($args); - $msg_code = 'success_updated'; - break; - } - if(!$output->toBool()) return $output; - - $this->add('module_srl', $module_srl); - $this->setMessage($msg_code); - } } ?> diff --git a/modules/blog/blog.view.php b/modules/blog/blog.view.php index ccf8124d5..3d48335a7 100644 --- a/modules/blog/blog.view.php +++ b/modules/blog/blog.view.php @@ -64,13 +64,6 @@ * @brief 일반 블로그 호출시에 관련 정보를 세팅해줌 **/ function initNormal() { - // 카테고리를 사용하는지 확인후 사용시 카테고리 목록을 구해와서 Context에 세팅 - if($this->module_info->use_category=='Y') { - $oDocumentModel = &getModel('document'); - $this->category_list = $oDocumentModel->getCategoryList($this->module_srl); - Context::set('category_list', $this->category_list); - } - // 템플릿에서 사용할 변수를 Context::set() if($this->module_srl) Context::set('module_srl',$this->module_srl); @@ -149,7 +142,6 @@ // 검색 옵션 $args->search_target = Context::get('search_target'); ///< 검색 대상 (title, contents...) $args->search_keyword = Context::get('search_keyword'); ///< 검색어 - if($this->module_info->use_category=='Y') $args->category_srl = Context::get('category'); ///< 카테고리 사용시 선택된 카테고리 $args->sort_index = 'list_order'; ///< 소팅 값 @@ -383,7 +375,6 @@ $args->search_target = Context::get('search_target'); ///< 검색 대상 (title, contents...) $args->search_keyword = Context::get('search_keyword'); ///< 검색어 - if($this->module_info->use_category=='Y') $args->category_srl = Context::get('category'); ///< 카테고리 사용시 선택된 카테고리 $args->sort_index = 'list_order'; ///< 소팅 값 @@ -543,28 +534,7 @@ // module_srl을 구함 $module_srl = Context::get('module_srl'); - // 카테고리의 목록을 구해옴 - $oDocumentModel = &getModel('document'); - $category_list = $oDocumentModel->getCategoryList($module_srl); - Context::set('category_list', $category_list); - - // 수정하려는 카테고리가 있다면해당 카테고리의 정보를 가져옴 - $category_srl = Context::get('category_srl'); - - if($category_srl) { - - $selected_category = $oDocumentModel->getCategory($category_srl); - - if(!$selected_category) Context::set('category_srl',''); - else Context::set('selected_category',$selected_category); - - $this->setTemplateFile('category_update_form'); - - } else { - - $this->setTemplateFile('category_list'); - - } + $this->setTemplateFile('category_list'); } /** diff --git a/modules/blog/lang/ko.lang.php b/modules/blog/lang/ko.lang.php index 690f6ec48..ca58d4ca8 100644 --- a/modules/blog/lang/ko.lang.php +++ b/modules/blog/lang/ko.lang.php @@ -25,6 +25,9 @@ $lang->skin_maker = '스킨제작자'; $lang->skin_maker_homepage = '홈페이지'; + $lang->cmd_enable_move_category = "카테고리 위치 변경 (선택후 위 메뉴를 드래그하세요)"; + $lang->cmd_remake_cache = "캐시파일 재생성"; + // 주절 주절.. $lang->about_mid = '모듈이름은 http://주소/?mid=모듈이름 처럼 직접 호출할 수 있는 값입니다. (영문+숫자만 가능)'; $lang->about_category = '분류를 통한 관리를 할 수 있도록 합니다. 모듈 분류의 관리는 모듈관리 > 모듈카테고리에서 하실 수 있습니다.'; diff --git a/modules/blog/schemas/blog_category.xml b/modules/blog/schemas/blog_category.xml new file mode 100644 index 000000000..9caec9ee8 --- /dev/null +++ b/modules/blog/schemas/blog_category.xml @@ -0,0 +1,10 @@ + + + + + + + + + +
diff --git a/modules/blog/tpl/blog_info.html b/modules/blog/tpl/blog_info.html index 8bfe502c3..0a394cd3b 100644 --- a/modules/blog/tpl/blog_info.html +++ b/modules/blog/tpl/blog_info.html @@ -29,10 +29,6 @@ {$lang->browser_title} {htmlspecialchars($module_info->browser_title)} - - {$lang->use_category} - {$lang->use}{$lang->notuse} - {$lang->list_count} {$module_info->list_count?$module_info->list_count:20} diff --git a/modules/blog/tpl/blog_insert.html b/modules/blog/tpl/blog_insert.html index 35f6c2f9f..f4f53d93d 100644 --- a/modules/blog/tpl/blog_insert.html +++ b/modules/blog/tpl/blog_insert.html @@ -62,13 +62,6 @@ {$lang->about_skin} - - {$lang->use_category} - use_category=='Y')-->checked="true" /> - - - {$lang->about_use_category} - {$lang->list_count} diff --git a/modules/blog/tpl/category_list.html b/modules/blog/tpl/category_list.html index 23d786305..394ff509a 100644 --- a/modules/blog/tpl/category_list.html +++ b/modules/blog/tpl/category_list.html @@ -1,55 +1,48 @@ - - - + + + + -
- - - + + + +
-
- - - - - - - - +
+
+ + + + - -
- - - +
{$lang->category_title}{$lang->last_update}{$lang->cmd_modify}{$lang->cmd_move}{$lang->cmd_delete}
{$lang->msg_category_is_null}
+ + + + + + +
+
+
+ +
+
+ + + + +
+ 		+
+
- - - {htmlspecialchars($category_info->title)} - {zdate($category_info->last_update,"Y-m-d H:i:s")} - {$lang->cmd_modify} - {$lang->cmd_move_up} - {$lang->cmd_move_down} - {$lang->cmd_delete} - - + - +
- - -
- - - - -
- {$lang->category_title} : - - -
- -
diff --git a/modules/blog/tpl/category_update_form.html b/modules/blog/tpl/category_update_form.html deleted file mode 100644 index 51ffc8ce3..000000000 --- a/modules/blog/tpl/category_update_form.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - -
- - - - -
- {$lang->category_title} : - - - -
- -
- diff --git a/modules/blog/tpl/filter/insert_blog.xml b/modules/blog/tpl/filter/insert_blog.xml index 8a1dc6e79..2231341f1 100644 --- a/modules/blog/tpl/filter/insert_blog.xml +++ b/modules/blog/tpl/filter/insert_blog.xml @@ -12,7 +12,6 @@ - diff --git a/modules/menu/tpl/menu_management.html b/modules/menu/tpl/menu_management.html index 6154ba301..f171376d8 100644 --- a/modules/menu/tpl/menu_management.html +++ b/modules/menu/tpl/menu_management.html @@ -11,7 +11,6 @@ -