From 7f67df0200c50ac56cfdb24051ef053b204e94b2 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 16 Apr 2007 09:15:37 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1168
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/menu/menu.model.php                   |  2 +-
 modules/menu/menu.view.php                    | 18 +--------------
 .../{deleteLayoutMenu.xml => deleteMenu.xml}  |  0
 ...{deleteLayoutMenus.xml => deleteMenus.xml} |  0
 .../{getLayoutMenu.xml => getMenu.xml}        |  0
 ...{getLayoutMenuList.xml => getMenuList.xml} |  0
 .../{insertLayoutMenu.xml => insertMenu.xml}  |  0
 .../{updateLayoutMenu.xml => updateMenu.xml}  |  0
 ...outMenuParent.xml => updateMenuParent.xml} |  0
 ...delete_layout_menu.xml => delete_menu.xml} |  7 +++---
 ...insert_layout_menu.xml => insert_menu.xml} |  6 ++---
 .../{move_layout_menu.xml => move_menu.xml}   |  4 ++--
 .../tpl/js/{layout_admin.js => menu_admin.js} | 22 +++----------------
 .../{layout_info.html => menu_insert.html}    |  9 ++++----
 modules/menu/tpl/mid_list.html                |  2 +-
 15 files changed, 17 insertions(+), 53 deletions(-)
 rename modules/menu/queries/{deleteLayoutMenu.xml => deleteMenu.xml} (100%)
 rename modules/menu/queries/{deleteLayoutMenus.xml => deleteMenus.xml} (100%)
 rename modules/menu/queries/{getLayoutMenu.xml => getMenu.xml} (100%)
 rename modules/menu/queries/{getLayoutMenuList.xml => getMenuList.xml} (100%)
 rename modules/menu/queries/{insertLayoutMenu.xml => insertMenu.xml} (100%)
 rename modules/menu/queries/{updateLayoutMenu.xml => updateMenu.xml} (100%)
 rename modules/menu/queries/{updateLayoutMenuParent.xml => updateMenuParent.xml} (100%)
 rename modules/menu/tpl/filter/{delete_layout_menu.xml => delete_menu.xml} (55%)
 rename modules/menu/tpl/filter/{insert_layout_menu.xml => insert_menu.xml} (58%)
 rename modules/menu/tpl/filter/{move_layout_menu.xml => move_menu.xml} (53%)
 rename modules/menu/tpl/js/{layout_admin.js => menu_admin.js} (87%)
 rename modules/menu/tpl/{layout_info.html => menu_insert.html} (93%)

diff --git a/modules/menu/menu.model.php b/modules/menu/menu.model.php
index 1ab14f590..3fd5ab43f 100644
--- a/modules/menu/menu.model.php
+++ b/modules/menu/menu.model.php
@@ -67,7 +67,7 @@
          * @brief DB 에 생성된 메뉴의 목록을 구함
          * 생성되었다는 것은 DB에 등록이 되었다는 것을 의미 
          **/
