From d3fa10eee2cadc174b6e9872e64d71c5f3b7136f Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 26 Mar 2007 12:30:05 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@683
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/pagemaker/pagemaker.view.php      | 23 ++++++++++++++---------
 modules/pagemaker/queries/getPageList.xml |  2 +-
 modules/pagemaker/tpl.admin/content.html  |  1 +
 3 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 modules/pagemaker/tpl.admin/content.html

diff --git a/modules/pagemaker/pagemaker.view.php b/modules/pagemaker/pagemaker.view.php
index 405e0b1a7..3bcac0833 100644
--- a/modules/pagemaker/pagemaker.view.php
+++ b/modules/pagemaker/pagemaker.view.php
@@ -34,16 +34,21 @@
             Context::set('module_category', $module_category);
 
             // 템플릿 경로 구함 (page의 경우 tpl.admin에 관리자용 템플릿 모아놓음)
-            $template_path = sprintf("%stpl.admin/",$this->module_path);
-
-            // 템플릿 경로 지정
-            $this->setTemplatePath($template_path);
+            $this->setTemplatePath($this->module_path.'tpl.admin');
         }
 
         /**
          * @brief 일반 요청시 출력
          **/
         function dispIndex() {
+            // 템플릿에서 사용할 변수를 Context::set()
+            if($this->module_srl) Context::set('module_srl',$this->module_srl);
+
+            Context::set('module_info', $this->module_info);
+            Context::set('page_content', $this->module_info->content);
+
+            $this->setTemplatePath($this->module_path.'tpl.admin');
+            $this->setTemplateFile('content');
         }
 
         /**
@@ -82,7 +87,7 @@
 
             // 설정 정보를 받아옴 (module model 객체를 이용)
             $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('page');
+            $config = $oModuleModel->getModuleConfig('pagemaker');
             Context::set('config',$config);
 
             // 템플릿 파일 지정
@@ -114,11 +119,11 @@
             if(!$module_srl) return $this->dispAdminContent();
 
             // 레이아웃이 정해져 있다면 레이아웃 정보를 추가해줌(layout_title, layout)
-            if($this->module_info->layout_srl) {
+            if($module_info->layout_srl) {
                 $oLayoutModel = &getModel('layout');
-                $layout_info = $oLayoutModel->getLayout($this->module_info->layout_srl);
-                $this->module_info->layout = $layout_info->layout;
-                $this->module_info->layout_title = $layout_info->layout_title;
+                $layout_info = $oLayoutModel->getLayout($module_info->layout_srl);
+                $module_info->layout = $layout_info->layout;
+                $module_info->layout_title = $layout_info->layout_title;
             }
 
             // 템플릿 파일 지정
diff --git a/modules/pagemaker/queries/getPageList.xml b/modules/pagemaker/queries/getPageList.xml
index e448ca8e2..744add770 100644
--- a/modules/pagemaker/queries/getPageList.xml
+++ b/modules/pagemaker/queries/getPageList.xml
@@ -6,7 +6,7 @@
     <column name="*" />
   </columns>
   <conditions>
-    <condition operation="equal" column="module" default="page" />
+    <condition operation="equal" column="module" default="pagemaker" />
     <group pipe="and">
         <condition operation="like" column="mid" var="s_mid" pipe="or" />
         <condition operation="like" column="title" var="s_title" pipe="or" />
diff --git a/modules/pagemaker/tpl.admin/content.html b/modules/pagemaker/tpl.admin/content.html
new file mode 100644
index 000000000..283a0cde3
--- /dev/null
+++ b/modules/pagemaker/tpl.admin/content.html
@@ -0,0 +1 @@
+{$page_content}