From 4ca3bdccc64bc43f12fbc61f3afffdf03cf0079c Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 14 Aug 2018 11:11:58 +0900
Subject: [PATCH] Display module settings in own layout

Partially revert 8d718c0
---
 classes/module/ModuleObject.class.php | 4 ++++
 modules/admin/tpl/_admin_common.html  | 7 +++++++
 modules/admin/tpl/_header.html        | 8 +-------
 modules/admin/tpl/popup_layout.html   | 7 +------
 4 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 modules/admin/tpl/_admin_common.html

diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index ac7d4d238..1321824b4 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -143,8 +143,12 @@ class ModuleObject extends BaseObject
 		// Set admin layout
 		if(preg_match('/^disp[A-Z][a-z0-9\_]+Admin/', $this->act))
 		{
+			/*
 			$this->setLayoutPath('modules/admin/tpl');
 			$this->setLayoutFile('layout');
+			*/
+			$oTemplate = TemplateHandler::getInstance();
+			$oTemplate->compile('modules/admin/tpl', '_admin_common.html');
 		}
 		
 		// Execute init
diff --git a/modules/admin/tpl/_admin_common.html b/modules/admin/tpl/_admin_common.html
new file mode 100644
index 000000000..8df2e7647
--- /dev/null
+++ b/modules/admin/tpl/_admin_common.html
@@ -0,0 +1,7 @@
+<load target="css/admin.bootstrap.css" />
+<load target="css/admin.iefix.css" />
+<load target="./../../../common/css/xeicon/xeicon.css" />
+<load target="css/admin.css" />
+<load target="js/admin.js" />
+<load target="js/jquery.tmpl.js" />
+<load target="js/jquery.jstree.js" />
diff --git a/modules/admin/tpl/_header.html b/modules/admin/tpl/_header.html
index 94d105e6f..69c2b9eab 100644
--- a/modules/admin/tpl/_header.html
+++ b/modules/admin/tpl/_header.html
@@ -1,10 +1,4 @@
-<load target="css/admin.bootstrap.css" />
-<load target="css/admin.iefix.css" />
-<load target="./../../../common/css/xeicon/xeicon.css" />
-<load target="css/admin.css" />
-<load target="js/admin.js" />
-<load target="js/jquery.tmpl.js" />
-<load target="js/jquery.jstree.js" />
+<include target="./_admin_common.html" />
 {Context::addMetaTag("viewport", "width=device-width, user-scalable=yes")}
 <script>
 	var admin_menu_srl = "{$admin_menu_srl}";
diff --git a/modules/admin/tpl/popup_layout.html b/modules/admin/tpl/popup_layout.html
index 508b5f5b1..9b72a5f56 100644
--- a/modules/admin/tpl/popup_layout.html
+++ b/modules/admin/tpl/popup_layout.html
@@ -1,9 +1,4 @@
-<load target="css/admin.bootstrap.css" />
-<load target="css/admin.iefix.css" />
-<load target="css/admin.css" />
-<load target="js/admin.js" />
-<load target="js/jquery.tmpl.js" />
-<load target="js/jquery.jstree.js" />
+<include target="./_admin_common.html" />
 <div class="x">
 	<div class="content" id="content">
 		{$content}