diff --git a/modules/board/tpl/js/board_admin.js b/modules/board/tpl/js/board_admin.js index 8c98a0800..d8f7f929d 100644 --- a/modules/board/tpl/js/board_admin.js +++ b/modules/board/tpl/js/board_admin.js @@ -1,7 +1,7 @@ /** * @file modules/board/js/board_admin.js * @author zero (zero@nzeo.com) - * @desc board 모듈의 관리자용 javascript + * @brief board 모듈의 관리자용 javascript **/ /* 모듈 생성 후 */ diff --git a/modules/file/conf/info.xml b/modules/file/conf/info.xml index 3b638f574..540baab7e 100644 --- a/modules/file/conf/info.xml +++ b/modules/file/conf/info.xml @@ -3,6 +3,6 @@ 첨부파일 제로 - 첨부 파일 관리 모듈 + 첨부 파일 관리하는 모듈입니다. diff --git a/modules/krzip/conf/info.xml b/modules/krzip/conf/info.xml index 52fccdf8d..5bc3648fb 100644 --- a/modules/krzip/conf/info.xml +++ b/modules/krzip/conf/info.xml @@ -3,6 +3,9 @@ 한국 우편번호 검색 제로 - 제로보드에서 운영하는 우편번호서버를 이용하여 우편번호 검색을 합니다. + + 제로보드에서 운영하는 우편번호서버를 이용하여 우편번호 검색을 합니다. + 우편번호 검색 서버는 설정을 통해 변경하실 수 있습니다. + diff --git a/modules/layout/conf/info.xml b/modules/layout/conf/info.xml index 0a73ee1ee..43b7b441f 100644 --- a/modules/layout/conf/info.xml +++ b/modules/layout/conf/info.xml @@ -3,6 +3,6 @@ 레이아웃 관리 제로 - 레이아웃을 관리하는 모듈입니다. + 레이아웃을 생성/관리하는 모듈입니다. diff --git a/modules/layout/tpl/downloaded_layout_list.html b/modules/layout/tpl/downloaded_layout_list.html index e271366c7..78d6b0993 100644 --- a/modules/layout/tpl/downloaded_layout_list.html +++ b/modules/layout/tpl/downloaded_layout_list.html @@ -26,7 +26,7 @@ {$val->author->date} {$val->path} {$lang->cmd_view} - {$lang->cmd_make} + {$lang->cmd_make} diff --git a/modules/layout/tpl/header.html b/modules/layout/tpl/header.html index 65d108aea..a33e9fb2c 100644 --- a/modules/layout/tpl/header.html +++ b/modules/layout/tpl/header.html @@ -1,4 +1,4 @@ - +
style="font-weight:bold">[{$lang->layout_list}] diff --git a/modules/layout/tpl/index.html b/modules/layout/tpl/index.html index 7f7de906c..5eaeb5e04 100644 --- a/modules/layout/tpl/index.html +++ b/modules/layout/tpl/index.html @@ -1,4 +1,3 @@ - diff --git a/modules/layout/tpl/insert_layout.html b/modules/layout/tpl/insert_layout.html index 8e4d532c2..50a4ef471 100644 --- a/modules/layout/tpl/insert_layout.html +++ b/modules/layout/tpl/insert_layout.html @@ -1,4 +1,3 @@ - diff --git a/modules/layout/tpl/js/admin.js b/modules/layout/tpl/js/layout_admin.js similarity index 95% rename from modules/layout/tpl/js/admin.js rename to modules/layout/tpl/js/layout_admin.js index 18c87e45a..148aec04d 100644 --- a/modules/layout/tpl/js/admin.js +++ b/modules/layout/tpl/js/layout_admin.js @@ -1,7 +1,8 @@ /* 레이아웃 신규 생성시 완료 후 요청하는 함수 */ function completeInsertLayout(ret_obj) { var layout_srl = ret_obj['layout_srl']; - location.href="./?module=admin&act=dispLayoutAdminMenu&layout_srl="+layout_srl; + var url = location.href.setQuery('act','dispLayoutAdminMenu').setQuery('layout_srl',layout_srl); + location.href = url; } /* 레이아웃메뉴 입력후 */ @@ -14,9 +15,7 @@ function completeInsertLayoutMenu(ret_obj) { if(!xml_file) return; loadTreeMenu(xml_file, menu_id, "menu_zone_"+menu_id, menu_title, doGetMenuInfo, menu_srl, doMoveTree); - if(!menu_srl) { - xInnerHtml("menu_zone_info_"+menu_id, ""); - } + if(!menu_srl) xInnerHtml("menu_zone_info_"+menu_id, ""); } /* 레이아웃 삭제 */ diff --git a/modules/layout/tpl/layout_info.html b/modules/layout/tpl/layout_info.html index 5d14643bc..5329a1af0 100644 --- a/modules/layout/tpl/layout_info.html +++ b/modules/layout/tpl/layout_info.html @@ -1,4 +1,3 @@ - diff --git a/modules/member/conf/info.xml b/modules/member/conf/info.xml index e1e9cb534..dead71c00 100644 --- a/modules/member/conf/info.xml +++ b/modules/member/conf/info.xml @@ -3,6 +3,6 @@ 회원 관리 제로 - 회원 관리 모듈 + 회원 관리 및 회원 관련 설정등을 하는 모듈입니다. diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index caf5499ea..b9676a2f6 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -15,6 +15,7 @@ + diff --git a/modules/member/tpl/delete_form.html b/modules/member/tpl/delete_form.html index 33fc499b5..f3a2ff6d8 100644 --- a/modules/member/tpl/delete_form.html +++ b/modules/member/tpl/delete_form.html @@ -1,32 +1,32 @@ - +
- - - - - - - - - - - - - - - - - - - -
{$lang->confirm_delete}
{$lang->user_id}{$member_info->user_id}
{$lang->nick_name}{$member_info->nick_name}
{$lang->email_address}{$member_info->email_address}
- - -
+ + + + + + + + + + + + + + + + + + + +
{$lang->confirm_delete}
{$lang->user_id}{$member_info->user_id}
{$lang->nick_name}{$member_info->nick_name}
{$lang->email_address}{$member_info->email_address}
+ + +
diff --git a/modules/member/tpl/denied_id_list.html b/modules/member/tpl/denied_id_list.html index 702c60154..16f26f643 100644 --- a/modules/member/tpl/denied_id_list.html +++ b/modules/member/tpl/denied_id_list.html @@ -4,8 +4,8 @@
- {number_format($total_count)}, - {$lang->page_count} : {number_format($page)} / {number_format($total_page)} + {number_format($total_count)}, + {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
@@ -16,39 +16,39 @@
- - - - - - - - - - - - - - - - - -
{$lang->no}{$lang->user_id}{$lang->regdate}{$lang->description}{$lang->cmd_delete}
{$no}{$val->user_id}{zdate($val->regdate,"Y-m-d")}{$val->description}{$lang->cmd_delete}
+ + + + + + + + + + + + + + + + + +
{$lang->no}{$lang->user_id}{$lang->regdate}{$lang->description}{$lang->cmd_delete}
{$no}{$val->user_id}{zdate($val->regdate,"Y-m-d")}{$val->description}{$lang->cmd_delete}
@@ -56,9 +56,9 @@
- {$lang->user_id} :
- {$lang->description} :
- + {$lang->user_id} :
+ {$lang->description} :
+
diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html index 9107111f2..fba29454b 100644 --- a/modules/member/tpl/group_list.html +++ b/modules/member/tpl/group_list.html @@ -3,61 +3,61 @@
- {$lang->cmd_member_group} + {$lang->cmd_member_group}
- +
- - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->group_title}{$lang->regdate}{$lang->description}{$lang->is_default}{$lang->cmd_modify}{$lang->cmd_delete}
{$lang->msg_group_is_null}
{$group_info->title}{zdate($group_info->regdate,"Y-m-d H:i:s")}{nl2br($group_info->description)}{$group_info->is_default}{$lang->cmd_modify} - - {$lang->cmd_delete} - -
+ + + + + + + + + + + + + + + + + + + + + + + + +
{$lang->group_title}{$lang->regdate}{$lang->description}{$lang->is_default}{$lang->cmd_modify}{$lang->cmd_delete}
{$lang->msg_group_is_null}
{$group_info->title}{zdate($group_info->regdate,"Y-m-d H:i:s")}{nl2br($group_info->description)}{$group_info->is_default}{$lang->cmd_modify} + + {$lang->cmd_delete} + +

