From a73c9d8bf7432c1bef18bc6ca1d58f4bfc41180a Mon Sep 17 00:00:00 2001 From: zero Date: Sun, 1 Apr 2007 02:25:57 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@848 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/rainbow_link/rainbow_link.addon.php | 8 ++------ modules/layout/conf/module.xml | 4 ++-- modules/layout/layout.class.php | 7 +++---- modules/layout/layout.controller.php | 2 +- modules/layout/layout.model.php | 4 ++-- modules/layout/layout.view.php | 2 +- modules/layout/tpl/js/admin.js | 6 +++--- modules/module/queries/getActionForward.xml | 2 +- modules/module/queries/insertActionFoward.xml | 2 +- modules/module/schemas/action_forward.xml | 2 +- modules/plugin/tpl/js/admin.js | 2 +- 11 files changed, 18 insertions(+), 23 deletions(-) diff --git a/addons/rainbow_link/rainbow_link.addon.php b/addons/rainbow_link/rainbow_link.addon.php index c961fc36e..1305a2d12 100644 --- a/addons/rainbow_link/rainbow_link.addon.php +++ b/addons/rainbow_link/rainbow_link.addon.php @@ -12,12 +12,8 @@ * before_display_content 에서만 요청이 됩니다. **/ - if($called_position != 'before_display_content') return; - - // 현재 애드온의 위치를 구함 - $oAddOnModel = &getModel('addon'); - $path = $oAddOnModel->getAddonPath('rainbow_link'); + if($called_position != 'before_module_init') return; // Context::addJsFile()을 이용하면 끝 - Context::addJsFile($path.'js/rainbow.js'); + Context::addJsFile($addon_path.'js/rainbow.js'); ?> diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml index 9b6dbbfd0..c2ecf50d5 100644 --- a/modules/layout/conf/module.xml +++ b/modules/layout/conf/module.xml @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/modules/layout/layout.class.php b/modules/layout/layout.class.php index 40aeb9806..c9b66f141 100644 --- a/modules/layout/layout.class.php +++ b/modules/layout/layout.class.php @@ -14,12 +14,11 @@ // action forward에 등록 (관리자 모드에서 사용하기 위함) $oModuleController = &getController('module'); $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminContent'); - $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminInsertLayout'); + $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminInsert'); $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminMenu'); - $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminDownloadedLayoutList'); - $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminAdminInfo'); + $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminDownloadedList'); + $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminInfo'); - $oModuleController->insertActionForward('layout', 'model', 'getLayoutAdminMenuSrl'); $oModuleController->insertActionForward('layout', 'model', 'getLayoutAdminMenuTplInfo'); $oModuleController->insertActionForward('layout', 'controller', 'procLayoutAdminInsert'); diff --git a/modules/layout/layout.controller.php b/modules/layout/layout.controller.php index 57a7e1d7d..1b21527d5 100644 --- a/modules/layout/layout.controller.php +++ b/modules/layout/layout.controller.php @@ -88,7 +88,7 @@ /** * @brief 레이아웃에 메뉴 추가 **/ - function procLayoutInsertMenu() { + function procLayoutAdminInsertMenu() { // 입력할 변수 정리 $source_args = Context::getRequestVars(); unset($source_args->module); diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index 8ed7e97da..56a5805d4 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -18,7 +18,7 @@ * @brief 특정 menu_srl의 정보를 이용하여 템플릿을 구한후 return * 관리자 페이지에서 특정 메뉴의 정보를 추가하기 위해 서버에서 tpl을 컴파일 한후 컴파일 된 html을 직접 return **/ - function getLayoutAdminTplInfo() { + function getLayoutAdminMenuTplInfo() { // 해당 메뉴의 정보를 가져오기 위한 변수 설정 $menu_id = Context::get('menu_id'); $menu_srl = Context::get('menu_srl'); @@ -58,7 +58,7 @@ // template 파일을 직접 컴파일한후 tpl변수에 담아서 return한다. require_once("./classes/template/TemplateHandler.class.php"); $oTemplate = new TemplateHandler(); - $tpl = $oTemplate->compile($this->module_path.'tpl.admin', 'layout_menu_info'); + $tpl = $oTemplate->compile($this->module_path.'tpl', 'layout_menu_info'); // return 할 변수 설정 $this->add('menu_id', $menu_id); diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php index e44027ca2..47cccb5ac 100644 --- a/modules/layout/layout.view.php +++ b/modules/layout/layout.view.php @@ -11,7 +11,7 @@ * @brief 초기화 **/ function init() { - $this->setTemplatePath($this->module_path.'tpl.admin'); + $this->setTemplatePath($this->module_path.'tpl'); } /** diff --git a/modules/layout/tpl/js/admin.js b/modules/layout/tpl/js/admin.js index 48d549d7f..18c87e45a 100644 --- a/modules/layout/tpl/js/admin.js +++ b/modules/layout/tpl/js/admin.js @@ -1,7 +1,7 @@ /* 레이아웃 신규 생성시 완료 후 요청하는 함수 */ function completeInsertLayout(ret_obj) { var layout_srl = ret_obj['layout_srl']; - location.href="./?module=admin&mo=layout&act=dispLayoutAdminMenu&layout_srl="+layout_srl; + location.href="./?module=admin&act=dispLayoutAdminMenu&layout_srl="+layout_srl; } /* 레이아웃메뉴 입력후 */ @@ -58,7 +58,7 @@ function doGetMenuInfo(menu_id, obj) { // 서버에 요청하여 해당 노드의 정보를 수정할 수 있도록 한다. var response_tags = new Array('error','message','menu_id', 'tpl'); - exec_xml('layout', 'getMenuTplInfo', params, completeGetMenuInfo, response_tags, params); + exec_xml('layout', 'getLayoutAdminMenuTplInfo', params, completeGetMenuInfo, response_tags, params); } /* 메뉴를 드래그하여 이동한 후 실행할 함수 , 이동하는 node_srl과 대상 node_srl을 받음 */ @@ -126,5 +126,5 @@ function doReloadTreeMenu(menu_id) { // 서버에 요청하여 해당 노드의 정보를 수정할 수 있도록 한다. var response_tags = new Array('error','message','menu_id', 'xml_file', 'menu_title'); - exec_xml('layout', 'procMakeXmlFile', params, completeInsertLayoutMenu, response_tags, params); + exec_xml('layout', 'procLayoutAdminMakeXmlFile', params, completeInsertLayoutMenu, response_tags, params); } diff --git a/modules/module/queries/getActionForward.xml b/modules/module/queries/getActionForward.xml index bce1ad86b..4cc444787 100644 --- a/modules/module/queries/getActionForward.xml +++ b/modules/module/queries/getActionForward.xml @@ -1,6 +1,6 @@ - +
diff --git a/modules/module/queries/insertActionFoward.xml b/modules/module/queries/insertActionFoward.xml index 7e85325c1..ba31835da 100644 --- a/modules/module/queries/insertActionFoward.xml +++ b/modules/module/queries/insertActionFoward.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/module/schemas/action_forward.xml b/modules/module/schemas/action_forward.xml index c95040830..a4625989c 100644 --- a/modules/module/schemas/action_forward.xml +++ b/modules/module/schemas/action_forward.xml @@ -1,4 +1,4 @@ -
+
diff --git a/modules/plugin/tpl/js/admin.js b/modules/plugin/tpl/js/admin.js index 5509f10d0..6c4a3d035 100644 --- a/modules/plugin/tpl/js/admin.js +++ b/modules/plugin/tpl/js/admin.js @@ -40,7 +40,7 @@ function doDisplaySkinColorset(sel, colorset) { var response_tags = new Array("error","message","colorset_list"); - exec_xml("plugin", "procGetColorsetList", params, completeGetSkinColorset, response_tags, params); + exec_xml("plugin", "procPluginGetColorsetList", params, completeGetSkinColorset, response_tags, params); } /* 서버에서 받아온 컬러셋을 표시 */