diff --git a/addons/spamfilter/conf/info.xml b/addons/spamfilter/conf/info.xml
index 2a7589dea..3493197aa 100644
--- a/addons/spamfilter/conf/info.xml
+++ b/addons/spamfilter/conf/info.xml
@@ -7,7 +7,7 @@
zero
스팸 필터링을 담당합니다.
- 자세한 설정은 <a href="./?module=admin&mo=spamfilter&act=dispConfig">스팸필터 모듈</a>에서 해주세요.
+ 자세한 설정은 " 스팸필터 모듈" 에서 해주세요.
do spam filtering
diff --git a/modules/addon/addon.view.php b/modules/addon/addon.view.php
index db67a4109..8233a7691 100644
--- a/modules/addon/addon.view.php
+++ b/modules/addon/addon.view.php
@@ -21,6 +21,22 @@
$this->dispAddonList();
}
+ /**
+ * @brief 애드온의 상세 정보(conf/info.xml)를 팝업 출력
+ **/
+ function dispAddonInfo() {
+ // 모듈 목록을 구해서
+ $oAddonModel = &getModel('addon');
+ $addon_info = $oAddonModel->getAddonInfoXml(Context::get('selected_addon'));
+ Context::set('addon_info', $addon_info);
+
+ // 레이아웃을 팝업으로 지정
+ $this->setLayoutFile('popup_layout');
+
+ // 템플릿 파일 지정
+ $this->setTemplateFile('addon_info');
+ }
+
/**
* @brief 애드온 목록을 보여줌
**/
diff --git a/modules/addon/conf/module.xml b/modules/addon/conf/module.xml
index d3094d81a..eb62d392c 100644
--- a/modules/addon/conf/module.xml
+++ b/modules/addon/conf/module.xml
@@ -2,6 +2,7 @@
+
diff --git a/modules/addon/lang/ko.lang.php b/modules/addon/lang/ko.lang.php
index e28ecb596..028579282 100644
--- a/modules/addon/lang/ko.lang.php
+++ b/modules/addon/lang/ko.lang.php
@@ -5,16 +5,7 @@
* @brief 한국어 언어팩
**/
- $lang->module_list = "모듈 목록";
- $lang->module_index = "초기화면";
- $lang->module_category = "모듈 카테고리";
- $lang->module_info = "모듈 정보";
- $lang->add_shortcut = "관리자 메뉴에 추가";
-
- $lang->module_maker = "모듈 제작자";
- $lang->module_history = "변경 사항 ";
-
- $lang->category_title = "카테고리 이름";
- $lang->cmd_add_shortcut = "바로가기 추가";
-
+ $lang->addon_info = "애드온정보";
+ $lang->addon_maker = "애드온 제작자";
+ $lang->addon_history = "변경 사항 ";
?>
diff --git a/modules/addon/tpl.admin/addon_info.html b/modules/addon/tpl.admin/addon_info.html
index a149b22dd..35ae27aa5 100644
--- a/modules/addon/tpl.admin/addon_info.html
+++ b/modules/addon/tpl.admin/addon_info.html
@@ -2,33 +2,33 @@
- | {$lang->module_maker} |
+ {$lang->addon_maker} |
| {$lang->title} |
- {$module_info->title} |
+ {$addon_info->title} ver. {$addon_info->version} |
| {$lang->author} |
- {$module_info->author->name} |
+ {$addon_info->author->name} |
| {$lang->homepage} |
- {$module_info->author->homepage} |
+ {$addon_info->author->homepage} |
| {$lang->regdate} |
- {$module_info->author->date} |
+ {$addon_info->author->date} |
| {$lang->description} |
- {nl2br($module_info->author->description)} |
+ {nl2br($addon_info->author->description)} |
- | {$lang->module_history} |
+ {$lang->addon_history} |
-
+
| {$lang->name} |
diff --git a/modules/addon/tpl.admin/addon_list.html b/modules/addon/tpl.admin/addon_list.html
index 4dcb09863..d8e949e4d 100644
--- a/modules/addon/tpl.admin/addon_list.html
+++ b/modules/addon/tpl.admin/addon_list.html
@@ -14,6 +14,7 @@
{$lang->author} |
{$lang->date} |
{$lang->installed_path} |
+ {$lang->addon_info} |
{$lang->use} |
@@ -26,6 +27,7 @@
{$val->author->name} |
{$val->author->date} |
{$val->path} |
+ {$lang->cmd_view} |
{$lang->notuse}
diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml
index 90a8478e0..9cb787b0d 100644
--- a/modules/layout/conf/module.xml
+++ b/modules/layout/conf/module.xml
@@ -3,8 +3,9 @@
-
+
+
diff --git a/modules/layout/lang/ko.lang.php b/modules/layout/lang/ko.lang.php
index 20d850c85..da489c7db 100644
--- a/modules/layout/lang/ko.lang.php
+++ b/modules/layout/lang/ko.lang.php
@@ -24,6 +24,11 @@
$lang->menu_active_btn = '선택시';
$lang->menu_group_srls = '그룹 제한';
+ $lang->layout_maker = "레이아웃 제작자";
+ $lang->layout_history = "변경 사항 ";
+
+ $lang->layout_info = "레이아웃 정보";
+
$lang->layout_list = '레이아웃 목록';
$lang->downloaded_list = '다운로드 목록';
diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php
index 1424a2f6f..093d32d6d 100644
--- a/modules/layout/layout.view.php
+++ b/modules/layout/layout.view.php
@@ -41,7 +41,7 @@
/**
* @brief 레이아웃 세부 정보 입력
**/
- function dispLayoutInfo() {
+ function dispLayoutMenu() {
// 선택된 레이아웃의 정보르 구해서 세팅
$layout_srl = Context::get('layout_srl');
@@ -57,6 +57,23 @@
$this->setTemplateFile('layout_info');
}
+ /**
+ * @brief 레이아웃의 상세 정보(conf/info.xml)를 팝업 출력
+ **/
+ function dispLayoutInfo() {
+ // 모듈 목록을 구해서
+ $oLayoutModel = &getModel('layout');
+ $layout_info = $oLayoutModel->getLayoutInfo(Context::get('selected_layout'));
+ Context::set('layout_info', $layout_info);
+
+ // 레이아웃을 팝업으로 지정
+ $this->setLayoutFile('popup_layout');
+
+ // 템플릿 파일 지정
+ $this->setTemplateFile('layout_detail_info');
+ }
+
+
/**
* @brief 레이아웃 목록을 보여줌
**/
diff --git a/modules/layout/tpl.admin/downloaded_layout_list.html b/modules/layout/tpl.admin/downloaded_layout_list.html
index deb8fe359..786a49ee4 100644
--- a/modules/layout/tpl.admin/downloaded_layout_list.html
+++ b/modules/layout/tpl.admin/downloaded_layout_list.html
@@ -10,6 +10,7 @@
| {$lang->menu_count} |
{$lang->date} |
{$lang->path} |
+ {$lang->layout_info} |
{$lang->cmd_make} |
@@ -23,10 +24,11 @@
{$val->menu_count} |
{$val->author->date} |
{$val->path} |
+ {$lang->cmd_view} |
{$lang->cmd_make} |
- |
+ |
{nl2br($val->author->description)}
|
diff --git a/modules/layout/tpl.admin/index.html b/modules/layout/tpl.admin/index.html
index e3a975322..4e929fb75 100644
--- a/modules/layout/tpl.admin/index.html
+++ b/modules/layout/tpl.admin/index.html
@@ -26,7 +26,7 @@
| {$no+1} |
{$val->layout} |
- {$val->title} |
+ {$val->title} |
{zdate($val->regdate,"Y-m-d")} |
{$lang->cmd_delete} |
diff --git a/modules/layout/tpl.admin/js/admin.js b/modules/layout/tpl.admin/js/admin.js
index e739e90f2..a6be75c68 100644
--- a/modules/layout/tpl.admin/js/admin.js
+++ b/modules/layout/tpl.admin/js/admin.js
@@ -1,7 +1,7 @@
/* 레이아웃 신규 생성시 완료 후 요청하는 함수 */
function completeInsertLayout(ret_obj) {
var layout_srl = ret_obj['layout_srl'];
- location.href="./?module=admin&mo=layout&act=dispLayoutInfo&layout_srl="+layout_srl;
+ location.href="./?module=admin&mo=layout&act=dispLayoutMenu&layout_srl="+layout_srl;
}
/* 레이아웃메뉴 입력후 */
diff --git a/modules/layout/tpl.admin/layout_detail_info.html b/modules/layout/tpl.admin/layout_detail_info.html
new file mode 100644
index 000000000..28adce987
--- /dev/null
+++ b/modules/layout/tpl.admin/layout_detail_info.html
@@ -0,0 +1,56 @@
+
+
+
+
+ | {$lang->layout_maker} |
+
+
+ | {$lang->title} |
+ {$layout_info->title} ver {$layout_info->version} |
+
+
+ | {$lang->author} |
+ {$layout_info->author->name} |
+
+
+ | {$lang->homepage} |
+ {$layout_info->author->homepage} |
+
+
+ | {$lang->regdate} |
+ {$layout_info->author->date} |
+
+
+ | {$lang->description} |
+ {nl2br($layout_info->author->description)} |
+
+
+
+ | {$lang->layout_history} |
+
+
+
+
+ | {$lang->name} |
+ {$history->name} |
+
+
+ | {$lang->homepage} |
+ {$history->homepage} |
+
+
+ | {$lang->regdate} |
+ {$history->date} |
+
+
+ | {$lang->description} |
+ {nl2br($history->description)} |
+
+
+
+
+ |
+ {$lang->cmd_close}
+ |
+
+
diff --git a/modules/module/tpl.admin/module_info.html b/modules/module/tpl.admin/module_info.html
index a149b22dd..23216e13b 100644
--- a/modules/module/tpl.admin/module_info.html
+++ b/modules/module/tpl.admin/module_info.html
@@ -6,7 +6,7 @@
| {$lang->title} |
- {$module_info->title} |
+ {$module_info->title} ver {$module_info->version} |
| {$lang->author} |
|