-
+
- {$lang->group_title} :
- {$lang->is_default} :
- {$lang->description} :
- + {$lang->group_title} :
+ {$lang->is_default} :
+ {$lang->description} :
+
diff --git a/modules/member/tpl/group_update_form.html b/modules/member/tpl/group_update_form.html index 192d9c1b4..d9e725fe5 100644 --- a/modules/member/tpl/group_update_form.html +++ b/modules/member/tpl/group_update_form.html @@ -3,25 +3,25 @@
- {$lang->cmd_member_group} + {$lang->cmd_member_group}
- - - + + + -
- {$lang->group_title} :
- - {$lang->is_default} :
- - {$lang->description} :
- - -
+
+ {$lang->group_title} :
+ + {$lang->is_default} :
+ + {$lang->description} :
+ + +
diff --git a/modules/member/tpl/header.html b/modules/member/tpl/header.html index c88a11d35..dbe1844b7 100644 --- a/modules/member/tpl/header.html +++ b/modules/member/tpl/header.html @@ -1,10 +1,10 @@ - +
- style="font-weight:bold">[{$lang->cmd_member_list}] - style="font-weight:bold">[{$lang->cmd_module_config}] - style="font-weight:bold">[{$lang->cmd_member_group}] - style="font-weight:bold">[{$lang->cmd_manage_form}] - style="font-weight:bold">[{$lang->cmd_manage_id}] - style="font-weight:bold">[{$lang->cmd_send_mail}] + style="font-weight:bold">[{$lang->cmd_member_list}] + style="font-weight:bold">[{$lang->cmd_module_config}] + style="font-weight:bold">[{$lang->cmd_member_group}] + style="font-weight:bold">[{$lang->cmd_manage_form}] + style="font-weight:bold">[{$lang->cmd_manage_id}] + style="font-weight:bold">[{$lang->cmd_send_mail}]
diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html index e67dabb84..39edd30b4 100644 --- a/modules/member/tpl/insert_join_form.html +++ b/modules/member/tpl/insert_join_form.html @@ -2,102 +2,101 @@
- {$lang->cmd_manage_form} + {$lang->cmd_manage_form}
- - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lang->column_type} -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->default_value}
+ + + + - - - - -
{$lang->column_type}
- +
-
- - +
+ + + + + + + + + + +
{$lang->default_value}
+
+ +
+
+ + +
+
+ + + +
+
{$lang->about_default_value}
-
- - - -
-
{$lang->about_default_value}
- -
{$lang->about_column_type}
{$lang->column_name}
{$lang->about_column_name}
{$lang->column_title}
{$lang->about_column_title}
{$lang->is_active}is_active=='Y')-->checked="true"/>
{$lang->about_active}
{$lang->is_required}required=='Y')-->checked="true"/>
{$lang->about_required}
{$lang->description}
{$lang->about_form_description}
- -
+
{$lang->about_column_type}
{$lang->column_name}
{$lang->about_column_name}
{$lang->column_title}
{$lang->about_column_title}
{$lang->is_active}is_active=='Y')-->checked="true"/>
{$lang->about_active}
{$lang->is_required}required=='Y')-->checked="true"/>
{$lang->about_required}
{$lang->description}
{$lang->about_form_description}
+ +
- diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index fef79c490..28f60d364 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -2,210 +2,211 @@
- - {$lang->msg_new_member} - - {$lang->msg_update_member} - + + {$lang->msg_new_member} + + {$lang->msg_update_member} +
- - - - - -
- {$lang->member_default_info} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->user_id} - - {$member_info->user_id} - - - -
{$lang->about_user_id}
{$lang->password} - -
{$lang->user_name} - -
{$lang->about_user_name}
{$lang->nick_name} - -
{$lang->about_nick_name}
{$lang->email_address} - -
{$lang->allow_mailing}allow_mailing!='N')-->checked="true"/>
{$lang->about_allow_mailing}
{$lang->denied}denied=='Y')-->checked="true"/>
{$lang->about_denied}
{$lang->is_admin}is_admin=='Y')-->checked="true"/>
{$lang->about_is_admin}
{$lang->description}
{$lang->about_description}
{$lang->group} - - group_list[$key])-->checked="true"/> - - -
{$lang->about_group}
- - -
- {$lang->member_extend_info} -
- - - - - - - - - - - + + + + - -
- - * - - {$val->column_title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - value)&&in_array($v, $val->value))-->checked="true"/> {$v} - - - - - - - - - -
- - -
- -
- - -
- -
- -
- - - - - - - -
{$val->description}
- - - - - -
- - - - - - -
+
+ {$lang->member_default_info} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lang->user_id} + + {$member_info->user_id} + + + +
{$lang->about_user_id}
{$lang->password} + +
{$lang->user_name} + +
{$lang->about_user_name}
{$lang->nick_name} + +
{$lang->about_nick_name}
{$lang->email_address} + +
{$lang->allow_mailing}allow_mailing!='N')-->checked="true"/>
{$lang->about_allow_mailing}
{$lang->denied}denied=='Y')-->checked="true"/>
{$lang->about_denied}
{$lang->is_admin}is_admin=='Y')-->checked="true"/>
{$lang->about_is_admin}
{$lang->description}
{$lang->about_description}
{$lang->group} + + group_list[$key])-->checked="true"/> + + +
{$lang->about_group}
+ + +
+ {$lang->member_extend_info} +
+ + + + + + + + + + + + + +
+ + * + + {$val->column_title} + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + value)&&in_array($v, $val->value))-->checked="true"/> {$v} + + + + + + + + + +
+ + +
+ +
+ + +
+ +
+ +
+ + + + + + + +
{$val->description}
+ + + + + + +
+ + + + + + +
diff --git a/modules/member/tpl/join_form_list.html b/modules/member/tpl/join_form_list.html index c3a347118..5f558f4f6 100644 --- a/modules/member/tpl/join_form_list.html +++ b/modules/member/tpl/join_form_list.html @@ -3,44 +3,44 @@
- - + +
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->column_title}{$lang->column_name}{$lang->column_type}{$lang->is_active}{$lang->is_required}{$lang->regdate}{$lang->cmd_modify}{$lang->cmd_move}{$lang->cmd_delete}
{$val->column_title}{$val->column_name}{$lang->column_type_list[$val->column_type]}{$val->is_active}{$val->required}{zdate($val->regdate,"Y-m-d")}{$lang->cmd_modify}{$lang->cmd_move_up}{$lang->cmd_move_down}{$lang->cmd_delete}
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lang->column_title}{$lang->column_name}{$lang->column_type}{$lang->is_active}{$lang->is_required}{$lang->regdate}{$lang->cmd_modify}{$lang->cmd_move}{$lang->cmd_delete}
{$val->column_title}{$val->column_name}{$lang->column_type_list[$val->column_type]}{$val->is_active}{$val->required}{zdate($val->regdate,"Y-m-d")}{$lang->cmd_modify}{$lang->cmd_move_up}{$lang->cmd_move_down}{$lang->cmd_delete}
diff --git a/modules/member/tpl/js/admin.js b/modules/member/tpl/js/member_admin.js similarity index 98% rename from modules/member/tpl/js/admin.js rename to modules/member/tpl/js/member_admin.js index 26be626bc..552ab9e74 100644 --- a/modules/member/tpl/js/admin.js +++ b/modules/member/tpl/js/member_admin.js @@ -7,9 +7,8 @@ function completeInsert(ret_obj) { alert(message); - var url = location.href.setQuery('act','dispMemberAdminInfo'); - url = url.setQuery('member_srl',member_srl); - if(page) url += "&page="+page; + var url = location.href.setQuery('act','dispMemberAdminInfo').setQuery('member_srl',member_srl); + if(page) url = url.setQuery('page', page); location.href = url; } @@ -53,7 +52,6 @@ function doUpdateGroup(group_srl, mode, message) { function completeUpdateGroup(ret_obj) { var page = ret_obj['page']; var url = location.href.setQuery('act','dispMemberAdminGroupList'); - location.href = url; } @@ -67,7 +65,6 @@ function completeInsertDeniedID(ret_obj) { alert(message); var url = location.href.setQuery('act','dispMemberAdminDeniedIDList'); - location.href = url; } diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html index 40d6c584c..c579f1803 100644 --- a/modules/member/tpl/member_config.html +++ b/modules/member/tpl/member_config.html @@ -2,65 +2,65 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->skin} - -
{$lang->enable_join}enable_join=='Y')-->checked="true"/>
{$lang->about_enable_join}
{$lang->image_name} - image_name=='Y')-->checked="true"/>
- {$lang->image_name_max_width} : px
- {$lang->image_name_max_height} : px
-
{$lang->about_image_name}
{$lang->image_mark} - image_mark=='Y')-->checked="true"/>
- {$lang->image_mark_max_width} : px
- {$lang->image_mark_max_height} : px
-
{$lang->about_image_mark}
{$lang->redirect_url}
{$lang->about_redirect_url}
{$lang->agreement}
{$lang->about_agreement}
- - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lang->skin} + +
{$lang->enable_join}enable_join=='Y')-->checked="true"/>
{$lang->about_enable_join}
{$lang->image_name} + image_name=='Y')-->checked="true"/>
+ {$lang->image_name_max_width} : px
+ {$lang->image_name_max_height} : px
+
{$lang->about_image_name}
{$lang->image_mark} + image_mark=='Y')-->checked="true"/>
+ {$lang->image_mark_max_width} : px
+ {$lang->image_mark_max_height} : px
+
{$lang->about_image_mark}
{$lang->redirect_url}
{$lang->about_redirect_url}
{$lang->agreement}
{$lang->about_agreement}
+ + +
diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html index 287237f5c..427790f22 100644 --- a/modules/member/tpl/member_info.html +++ b/modules/member/tpl/member_info.html @@ -9,108 +9,108 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +
{$lang->user_id}{$member_info->user_id}{$lang->user_id}{$member_info->user_id}
{$lang->user_name}{$member_info->user_name}{$lang->user_name}{$member_info->user_name}
{$lang->nick_name}{$member_info->nick_name}{$lang->nick_name}{$member_info->nick_name}
{$lang->image_name} - - - -
-
- - - - - -
-
- 		{$lang->image_name} + + + +
+
+ + + + + +
+
+
{$lang->image_mark} - - - -
-
- - - - - -
-
- 		{$lang->image_mark} + + + +
+
+ + + + + +
+
+
{$lang->email_address}{$member_info->email_address}{$lang->email_address}{$member_info->email_address}
{$lang->allow_mailing}{$member_info->allow_mailing}{$lang->allow_mailing}{$member_info->allow_mailing}
{$lang->denied}{$member_info->denied}{$lang->denied}{$member_info->denied}
{$lang->is_admin}{$member_info->is_admin}{$lang->is_admin}{$member_info->is_admin}
{$lang->group} - - {$val} - - {$lang->group} + + {$val} + +
{$val->column_title} - - {$val->value[0]} - {$val->value[1]} - {$val->value[2]} - - {$val->value[0]} {$val->value[1]} - - {implode(",",$val->value)} - - {$val->value} - - {$val->column_title} + + {$val->value[0]} - {$val->value[1]} - {$val->value[2]} + + {$val->value[0]} {$val->value[1]} + + {implode(",",$val->value)} + + {$val->value} + +
{$lang->description}{$member_info->description}{$lang->description}{$member_info->description}
- - - + + +
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html index 0f84f0624..c79433cb5 100644 --- a/modules/member/tpl/member_list.html +++ b/modules/member/tpl/member_list.html @@ -2,94 +2,93 @@
- {number_format($total_count)}, - {$lang->page_count} : {number_format($page)} / {number_format($total_page)} + {number_format($total_count)}, + {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
- - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->no}{$lang->user_id}{$lang->user_name}{$lang->nick_name}{$lang->allow_mailing}{$lang->denied}{$lang->regdate}{$lang->last_login}{$lang->cmd_delete}
{$val->member_srl}{$val->user_id}{$val->user_name}
{$val->nick_name}
{$val->allow_mailing}{$val->denied}{zdate($val->regdate,"Y-m-d")}{zdate($val->last_login,"Y-m-d H:i:s")}{$lang->cmd_delete}
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{$lang->no}{$lang->user_id}{$lang->user_name}{$lang->nick_name}{$lang->allow_mailing}{$lang->denied}{$lang->regdate}{$lang->last_login}{$lang->cmd_delete}
{$val->member_srl}{$val->user_id}{$val->user_name}
{$val->nick_name}
{$val->allow_mailing}{$val->denied}{zdate($val->regdate,"Y-m-d")}{zdate($val->last_login,"Y-m-d H:i:s")}{$lang->cmd_delete}
-
- - - + + + -
- - - -
-
- - - - -
-
+
+ + + +
+
+ + + + +
+
diff --git a/modules/message/conf/info.xml b/modules/message/conf/info.xml index 7ebe0fbdf..8ea62f6df 100644 --- a/modules/message/conf/info.xml +++ b/modules/message/conf/info.xml @@ -3,6 +3,6 @@ 메세지 제로 - 오류 메세지 관리 모듈 + 오류 및 각종 시스템 메세지 관리 모듈 diff --git a/modules/module/conf/info.xml b/modules/module/conf/info.xml index e5313620d..96f7c1cc9 100644 --- a/modules/module/conf/info.xml +++ b/modules/module/conf/info.xml @@ -3,6 +3,6 @@ 모듈 관리 제로 - 모듈 관리하는 모듈 + 모듈 생성 및 관리하는 모듈입니다. diff --git a/modules/module/tpl/filter/insert_shortcut.xml b/modules/module/tpl/filter/insert_shortcut.xml index 9d8006f4e..030b33b06 100644 --- a/modules/module/tpl/filter/insert_shortcut.xml +++ b/modules/module/tpl/filter/insert_shortcut.xml @@ -1,4 +1,4 @@ - +
diff --git a/modules/module/tpl/header.html b/modules/module/tpl/header.html index 43b2aa1bd..4d2a4240d 100644 --- a/modules/module/tpl/header.html +++ b/modules/module/tpl/header.html @@ -1,10 +1,6 @@ - - - +
style="font-weight:bold">[{$lang->module_index}] style="font-weight:bold">[{$lang->module_category}]
- - diff --git a/modules/module/tpl/js/admin.js b/modules/module/tpl/js/module_admin.js similarity index 82% rename from modules/module/tpl/js/admin.js rename to modules/module/tpl/js/module_admin.js index a59ac1cb7..7ad1b7e86 100644 --- a/modules/module/tpl/js/admin.js +++ b/modules/module/tpl/js/module_admin.js @@ -1,7 +1,7 @@ /** - * @file modules/module/js/admin.js + * @file modules/module/js/module_admin.js * @author zero (zero@nzeo.com) - * @desc module 모듈의 관리자용 javascript + * @brief module 모듈의 관리자용 javascript **/ /* 카테고리 관련 작업들 */ @@ -19,9 +19,10 @@ function doUpdateCategory(module_category_srl, mode, message) { function completeUpdateCategory(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; + alert(message); - var url = "./?module=admin&mo=module&act=dispCategory"; + var url = location.href.setQuery('act','dispModuleAdminCategory'); location.href = url; } diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html index 5065ba359..b50660c88 100644 --- a/modules/module/tpl/module_list.html +++ b/modules/module/tpl/module_list.html @@ -1,5 +1,4 @@ - diff --git a/modules/page/page.view.php b/modules/page/page.view.php index 1ad74685a..a3f2200cd 100644 --- a/modules/page/page.view.php +++ b/modules/page/page.view.php @@ -15,7 +15,9 @@ * @brief 초기화 **/ function init() { - // template path 지정 + if(substr_count($this->act, 'Admin')) $this->initAdmin(); + + // 템플릿 경로 구함 (page의 경우 tpl에 관리자용 템플릿 모아놓음) $this->setTemplatePath($this->module_path.'tpl'); } @@ -32,9 +34,6 @@ // 모듈 카테고리 목록을 구함 $module_category = $oModuleModel->getModuleCategories(); Context::set('module_category', $module_category); - - // 템플릿 경로 구함 (page의 경우 tpl에 관리자용 템플릿 모아놓음) - $this->setTemplatePath($this->module_path.'tpl'); } /** @@ -47,7 +46,6 @@ Context::set('module_info', $this->module_info); Context::set('page_content', $this->module_info->content); - $this->setTemplatePath($this->module_path.'tpl'); $this->setTemplateFile('content'); } @@ -55,9 +53,6 @@ * @brief 페이지 관리 목록 보여줌 **/ function dispPageAdminContent() { - // 모듈 관련 정보 세팅 - $this->initAdmin(); - // 등록된 page 모듈을 불러와 세팅 $oDB = &DB::getInstance(); $args->sort_index = "module_srl"; @@ -82,9 +77,6 @@ * @brief 페이지에 필요한 기본 설정들 **/ function dispPageAdminModuleConfig() { - // 관리자 관련 정보 세팅 - $this->initAdmin(); - // 설정 정보를 받아옴 (module model 객체를 이용) $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('page'); @@ -98,9 +90,6 @@ * @brief 선택된 페이지의 정보 출력 **/ function dispPageAdminInfo() { - // 관리자 관련 정보 세팅 - $this->initAdmin(); - // GET parameter에서 module_srl을 가져옴 $module_srl = Context::get('module_srl'); @@ -134,9 +123,6 @@ * @brief 페이지 추가 폼 출력 **/ function dispPageAdminInsert() { - // 관리자 관련 정보 세팅 - $this->initAdmin(); - // 레이아웃 목록을 구해옴 $oLayoutMode = &getModel('layout'); $layout_list = $oLayoutMode->getLayoutList(); @@ -181,9 +167,6 @@ * @brief 페이지 삭제 화면 출력 **/ function dispPageAdminDelete() { - // 관리자 관련 정보 세팅 - $this->initAdmin(); - $module_srl = Context::get('module_srl'); if(!$module_srl) return $this->dispContent(); diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html index 6551b9a16..f8fdf5684 100644 --- a/modules/page/tpl/index.html +++ b/modules/page/tpl/index.html @@ -1,4 +1,4 @@ - +
diff --git a/modules/page/tpl/js/admin.js b/modules/page/tpl/js/page_admin.js similarity index 61% rename from modules/page/tpl/js/admin.js rename to modules/page/tpl/js/page_admin.js index 7537ca092..68b8e5f89 100644 --- a/modules/page/tpl/js/admin.js +++ b/modules/page/tpl/js/page_admin.js @@ -1,7 +1,7 @@ /** - * @file modules/page/js/admin.js + * @file modules/page/js/page_admin.js * @author zero (zero@nzeo.com) - * @desc page모듈의 관리자용 javascript + * @brief page모듈의 관리자용 javascript **/ /* 모듈 생성 후 */ @@ -14,8 +14,8 @@ function completeInsertPage(ret_obj) { alert(message); - var url = "./?module=admin&module_srl="+module_srl+"&act=dispPageAdminInfo"; - if(page) url += "&page="+page; + var url = location.href.setQuery('module_srl',module_srl).setQuery('act','dispPageAdminInfo'); + if(page) url = url.setQuery('page',page); location.href = url; } @@ -28,8 +28,8 @@ function completeDeletePage(ret_obj) { var page = ret_obj['page']; alert(message); - var url = "./?module=admin&act=dispPageAdminContent"; - if(page) url += "&page="+page; + var url = location.href.setQuery('act','dispPageAdminContent'); + if(page) url = url.setQuery('page',page); location.href = url; } @@ -38,5 +38,5 @@ function completeDeletePage(ret_obj) { function doChangeCategory(sel_obj, url) { var module_category_srl = sel_obj.options[sel_obj.selectedIndex].value; if(!module_category_srl) location.href=url; - else location.href=url+'&module_category_srl='+module_category_srl; + else location.href = location.href.setQuery('module_category_srl',module_category_srl); } diff --git a/modules/page/tpl/page_delete.html b/modules/page/tpl/page_delete.html index eabfef8ce..ae789b73a 100644 --- a/modules/page/tpl/page_delete.html +++ b/modules/page/tpl/page_delete.html @@ -1,5 +1,5 @@ - +
diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html index 5730d7f94..cf2fb5068 100644 --- a/modules/page/tpl/page_insert.html +++ b/modules/page/tpl/page_insert.html @@ -1,5 +1,5 @@ - +
@@ -73,7 +73,7 @@ {$lang->plugin} - {$plugin->title} + {$plugin->title} diff --git a/modules/plugin/tpl/css/plugin.css b/modules/plugin/tpl/css/plugin.css index abab5f6f5..bf461de7b 100644 --- a/modules/plugin/tpl/css/plugin.css +++ b/modules/plugin/tpl/css/plugin.css @@ -1,4 +1,5 @@ @charset "utf-8"; + .plugin_detail_info_window { width:600px; clear:both; diff --git a/modules/plugin/tpl/js/admin.js b/modules/plugin/tpl/js/plugin_admin.js similarity index 96% rename from modules/plugin/tpl/js/admin.js rename to modules/plugin/tpl/js/plugin_admin.js index 6c4a3d035..6c674dceb 100644 --- a/modules/plugin/tpl/js/admin.js +++ b/modules/plugin/tpl/js/plugin_admin.js @@ -1,3 +1,9 @@ +/** + * @file modules/board/js/plugin_admin.js + * @author zero (zero@nzeo.com) + * @brief plugin 모듈의 관리자용 javascript + **/ + /* 생성된 코드를 textarea에 출력 */ function completeGenerateCode(ret_obj) { var plugin_code = ret_obj["plugin_code"]; diff --git a/modules/plugin/tpl/plugin_generate_code.html b/modules/plugin/tpl/plugin_generate_code.html index 4401c530d..7fa75d8ad 100644 --- a/modules/plugin/tpl/plugin_generate_code.html +++ b/modules/plugin/tpl/plugin_generate_code.html @@ -1,5 +1,5 @@ - + diff --git a/modules/plugin/tpl/plugin_generate_code_in_page.html b/modules/plugin/tpl/plugin_generate_code_in_page.html index 85dbf2693..256e76bba 100644 --- a/modules/plugin/tpl/plugin_generate_code_in_page.html +++ b/modules/plugin/tpl/plugin_generate_code_in_page.html @@ -1,5 +1,5 @@ - + diff --git a/modules/spamfilter/lang/ko.lang.php b/modules/spamfilter/lang/ko.lang.php index 16d5d07e1..43820c8a9 100644 --- a/modules/spamfilter/lang/ko.lang.php +++ b/modules/spamfilter/lang/ko.lang.php @@ -1,8 +1,8 @@ - * @desc : 한국어 언어팩 (기본적인 내용만 수록) + * @file modules/spamfilter/lang/ko.lang.php + * @author zero + * @brief 한국어 언어팩 (기본적인 내용만 수록) **/ // action 관련 diff --git a/modules/spamfilter/tpl/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html index 0c5b03fdb..f9e1c9193 100644 --- a/modules/spamfilter/tpl/denied_ip_list.html +++ b/modules/spamfilter/tpl/denied_ip_list.html @@ -1,7 +1,7 @@ - - + +
diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html index bf23c9bbf..6b1258e5c 100644 --- a/modules/spamfilter/tpl/denied_word_list.html +++ b/modules/spamfilter/tpl/denied_word_list.html @@ -1,7 +1,7 @@ + -
diff --git a/modules/spamfilter/tpl/header.html b/modules/spamfilter/tpl/header.html index c8278c087..c8982c6f7 100644 --- a/modules/spamfilter/tpl/header.html +++ b/modules/spamfilter/tpl/header.html @@ -1,3 +1,5 @@ + +
style="font-weight:bold">[{$lang->cmd_module_config}] style="font-weight:bold">[{$lang->cmd_denied_ip}] diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html index 777d41659..b39411807 100644 --- a/modules/spamfilter/tpl/index.html +++ b/modules/spamfilter/tpl/index.html @@ -1,6 +1,7 @@ - + + diff --git a/modules/spamfilter/tpl/js/spamfilter.js b/modules/spamfilter/tpl/js/spamfilter_admin.js similarity index 100% rename from modules/spamfilter/tpl/js/spamfilter.js rename to modules/spamfilter/tpl/js/spamfilter_admin.js diff --git a/modules/trackback/tpl/error.html b/modules/trackback/tpl/error.html new file mode 100644 index 000000000..9cd7c2cbc --- /dev/null +++ b/modules/trackback/tpl/error.html @@ -0,0 +1,5 @@ +{''} + + {$error} + + diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index f1d48083f..ebf329a47 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -1,6 +1,6 @@ - +
{$lang->total_count} : {number_format($total_count)}, {$lang->page_count} : {number_format($page)} / {number_format($total_page)} @@ -50,7 +50,6 @@
-
@@ -62,7 +61,7 @@ - +
diff --git a/modules/trackback/trackback.view.php b/modules/trackback/trackback.view.php index 72679eef8..1addc92ee 100644 --- a/modules/trackback/trackback.view.php +++ b/modules/trackback/trackback.view.php @@ -65,16 +65,12 @@ * 메세지를 출력하고 그냥 종료 시켜 버림 **/ function dispMessage($error, $message) { - // 헤더 출력 - header("Content-Type: text/xml; charset=UTF-8"); - header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); - header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); - header("Cache-Control: no-store, no-cache, must-revalidate"); - header("Cache-Control: post-check=0, pre-check=0", false); - header("Pragma: no-cache"); - print ''."\n"; - print "\n{$error}{$message}"; - exit(); + // 결과 출력을 XMLRPC로 강제 지정 + Context::setResponseMethod("XMLRPC"); + + // 템플릿 지정 + $this->setTemplatePath($this->module_path.'tpl'); + $this->setTemplateFile('error'); } }