From 388597c037a370aa6948fa6a82bd395715326431 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Fri, 21 Nov 2014 11:05:04 +0900
Subject: [PATCH] =?UTF-8?q?#1047=20=EB=A0=88=EC=9D=B4=EC=9D=B4=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=ED=8E=B8=EC=A7=91=20=EC=8B=9C=20layout.css=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=9D=84=20=EB=A1=9C=EB=93=9C=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EA=B3=A0=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/layout/layout.admin.model.php | 25 +++++++++++--------------
 modules/layout/layout.admin.view.php  | 24 +++++++++++-------------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/modules/layout/layout.admin.model.php b/modules/layout/layout.admin.model.php
index a33caca1e..7d6de7f67 100644
--- a/modules/layout/layout.admin.model.php
+++ b/modules/layout/layout.admin.model.php
@@ -111,23 +111,20 @@ class layoutAdminModel extends layout
 		}
 
 		// Get Layout Code
-		$oLayoutModel = getModel('layout');
-		$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
-
-		if(!file_exists($layout_file))
+		if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
 		{
-			// If faceoff
-			if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
-			{
-				$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
-			}
-			else
-			{
-				$layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
-			}
+			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
+			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
+		}
+		else
+		{
+			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
+			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
+
+			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
+			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
 		}
 
-		$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 		if(file_exists($layout_css_file))
 		{
 			$layout_code_css = FileHandler::readFile($layout_css_file);
diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 01e693c26..33d9ff6b8 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -237,22 +237,20 @@ class layoutAdminView extends layout
 		if(!$layout_info) return $this->dispLayoutAdminInstalledList();
 
 		// Get Layout Code
-		$oLayoutModel = getModel('layout');
-		$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
-		if(!file_exists($layout_file))
+		if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
 		{
-			// If faceoff
-			if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
-			{
-				$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
-			}
-			else
-			{
-				$layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
-			}
+			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
+			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
+		}
+		else
+		{
+			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
+			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
+
+			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
+			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
 		}
 
-		$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 		if(file_exists($layout_css_file))
 		{
 			$layout_code_css = FileHandler::readFile($layout_css_file);