diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php index 341917383..c0f8d0d17 100644 --- a/modules/admin/admin.class.php +++ b/modules/admin/admin.class.php @@ -15,6 +15,7 @@ $oAdminController = &getController('admin'); $oAdminController->insertShortCut('board'); + $oAdminController->insertShortCut('blog'); $oAdminController->insertShortCut('page'); $oAdminController->insertShortCut('menu'); $oAdminController->insertShortCut('layout'); diff --git a/modules/blog/board.class.php b/modules/blog/blog.class.php similarity index 100% rename from modules/blog/board.class.php rename to modules/blog/blog.class.php diff --git a/modules/blog/board.controller.php b/modules/blog/blog.controller.php similarity index 100% rename from modules/blog/board.controller.php rename to modules/blog/blog.controller.php diff --git a/modules/blog/board.view.php b/modules/blog/blog.view.php similarity index 100% rename from modules/blog/board.view.php rename to modules/blog/blog.view.php diff --git a/modules/blog/conf/info.xml b/modules/blog/conf/info.xml index 9fb19deff..57e4261a6 100644 --- a/modules/blog/conf/info.xml +++ b/modules/blog/conf/info.xml @@ -1,8 +1,12 @@ - 게시판 + 블로그 제로 - 게시판의 기능을 담당하는 모듈. 게시판의 생성/추가 관리등의 관리자 기능도 포함합니다. + + 블로그의 기능을 담당하는 모듈. + 게시판과 비슷하지만 보여지는 view가 다르고 블로그에 적합한 method가 추가되었음. + 레이아웃과 기본 메뉴를 직접 담당 + diff --git a/modules/blog/conf/module.xml b/modules/blog/conf/module.xml index f9926b816..5ff7f27e0 100644 --- a/modules/blog/conf/module.xml +++ b/modules/blog/conf/module.xml @@ -27,45 +27,42 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + diff --git a/modules/blog/lang/ko.lang.php b/modules/blog/lang/ko.lang.php index 1b6ceacae..081ace9e4 100644 --- a/modules/blog/lang/ko.lang.php +++ b/modules/blog/lang/ko.lang.php @@ -2,13 +2,13 @@ /** * @file ko.lang.php * @author zero (zero@nzeo.com) - * @brief 게시판(board) 모듈의 기본 언어팩 + * @brief 블로그(blog) 모듈의 기본 언어팩 **/ // 버튼에 사용되는 언어 - $lang->cmd_board_list = '게시판 목록'; - $lang->cmd_module_config = '게시판 공통 설정'; - $lang->cmd_view_info = '게시판 정보'; + $lang->cmd_blog_list = '블로그 목록'; + $lang->cmd_module_config = '블로그 공통 설정'; + $lang->cmd_view_info = '블로그 정보'; $lang->cmd_manage_category = '분류관리'; $lang->cmd_manage_grant = '권한관리'; $lang->cmd_manage_skin = '스킨관리'; diff --git a/modules/blog/queries/getAllBoard.xml b/modules/blog/queries/getAllBlog.xml similarity index 69% rename from modules/blog/queries/getAllBoard.xml rename to modules/blog/queries/getAllBlog.xml index 49554aeac..b56e6f6b3 100644 --- a/modules/blog/queries/getAllBoard.xml +++ b/modules/blog/queries/getAllBlog.xml @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + diff --git a/modules/blog/queries/getBoardList.xml b/modules/blog/queries/getBlogList.xml similarity index 88% rename from modules/blog/queries/getBoardList.xml rename to modules/blog/queries/getBlogList.xml index efc53c312..d6dd2e60e 100644 --- a/modules/blog/queries/getBoardList.xml +++ b/modules/blog/queries/getBlogList.xml @@ -1,4 +1,4 @@ - +
@@ -6,7 +6,7 @@ - + diff --git a/modules/blog/skins/default/comment.html b/modules/blog/skins/default/comment.html index 4eab1c6dd..25a6da86a 100644 --- a/modules/blog/skins/default/comment.html +++ b/modules/blog/skins/default/comment.html @@ -52,11 +52,11 @@ diff --git a/modules/blog/skins/default/comment_form.html b/modules/blog/skins/default/comment_form.html index 0a0a7cd94..a0bd48ea4 100644 --- a/modules/blog/skins/default/comment_form.html +++ b/modules/blog/skins/default/comment_form.html @@ -3,7 +3,7 @@ - + @@ -64,7 +64,7 @@ - + +
+
- [{$lang->cmd_reply}] + [{$lang->cmd_reply}] - [{$lang->cmd_modify}] - [{$lang->cmd_delete}] + [{$lang->cmd_modify}] + [{$lang->cmd_delete}]
- + diff --git a/modules/blog/skins/default/filter/vote.xml b/modules/blog/skins/default/filter/vote.xml deleted file mode 100644 index 49acb7396..000000000 --- a/modules/blog/skins/default/filter/vote.xml +++ /dev/null @@ -1,13 +0,0 @@ - -
- - - - - - - - - - -
 diff --git a/modules/blog/skins/default/header.html b/modules/blog/skins/default/header.html index 68ffc0dae..970bf8bfe 100644 --- a/modules/blog/skins/default/header.html +++ b/modules/blog/skins/default/header.html @@ -1,7 +1,7 @@ - + {$module_info->header_text} - +
{$lang->document_count} : {number_format($total_count)}, @@ -26,7 +26,7 @@ - [{$lang->cmd_management}] + [{$lang->cmd_management}]
diff --git a/modules/blog/skins/default/js/board.js b/modules/blog/skins/default/js/blog.js similarity index 76% rename from modules/blog/skins/default/js/board.js rename to modules/blog/skins/default/js/blog.js index a9757df89..da4dba549 100644 --- a/modules/blog/skins/default/js/board.js +++ b/modules/blog/skins/default/js/blog.js @@ -1,22 +1,9 @@ /** - * @file modules/board/js/board.js + * @file modules/blog/js/blog.js * @author zero (zero@nzeo.com) - * @brief board 모듈의 javascript + * @brief blog 모듈의 javascript **/ -/* 관리자가 카트 선택시 세션에 넣음 */ -function doAddCart(mid, obj) { - var srl = obj.value; - var check_flag = obj.checked?'add':'remove'; - - var params = new Array(); - params["mid"] = mid; - params["srl"] = srl; - params["check_flag"] = check_flag; - - exec_xml("board","procBoardAdminAddCart", params, null); -} - /* 글쓰기 작성후 */ function completeDocumentInserted(ret_obj) { var error = ret_obj['error']; @@ -52,19 +39,6 @@ function completeSearch(fo_obj, params) { fo_obj.submit(); } -/* 추천, 추천은 별도의 폼입력이 필요 없어 직접 필터 사용 */ -function doVote() { - var fo_obj = document.getElementById('fo_document_info'); - procFilter(fo_obj, vote); -} - -function completeVote(ret_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; - alert(message); - location.href = location.href; -} - // 현재 페이지 reload function completeReload(ret_obj) { var error = ret_obj['error']; diff --git a/modules/blog/skins/default/list.html b/modules/blog/skins/default/list.html index eda1f4cfc..6fcf3416d 100644 --- a/modules/blog/skins/default/list.html +++ b/modules/blog/skins/default/list.html @@ -1,11 +1,6 @@ - - - - -
@@ -24,49 +19,136 @@ - - - - - - +
{$lang->title}{$lang->writer}{$lang->readed_count}{$lang->voted_count}{$lang->date}
+ + -
{$no}
+ + - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - {htmlspecialchars($val->title)} - - {htmlspecialchars($val->title)} - + + + + + + - - [{$val->comment_count}] - + + + + + + - - [{$val->trackback_count}] - + + + + + + + + + + + + + + +
{$category_list[$val->category_srl]->title}
{$lang->category}{$category_list[$val->category_srl]->title}
- - document_srl])-->checked="true" /> - +
{$lang->title}{htmlspecialchars($val->title)}
{$lang->homepage}{htmlspecialchars($val->homepage)}
{$lang->date}{zdate($val->regdate,"Y-m-d H:i:s")}
{$lang->writer}
{htmlspecialchars($val->nick_name)}
{$lang->readed_count}{$val->readed_count}
{$lang->voted_count}{$val->voted_count}
{$lang->content}{$val->content}
{$lang->document_url}{getUrl()}{$val->document_srl}
{$lang->trackback_url}{getUrl()}trackback/{$val->document_srl}
{$lang->tag} + + {htmlspecialchars($val)} + +
{$lang->uploaded_file} + + + +
ipaddress{$val->ipaddress}
+ + {$lang->allow_comment} + + + + {$lang->lock_comment} + + + + {$lang->allow_trackback} + +
+ + + +
+ [{$lang->cmd_list}] + [{$lang->cmd_vote}] + + + [{$lang->cmd_modify}] + [{$lang->cmd_delete}] + +
+ + + + + + + + + + + + + - -
{$val->nick_name}
- {$val->readed_count} - {$val->voted_count} - {zdate($val->regdate,"Y-m-d")} - - @@ -75,11 +157,6 @@ [{$lang->cmd_write}] - - - - [{$lang->cmd_manage_document}] - diff --git a/modules/blog/skins/default/skin.xml b/modules/blog/skins/default/skin.xml index 89ae20ddc..9406c2ff0 100644 --- a/modules/blog/skins/default/skin.xml +++ b/modules/blog/skins/default/skin.xml @@ -1,9 +1,9 @@ - 게시판 기본 스킨 + 블로그 기본 스킨 제로 - board모듈의 default스킨 + blog 모듈의 default스킨 diff --git a/modules/blog/skins/default/trackback.html b/modules/blog/skins/default/trackback.html index 97e9d5d1d..c0e230f39 100644 --- a/modules/blog/skins/default/trackback.html +++ b/modules/blog/skins/default/trackback.html @@ -35,7 +35,7 @@ - [{$lang->cmd_delete}] + [{$lang->cmd_delete}] diff --git a/modules/blog/skins/default/view_document.html b/modules/blog/skins/default/view_document.html index 328ac5532..f5f56b5b3 100644 --- a/modules/blog/skins/default/view_document.html +++ b/modules/blog/skins/default/view_document.html @@ -1,5 +1,3 @@ - -
@@ -41,10 +39,6 @@ {$lang->readed_count} {$document->readed_count} - - {$lang->voted_count} - {$document->voted_count} - {$lang->content} {$document->content} @@ -108,11 +102,10 @@ diff --git a/modules/blog/tpl/board_config.html b/modules/blog/tpl/blog_config.html similarity index 100% rename from modules/blog/tpl/board_config.html rename to modules/blog/tpl/blog_config.html diff --git a/modules/blog/tpl/board_delete.html b/modules/blog/tpl/blog_delete.html similarity index 83% rename from modules/blog/tpl/board_delete.html rename to modules/blog/tpl/blog_delete.html index 93d298485..13d4793ba 100644 --- a/modules/blog/tpl/board_delete.html +++ b/modules/blog/tpl/blog_delete.html @@ -1,7 +1,7 @@ - - + + - + @@ -24,7 +24,7 @@ - + diff --git a/modules/blog/tpl/board_info.html b/modules/blog/tpl/blog_info.html similarity index 96% rename from modules/blog/tpl/board_info.html rename to modules/blog/tpl/blog_info.html index 508f039c3..8bfe502c3 100644 --- a/modules/blog/tpl/board_info.html +++ b/modules/blog/tpl/blog_info.html @@ -59,7 +59,7 @@ - + diff --git a/modules/blog/tpl/board_insert.html b/modules/blog/tpl/blog_insert.html similarity index 95% rename from modules/blog/tpl/board_insert.html rename to modules/blog/tpl/blog_insert.html index 0ba0aabae..122972929 100644 --- a/modules/blog/tpl/board_insert.html +++ b/modules/blog/tpl/blog_insert.html @@ -1,5 +1,5 @@ - - + + @@ -13,7 +13,7 @@ - + @@ -124,7 +124,7 @@ - + diff --git a/modules/blog/tpl/checked_list.html b/modules/blog/tpl/checked_list.html index 6ad21a3b9..73cb22a34 100644 --- a/modules/blog/tpl/checked_list.html +++ b/modules/blog/tpl/checked_list.html @@ -1,5 +1,5 @@ - +
@@ -15,10 +15,10 @@ - +
- + diff --git a/modules/blog/tpl/filter/delete_board.xml b/modules/blog/tpl/filter/delete_blog.xml similarity index 59% rename from modules/blog/tpl/filter/delete_board.xml rename to modules/blog/tpl/filter/delete_blog.xml index cba763914..1244441eb 100644 --- a/modules/blog/tpl/filter/delete_board.xml +++ b/modules/blog/tpl/filter/delete_blog.xml @@ -1,8 +1,8 @@ - + - + diff --git a/modules/blog/tpl/filter/insert_board.xml b/modules/blog/tpl/filter/insert_blog.xml similarity index 85% rename from modules/blog/tpl/filter/insert_board.xml rename to modules/blog/tpl/filter/insert_blog.xml index 3655b3fcc..8a1dc6e79 100644 --- a/modules/blog/tpl/filter/insert_board.xml +++ b/modules/blog/tpl/filter/insert_blog.xml @@ -1,4 +1,4 @@ - +
@@ -6,7 +6,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/modules/blog/tpl/filter/insert_category.xml b/modules/blog/tpl/filter/insert_category.xml index 9aed519d1..8c3f2c039 100644 --- a/modules/blog/tpl/filter/insert_category.xml +++ b/modules/blog/tpl/filter/insert_category.xml @@ -1,4 +1,4 @@ - +
diff --git a/modules/blog/tpl/filter/insert_config.xml b/modules/blog/tpl/filter/insert_config.xml index c0a674180..3558c7062 100644 --- a/modules/blog/tpl/filter/insert_config.xml +++ b/modules/blog/tpl/filter/insert_config.xml @@ -1,4 +1,4 @@ - + diff --git a/modules/blog/tpl/filter/insert_grant.xml b/modules/blog/tpl/filter/insert_grant.xml index 8ac809f0b..ee69ea24a 100644 --- a/modules/blog/tpl/filter/insert_grant.xml +++ b/modules/blog/tpl/filter/insert_grant.xml @@ -1,4 +1,4 @@ - + diff --git a/modules/blog/tpl/filter/manage_checked_document.xml b/modules/blog/tpl/filter/manage_checked_document.xml index f2bd9641c..de9e65f32 100644 --- a/modules/blog/tpl/filter/manage_checked_document.xml +++ b/modules/blog/tpl/filter/manage_checked_document.xml @@ -1,4 +1,4 @@ - +
diff --git a/modules/blog/tpl/filter/update_category.xml b/modules/blog/tpl/filter/update_category.xml index ff7e59f62..9d089ef57 100644 --- a/modules/blog/tpl/filter/update_category.xml +++ b/modules/blog/tpl/filter/update_category.xml @@ -1,4 +1,4 @@ - + diff --git a/modules/blog/tpl/header.html b/modules/blog/tpl/header.html index e25950779..b7833d42b 100644 --- a/modules/blog/tpl/header.html +++ b/modules/blog/tpl/header.html @@ -1,9 +1,9 @@ - +
- style="font-weight:bold">[{$lang->cmd_board_list}] - style="font-weight:bold">[{$lang->cmd_module_config}] + style="font-weight:bold">[{$lang->cmd_blog_list}] + style="font-weight:bold">[{$lang->cmd_module_config}]
@@ -12,10 +12,10 @@ [{$lang->cmd_back}] - style="font-weight:bold">[{$lang->cmd_view_info}] - style="font-weight:bold">[{$lang->cmd_manage_category}] - style="font-weight:bold">[{$lang->cmd_manage_grant}] - style="font-weight:bold">[{$lang->cmd_manage_skin}] + style="font-weight:bold">[{$lang->cmd_view_info}] + style="font-weight:bold">[{$lang->cmd_manage_category}] + style="font-weight:bold">[{$lang->cmd_manage_grant}] + style="font-weight:bold">[{$lang->cmd_manage_skin}]
diff --git a/modules/blog/tpl/index.html b/modules/blog/tpl/index.html index 7c939fd12..f9f884136 100644 --- a/modules/blog/tpl/index.html +++ b/modules/blog/tpl/index.html @@ -1,6 +1,6 @@ - +
{$lang->total_count} {number_format($total_count)}, {$lang->page_count} : {number_format($page)} / {number_format($total_page)} @@ -32,7 +32,7 @@ {$lang->cmd_delete} - + {$no} @@ -42,14 +42,14 @@ {$module_category[$val->module_category_srl]->title} - {$val->mid} + {$val->mid} {htmlspecialchars($val->browser_title)} {$val->is_default} {$val->skin} {$val->admin_id} {zdate($val->regdate,"Y-m-d")} {$lang->cmd_move} - {$lang->cmd_delete} + {$lang->cmd_delete} @@ -58,7 +58,7 @@ diff --git a/modules/blog/tpl/js/board_admin.js b/modules/blog/tpl/js/blog_admin.js similarity index 88% rename from modules/blog/tpl/js/board_admin.js rename to modules/blog/tpl/js/blog_admin.js index 148562b46..3edf1dcf7 100644 --- a/modules/blog/tpl/js/board_admin.js +++ b/modules/blog/tpl/js/blog_admin.js @@ -1,11 +1,11 @@ /** - * @file modules/board/js/board_admin.js + * @file modules/blog/js/blog_admin.js * @author zero (zero@nzeo.com) - * @brief board 모듈의 관리자용 javascript + * @brief blog 모듈의 관리자용 javascript **/ /* 모듈 생성 후 */ -function completeInsertBoard(ret_obj) { +function completeInsertBlog(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; @@ -14,19 +14,19 @@ function completeInsertBoard(ret_obj) { alert(message); - var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBoardAdminBoardInfo'); + var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBlogAdminBlogInfo'); if(page) url.setQuery('page',page); location.href = url; } /* 모듈 삭제 후 */ -function completeDeleteBoard(ret_obj) { +function completeDeleteBlog(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; var page = ret_obj['page']; alert(message); - var url = location.href.setQuery('act','dispBoardAdminContent').setQuery('module_srl',''); + var url = location.href.setQuery('act','dispBlogAdminContent').setQuery('module_srl',''); if(page) url = url.setQuery('page',page); location.href = url; } @@ -50,7 +50,7 @@ function completeUpdateCategory(ret_obj) { var page = ret_obj['page']; alert(message); - var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBoardAdminCategoryInfo'); + var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBlogAdminCategoryInfo'); if(page) url.setQuery('page',page); location.href = url; } @@ -88,7 +88,7 @@ function completeInsertGrant(ret_obj) { alert(message); - var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBoardAdminGrantInfo'); + var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispBlogAdminGrantInfo'); if(page) url.setQuery('page',page); location.href = url; } diff --git a/modules/blog/tpl/skin_info.html b/modules/blog/tpl/skin_info.html index 37697352b..3eb6bfee8 100644 --- a/modules/blog/tpl/skin_info.html +++ b/modules/blog/tpl/skin_info.html @@ -2,7 +2,7 @@ - +