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 @@
| {$lang->layout_name} | +{$lang->layout_info} | {$lang->version} | {$lang->author} | {$lang->menu_count} | {$lang->date} | {$lang->path} | -{$lang->layout_info} | {$lang->cmd_make} |
|
- {$val->title} - ({$val->layout}) - |
- {$val->version} | -{$val->author->name} | -{$val->menu_count} | -{$val->author->date} | -{$val->path} | -{$lang->cmd_view} | -{$lang->cmd_make} | -|
| - {nl2br($val->author->description)} - | -||||||||
|
+ {$val->title} + ({$val->layout}) + |
+ {$lang->cmd_view} | +{$val->version} | +{$val->author->name} | +{$val->menu_count} | +{$val->author->date} | +{$val->path} | +{$lang->cmd_make} | +|
| + {nl2br($val->author->description)} + | +||||||||
| {$val->layout} | +{$val->path} | +{$lang->cmd_make} | +||||||