-        function getMenuList() {
+        function getMenuItemList() {
             $output = executeQuery('menu.getMenuList');
             if(!$output->data) return;
 
diff --git a/modules/menu/menu.view.php b/modules/menu/menu.view.php
index e3d00cb4f..999d76033 100644
--- a/modules/menu/menu.view.php
+++ b/modules/menu/menu.view.php
@@ -41,23 +41,7 @@
 
             Context::set('menu_info', $menu_info);
 
-            $this->setTemplateFile('menu_info');
-        }
-
-        /**
-         * @brief 메뉴의 상세 정보(conf/info.xml)를 팝업 출력
-         **/
-        function dispMenuAdminInfo() {
-            // 선택된 메뉴 정보를 구함 
-            $oMenuModel = &getModel('menu');
-            $menu_info = $oMenuModel->getMenuInfo(Context::get('selected_menu'));
-            Context::set('menu_info', $menu_info);
-
-            // 메뉴을 팝업으로 지정
-            $this->setMenuFile('popup_menu');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('menu_detail_info');
+            $this->setTemplateFile('menu_insert');
         }
 
         /**
diff --git a/modules/menu/queries/deleteLayoutMenu.xml b/modules/menu/queries/deleteMenu.xml
similarity index 100%
rename from modules/menu/queries/deleteLayoutMenu.xml
rename to modules/menu/queries/deleteMenu.xml
diff --git a/modules/menu/queries/deleteLayoutMenus.xml b/modules/menu/queries/deleteMenus.xml
similarity index 100%
rename from modules/menu/queries/deleteLayoutMenus.xml
rename to modules/menu/queries/deleteMenus.xml
diff --git a/modules/menu/queries/getLayoutMenu.xml b/modules/menu/queries/getMenu.xml
similarity index 100%
rename from modules/menu/queries/getLayoutMenu.xml
rename to modules/menu/queries/getMenu.xml
diff --git a/modules/menu/queries/getLayoutMenuList.xml b/modules/menu/queries/getMenuList.xml
similarity index 100%
rename from modules/menu/queries/getLayoutMenuList.xml
rename to modules/menu/queries/getMenuList.xml
diff --git a/modules/menu/queries/insertLayoutMenu.xml b/modules/menu/queries/insertMenu.xml
similarity index 100%
rename from modules/menu/queries/insertLayoutMenu.xml
rename to modules/menu/queries/insertMenu.xml
diff --git a/modules/menu/queries/updateLayoutMenu.xml b/modules/menu/queries/updateMenu.xml
similarity index 100%
rename from modules/menu/queries/updateLayoutMenu.xml
rename to modules/menu/queries/updateMenu.xml
diff --git a/modules/menu/queries/updateLayoutMenuParent.xml b/modules/menu/queries/updateMenuParent.xml
similarity index 100%
rename from modules/menu/queries/updateLayoutMenuParent.xml
rename to modules/menu/queries/updateMenuParent.xml
diff --git a/modules/menu/tpl/filter/delete_layout_menu.xml b/modules/menu/tpl/filter/delete_menu.xml
similarity index 55%
rename from modules/menu/tpl/filter/delete_layout_menu.xml
rename to modules/menu/tpl/filter/delete_menu.xml
index 347943198..a275a5f0a 100644
--- a/modules/menu/tpl/filter/delete_layout_menu.xml
+++ b/modules/menu/tpl/filter/delete_menu.xml
@@ -1,11 +1,10 @@
-<filter name="delete_layout_menu" module="layout" act="procLayoutAdminDeleteMenu" confirm_msg_code="confirm_delete">
+<filter name="delete_menu" module="menu" act="procMenuAdminDelete" confirm_msg_code="confirm_delete">
     <form>
-        <node target="layout_srl" required="true" />
-        <node target="layout" required="true" />
+        <node target="menu_srl" required="true" />
         <node target="menu_srl" required="true" />
         <node target="menu_id" required="true" />
     </form>
-    <response callback_func="completeInsertLayoutMenu">
+    <response callback_func="completeInsertMenuMenu">
         <tag name="error" />
         <tag name="message" />
         <tag name="menu_srl" />
diff --git a/modules/menu/tpl/filter/insert_layout_menu.xml b/modules/menu/tpl/filter/insert_menu.xml
similarity index 58%
rename from modules/menu/tpl/filter/insert_layout_menu.xml
rename to modules/menu/tpl/filter/insert_menu.xml
index 7ab52fd82..e030e827e 100644
--- a/modules/menu/tpl/filter/insert_layout_menu.xml
+++ b/modules/menu/tpl/filter/insert_menu.xml
@@ -1,12 +1,10 @@
-<filter name="insert_layout_menu" module="layout" act="procLayoutAdminInsertMenu" confirm_msg_code="confirm_submit">
+<filter name="insert_menu" module="menu" act="procMenuAdminInsert" confirm_msg_code="confirm_submit">
     <form>
-        <node target="layout_srl" required="true" />
-        <node target="layout" required="true" />
         <node target="menu_srl" required="true" />
         <node target="menu_id" required="true" />
         <node target="menu_name" required="true" />
     </form>
-    <response callback_func="completeInsertLayoutMenu">
+    <response callback_func="completeInsertMenu">
         <tag name="error" />
         <tag name="message" />
         <tag name="menu_srl" />
diff --git a/modules/menu/tpl/filter/move_layout_menu.xml b/modules/menu/tpl/filter/move_menu.xml
similarity index 53%
rename from modules/menu/tpl/filter/move_layout_menu.xml
rename to modules/menu/tpl/filter/move_menu.xml
index 416449095..93cc0fc2d 100644
--- a/modules/menu/tpl/filter/move_layout_menu.xml
+++ b/modules/menu/tpl/filter/move_menu.xml
@@ -1,7 +1,7 @@
-<filter name="move_layout_menu" module="layout" act="procLayoutAdminMoveMenu" confirm_msg_code="confirm_move">
+<filter name="move_menu" module="menu" act="procMenuAdminMove" confirm_msg_code="confirm_move">
     <form />
     <parameter />
-    <response callback_func="completeMoveLayoutMenu">
+    <response callback_func="completeMoveMenu">
         <tag name="error" />
         <tag name="message" />
         <tag name="menu_id" />
diff --git a/modules/menu/tpl/js/layout_admin.js b/modules/menu/tpl/js/menu_admin.js
similarity index 87%
rename from modules/menu/tpl/js/layout_admin.js
rename to modules/menu/tpl/js/menu_admin.js
index 0cea141a2..58b39e40d 100644
--- a/modules/menu/tpl/js/layout_admin.js
+++ b/modules/menu/tpl/js/menu_admin.js
@@ -1,11 +1,4 @@
-/* 레이아웃 신규 생성시 완료 후 요청하는 함수 */
-function completeInsertLayout(ret_obj) {
-      var layout_srl = ret_obj['layout_srl'];
-      var url = location.href.setQuery('act','dispLayoutAdminMenu').setQuery('layout_srl',layout_srl);
-      location.href = url;
-} 
-
-/* 레이아웃메뉴 입력후 */ 
+/* 메뉴 입력후 */ 
 function completeInsertLayoutMenu(ret_obj) {
     var menu_id = ret_obj['menu_id'];
     var xml_file = ret_obj['xml_file'];
@@ -18,16 +11,7 @@ function completeInsertLayoutMenu(ret_obj) {
     if(!menu_srl) xInnerHtml("menu_zone_info_"+menu_id, "");
 } 
 
-/* 레이아웃 삭제 */
-function doDeleteLayout(layout_srl) {
-    var fo_obj = xGetElementById("fo_layout");
-    if(!fo_obj) return;
-    fo_obj.layout_srl.value = layout_srl;
-
-    procFilter(fo_obj, delete_layout);
-}
-
-/* 레이아웃 메뉴 삭제 */
+/* 메뉴 삭제 */
 function doDeleteLayoutMenu(menu_srl, menu_id) {
       var fo_obj = xGetElementById("fo_"+menu_id);
       if(!fo_obj) return;
@@ -35,7 +19,7 @@ function doDeleteLayoutMenu(menu_srl, menu_id) {
       procFilter(fo_obj, delete_layout_menu);
 }
 
-/* 레이아웃 메뉴에를 클릭시 적용할 함수 */
+/* 메뉴 클릭시 적용할 함수 */
 function doGetMenuInfo(menu_id, obj) {
     // layout, menu_id, node_srl을 추출
     var fo_obj = xGetElementById("fo_layout");
diff --git a/modules/menu/tpl/layout_info.html b/modules/menu/tpl/menu_insert.html
similarity index 93%
rename from modules/menu/tpl/layout_info.html
rename to modules/menu/tpl/menu_insert.html
index 04e984b88..aef84b5e8 100644
--- a/modules/menu/tpl/layout_info.html
+++ b/modules/menu/tpl/menu_insert.html
@@ -1,8 +1,7 @@
-<!--%import("filter/insert_layout_menu.xml")-->
-<!--%import("filter/delete_layout_menu.xml")-->
-<!--%import("filter/move_layout_menu.xml")-->
-
-<!--#include("header.html")-->
+<!--%import("filter/insert_menu.xml")-->
+<!--%import("filter/delete_menu.xml")-->
+<!--%import("filter/move_menu.xml")-->
+<!--%import("js/menu_admin.js")-->
 
 <!-- 메뉴 이동을 위해 임시로 사용하는 form -->
 <form id="fo_move_menu" action="./" method="get">
diff --git a/modules/menu/tpl/mid_list.html b/modules/menu/tpl/mid_list.html
index 4f53556d0..5f21b8132 100644
--- a/modules/menu/tpl/mid_list.html
+++ b/modules/menu/tpl/mid_list.html
@@ -1,4 +1,4 @@
-<!--%import("js/layout_admin.js")-->
+<!--%import("js/menu_admin.js")-->
 <div style="width:400px">
     <table border="1" width="400">
     <tr>