git-svn-id: http://xe-core.googlecode.com/svn/trunk@1240 201d5d3c-b55e-5fd7-737f-ddc643e51545

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'; ///< 에디터 종류
 

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);
-        }
     }
 ?>

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');
-
-            }
         }
 
         /**

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 = '분류를 통한 관리를 할 수 있도록 합니다. 모듈 분류의 관리는 <a href=\"./?module=admin&amp;act=dispCategory&amp;mo=module\">모듈관리 > 모듈카테고리</a>에서 하실 수 있습니다.';

modules/blog/schemas/blog_category.xml

@@ -0,0 +1,10 @@
+<table name="blog_category">
+    <column name="module_srl" type="number" size="12" notnull="notnull" primary_key="primary_key" />
+    <column name="parent_srl" type="number" size="12" notnull="notnull" default="0" />
+    <column name="category_srl" type="number" size="12" notnull="notnull" index="idx_menu_srl" />
+    <column name="name" type="varchar" size="250" />
+    <column name="expand" type="char" size="1" default="N" />
+    <column name="group_srls" type="text" />
+    <column name="listorder" type="number" size="11" default="0" inex="idx_listorder" />
+    <column name="regdate" type="date" index="idx_regdate" />
+</table>

modules/blog/tpl/blog_info.html

@@ -29,10 +29,6 @@
     <th>{$lang->browser_title}</th>
     <td>{htmlspecialchars($module_info->browser_title)}</td>
 </tr>
-<tr>
-    <th>{$lang->use_category}</th>
-    <td><!--@if($module_info->use_category=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
-</tr>
 <tr>
     <th>{$lang->list_count}</th>
     <td>{$module_info->list_count?$module_info->list_count:20}</td>

modules/blog/tpl/blog_insert.html

@@ -62,13 +62,6 @@
     <tr>
         <td>{$lang->about_skin}</td>
     </tr>
-    <tr>
-        <th rowspan="2">{$lang->use_category}</th>
-        <td><input type="checkbox" name="use_category" value="Y" <!--@if($module_info->use_category=='Y')-->checked="true"<!--@end--> /></td>
-    </tr>
-    <tr>
-        <td>{$lang->about_use_category}</td>
-    </tr>
     <tr>
         <th rowspan="2">{$lang->list_count}</th>
         <td><input type="text" name="list_count" value="{$module_info->list_count?$module_info->list_count:1}" /></td>

modules/blog/tpl/category_list.html

@@ -1,55 +1,48 @@
-<!--%import("filter/insert_category.xml")-->
-<!--%import("filter/update_category.xml")-->
-
+<!--%import("filter/update_category_title.xml")-->
+<!--%import("filter/insert_category_item.xml")-->
+<!--%import("filter/delete_category_item.xml")-->
+<!--%import("filter/move_category_item.xml")-->
 <!--#include("./header.html")-->
 
 <!-- 카테고리의 위/아래, 삭제와 관련된 form -->
-<form id="fo_category_info" action="./" method="get">
-    <input type="hidden" name="module_srl" value="{$module_srl}" />
-    <input type="hidden" name="category_srl" value="" />
-    <input type="hidden" name="mode" value="" />
+<form id="fo_move_category" action="./" method="get">
+    <input type="hidden" name="category_id" />
+    <input type="hidden" name="source_item_srl" />
+    <input type="hidden" name="target_item_srl" />
 </form>
 
-<div>
-    <table>
-    <tr>
-        <th>{$lang->category_title}</th>
-        <th>{$lang->last_update}</th>
-        <th>{$lang->cmd_modify}</th>
-        <th colspan="2">{$lang->cmd_move}</th>
-        <th>{$lang->cmd_delete}</th>
-    </tr>
-
-    <!--@if(!count($category_list))-->
-    <tr>
-        <td colspan="6">{$lang->msg_category_is_null}</td>
-    </tr>
-    <!--@end-->
-
-    <!--@foreach($category_list as $category_srl => $category_info)-->
-    <tr>
-        <td>{htmlspecialchars($category_info->title)}</td>
-        <td>{zdate($category_info->last_update,"Y-m-d H:i:s")}</td>
-        <td><a href="{getUrl('category_srl',$category_info->category_srl)}">{$lang->cmd_modify}</a></td>
-        <td><a href="#" onclick="doUpdateCategory('{$category_info->category_srl}','up');return false;">{$lang->cmd_move_up}</a></td>
-        <td><a href="#" onclick="doUpdateCategory('{$category_info->category_srl}','down');return false;">{$lang->cmd_move_down}</a></td>
-        <td><a href="#" onclick="doUpdateCategory('{$category_info->category_srl}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</a></td>
-    </tr>
-    <!--@end-->
-
-    </table>
-</div>
-
-<!-- 카테고리 추가 -->
-<form action="./" method="post" onsubmit="return procFilter(this, insert_category)">
-    <input type="hidden" name="page" value="{$page}" />
-    <input type="hidden" name="module_srl" value="{$module_srl}" />
-    <input type="hidden" name="category_srl" value="" />
+<div style="margin-bottom:10px;">
+    <form id="fo_category" action="./" method="get" onsubmit="return procFilter(this, insert_category_item)">
+        <input type="hidden" name="title" value="{$category_info->title}" />
+        <input type="hidden" name="category_srl" value="{$category_info->category_srl}" />
+        <input type="hidden" name="xml_file" value="{$category_info->xml_file}" />
+        <input type="hidden" name="php_file" value="{$category_info->php_file}" />
 
+        <table border="1" width="100%">
+        <col width="320" />
+        <col width="*" />
+        <tr valign="top">
+            <td>
+                <div id="category_zone_category"></div>
                 <div>
-        {$lang->category_title} :
-        <input type="text" name="category_title" />
-        <input type="submit" value="{$lang->cmd_registration}" accesskey="s" />
+                    <input type="checkbox" id="category_enable_move" /> <label for="category_enable_move">{$lang->cmd_enable_move_category}</label>
                 </div>
+                <div>
+                    <input type="button" value="{$lang->cmd_insert}" onclick="doInsertMenuItem(0);return false;" />
+                    <input type="button" value="{$lang->cmd_open_all}" onclick="openAllTreeMenu('category');return false;" />
+                    <input type="button" value="{$lang->cmd_close_all}" onclick="closeAllTreeMenu('category');return false;" />
+                    <input type="button" value="{$lang->cmd_remake_cache}" onclick="doReloadTreeMenu('{$category_info->category_srl}');return false;" />
+                </div>
+            </td>
+            <td>
+                <div id="category_zone_info"></div>
+            </td>
+        </tr>
+        </table>
 
-</form>
+    </form>
+
+    <script type="text/javascript">
+        loadTreeMenu("{$category_info->xml_file}", "category", "category_zone_category", "{$lang->category}", doGetMenuItemInfo, 0, doMoveTree); 
+    </script>
+</div>

modules/blog/tpl/category_update_form.html

@@ -1,21 +0,0 @@
-<!--%import("filter/update_category.xml")-->
-
-<!--#include("./header.html")-->
-
-<!-- 카테고리 수정 -->
-
-<!--@if($selected_category)-->
-<form action="./" method="post" onsubmit="return procFilter(this, update_category)" enctype="multipart/form-data">
-    <input type="hidden" name="module_srl" value="{$module_srl}" />
-    <input type="hidden" name="category_srl" value="{$selected_category->category_srl}" />
-    <input type="hidden" name="mode" value="update" />
-
-    <div style="margin-bottom:30px">
-          {$lang->category_title} :
-          <input type="text" name="category_title" value="{htmlspecialchars($selected_category->title)}" />
-          <input type="submit" value="{$lang->cmd_modify}" />
-          <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('category_srl','')}'" />
-    </div>
-
-</form>
-<!--@end-->

modules/blog/tpl/filter/insert_blog.xml

@@ -12,7 +12,6 @@
         <param name="layout_srl" target="layout_srl" />
         <param name="skin" target="skin" />
         <param name="browser_title" target="browser_title" />
-        <param name="use_category" target="use_category" />
         <param name="list_count" target="list_count" />
         <param name="page_count" target="page_count" />
         <param name="is_default" target="is_default" />

modules/menu/tpl/menu_management.html

@@ -11,7 +11,6 @@
     <input type="hidden" name="target_item_srl" />
 </form>
 
-
 <div style="margin-bottom:10px;">
     <!--@if($mid == 'admin')-->
         <table border="1" width="100%">