From a174ef3759aa3a7146160578600a7ddd59c8d259 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 24 Apr 2007 07:03:52 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1307
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/layout/lang/ko.lang.php               |  1 +
 modules/layout/layout.model.php               |  9 +++-
 .../layout/tpl/downloaded_layout_list.html    | 49 ++++++++++++-------
 modules/layout/tpl/insert_layout.html         |  2 +-
 modules/layout/tpl/layout_modify.html         |  4 ++
 5 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/modules/layout/lang/ko.lang.php b/modules/layout/lang/ko.lang.php
index 52a3a55e1..e57bc8e24 100644
--- a/modules/layout/lang/ko.lang.php
+++ b/modules/layout/lang/ko.lang.php
@@ -12,6 +12,7 @@
     $lang->layout_history = "변경 사항 ";
     $lang->layout_info = "레이아웃 정보";
     $lang->layout_list = '레이아웃 목록';
+    $lang->menu_count = '메뉴수';
     $lang->downloaded_list = '다운로드 목록';
 
     $lang->cmd_move_to_installed_list = "생성된 목록 보기";
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 5bbc5d0af..a81ddfcd3 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -97,14 +97,19 @@
 
             // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
             if(!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
-            if(!file_exists($xml_file)) return;
+            if(!file_exists($xml_file)) {
+                $layout_info->layout = $layout;
+                $layout_info->path = $layout_path;
+                $layout_info->layout_title = $layout_title;
+                return $layout_info;
+            }
 
             // cache 파일을 비교하여 문제 없으면 include하고 $layout_info 변수를 return
             $cache_file = sprintf('./files/cache/layout/%s.%s.cache.php', $layout, Context::getLangType());
             if(file_exists($cache_file)&&filectime($cache_file)>filectime($xml_file)) {
                 @include($cache_file);
 
-                if($layout_info->extra_var) {
+                if($layout_info->extra_var && $vars) {
                     foreach($vars as $key => $value) {
                         if(!$layout_info->extra_var->{$key} && !$layout_info->{$key}) {
                             $layout_info->{$key} = $value;
diff --git a/modules/layout/tpl/downloaded_layout_list.html b/modules/layout/tpl/downloaded_layout_list.html
index 3231995c4..388c95510 100644
--- a/modules/layout/tpl/downloaded_layout_list.html
+++ b/modules/layout/tpl/downloaded_layout_list.html
@@ -5,34 +5,45 @@
     <table border="1" width="100%">
     <tr>
         <td>{$lang->layout_name}</td>
+        <td>{$lang->layout_info}</td>
         <td>{$lang->version}</td>
         <td>{$lang->author}</td>
         <td>{$lang->menu_count}</td>
         <td>{$lang->date}</td>
         <td>{$lang->path}</td>
-        <td>{$lang->layout_info}</td>
         <td>{$lang->cmd_make}</td>
     </tr>
 
     <!--@foreach($layout_list as $key => $val)-->
-    <tr>
-        <td rowspan="2">
-            {$val->title} <br />
-            ({$val->layout})
-        </td>
-        <td>{$val->version}</td>
-        <td><a href="#" onclick="window.open('{$val->author->homepage}')">{$val->author->name}</a></td>
-        <td>{$val->menu_count}</td>
-        <td>{$val->author->date}</td>
-        <td>{$val->path}</td>
-        <td><a href="#" onclick="popopen('{getUrl('','module','layout','act','dispLayoutAdminInfo','selected_layout',$val->layout)}','layout_info');return false">{$lang->cmd_view}</a></td>
-        <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}">{$lang->cmd_make}</a></td>
-    </tr>
-    <tr>
-        <td colspan="7">
-            {nl2br($val->author->description)}
-        </td>
-    </tr>
+
+        <!-- 레이아웃 정보 파일(conf/info.xml)가 있는 경우-->
+        <!--@if($val->title)-->
+        <tr>
+            <td rowspan="2">
+                {$val->title} <br />
+                ({$val->layout})
+            </td>
+            <td><a href="#" onclick="popopen('{getUrl('','module','layout','act','dispLayoutAdminInfo','selected_layout',$val->layout)}','layout_info');return false">{$lang->cmd_view}</a></td>
+            <td>{$val->version}</td>
+            <td><a href="#" onclick="window.open('{$val->author->homepage}')">{$val->author->name}</a></td>
+            <td>{$val->menu_count}</td>
+            <td>{$val->author->date}</td>
+            <td>{$val->path}</td>
+            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}">{$lang->cmd_make}</a></td>
+        </tr>
+        <tr>
+            <td colspan="7">
+                {nl2br($val->author->description)}
+            </td>
+        </tr>
+        <!-- 레이아웃 정보 파일(conf/info.xml)이 없는 경우 -->
+        <!--@else-->
+        <tr>
+            <td colspan="6">{$val->layout}</td>
+            <td>{$val->path}</td>
+            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}">{$lang->cmd_make}</a></td>
+        </tr>
+        <!--@end-->
     <!--@end-->
 
     </table>
diff --git a/modules/layout/tpl/insert_layout.html b/modules/layout/tpl/insert_layout.html
index 50a4ef471..52d6cade8 100644
--- a/modules/layout/tpl/insert_layout.html
+++ b/modules/layout/tpl/insert_layout.html
@@ -10,7 +10,7 @@
             <td>
                 <select name="layout">
                     <!--@foreach($layout_list as $key => $val)-->
-                    <option value="{$val->layout}" <!--@if($layout == $val->layout)-->selected="true"<!--@end-->>{$val->title} ({$val->layout})</option>
+                    <option value="{$val->layout}" <!--@if($layout == $val->layout)-->selected="true"<!--@end-->> <!--@if($val->title)-->{$val->title} ({$val->layout})<!--@else-->{$val->layout}<!--@end--></option>
                     <!--@end-->
                 </select>
             </td>
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index adc5cc212..c17ac7877 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -14,14 +14,18 @@
         <th>{$lang->path}</th>
         <td>{$layout_info->path}</td>
     </tr>
+    <!--@if($layout_info->author->homepage)-->
     <tr>  
         <th>{$lang->author}</th>
         <td><a href="#" onclick="window.open('{$layout_info->author->homepage}');return false;">{$layout_info->author->name}</a></td>
     </tr>
+    <!--@end-->
+    <!--@if($layout_info->author->description)-->
     <tr>  
         <th>{$lang->description}</th>
         <td>{nl2br($layout_info->author->description)}</td>
     </tr>
+    <!--@end-->
     </table>
 </div>