diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index 03f0b6af3..d2bfaf663 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -187,6 +187,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: #popBody .tableType5 td .w100 { width:100%; display:block;} #popBody .tableType5 td .checkbox { margin:-3px; margin-bottom:1em; } #popBody .tableType5 td p { line-height:1.4em;} +#popBody .tableType5 td.blue a { color:#158692;} #popBody .tableType5 .borderBottomNone { border-bottom:none;} /* ----- Popup | End ----- */ @@ -210,3 +211,5 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .title { font-size:1.5em; font-weight:bold; margin-top:2em; margin-bottom:.5em; color:#666666; } .desc { font-size:1em; margin-bottom:.5em; color:#ADADAD;} +.w700 { width:700px; } +.w5 { width:5em; } diff --git a/modules/blog/tpl/index.html b/modules/blog/tpl/index.html index 6bf558c41..1561de345 100644 --- a/modules/blog/tpl/index.html +++ b/modules/blog/tpl/index.html @@ -16,7 +16,7 @@
- @@ -33,7 +33,7 @@ {$lang->skin} {$lang->admin_id} {$lang->regdate} - {$lang->cmd_move} + {$lang->cmd_view} {$lang->cmd_delete} @@ -49,13 +49,13 @@ {$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_view} {$lang->cmd_delete} diff --git a/modules/blog/tpl/js/blog_admin.js b/modules/blog/tpl/js/blog_admin.js index 45b270f72..142787987 100644 --- a/modules/blog/tpl/js/blog_admin.js +++ b/modules/blog/tpl/js/blog_admin.js @@ -93,7 +93,7 @@ function completeInsertGrant(ret_obj) { /* 카테고리 이동 */ function doChangeCategory(fo_obj) { - var module_category_srl = fo_obj.category.options[fo_obj.category.selectedIndex].value; + var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value; if(module_category_srl==-1) { location.href = current_url.setQuery('act','dispModuleAdminCategory'); return false; diff --git a/modules/board/tpl/category_list.html b/modules/board/tpl/category_list.html index adf2c64df..f9dc324f3 100644 --- a/modules/board/tpl/category_list.html +++ b/modules/board/tpl/category_list.html @@ -29,7 +29,7 @@ - {htmlspecialchars($category_info->title)} + {htmlspecialchars($category_info->title)} {zdate($category_info->last_update,"Y-m-d H:i:s")} {$lang->cmd_modify} diff --git a/modules/board/tpl/index.html b/modules/board/tpl/index.html index f234daf35..cd0bb01bf 100644 --- a/modules/board/tpl/index.html +++ b/modules/board/tpl/index.html @@ -16,7 +16,7 @@ - @@ -33,7 +33,7 @@ {$lang->skin} {$lang->admin_id} {$lang->regdate} - {$lang->cmd_move} + {$lang->cmd_view} {$lang->cmd_delete} @@ -48,13 +48,13 @@ {$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_view} {$lang->cmd_delete} diff --git a/modules/board/tpl/js/board_admin.js b/modules/board/tpl/js/board_admin.js index 917035a5a..48c4c43a1 100644 --- a/modules/board/tpl/js/board_admin.js +++ b/modules/board/tpl/js/board_admin.js @@ -15,6 +15,7 @@ function completeInsertBoard(ret_obj) { alert(message); var url = current_url.setQuery('act','dispBoardAdminBoardInfo'); + if(module_srl) url = url.setQuery('module_srl',module_srl); if(page) url.setQuery('page',page); location.href = url; } @@ -91,7 +92,7 @@ function completeInsertGrant(ret_obj) { /* 카테고리 이동 */ function doChangeCategory(fo_obj) { - var module_category_srl = fo_obj.category.options[fo_obj.category.selectedIndex].value; + var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value; if(module_category_srl==-1) { location.href = current_url.setQuery('act','dispModuleAdminCategory'); return false; diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php index 4bfa04d8c..38189bf23 100644 --- a/modules/menu/menu.admin.view.php +++ b/modules/menu/menu.admin.view.php @@ -78,9 +78,20 @@ * @brief 메뉴에서 선택할 수 있는 mid목록을 보여줌 **/ function dispMenuAdminMidList() { - // mid 목록을 구해옴 $oModuleModel = &getModel('module'); - $mid_list = $oModuleModel->getMidList(); + + // 모듈 카테고리 목록을 구함 + $module_category = $oModuleModel->getModuleCategories(); + Context::set('module_category', $module_category); + + // 모듈 목록을 구함 + $module_list = $oModuleModel->getModuleList(); + Context::set('module_list', $module_list); + + // mid 목록을 구해옴 + $args->module_category_srl = Context::get('module_category_srl'); + $args->module = Context::get('target_module'); + $mid_list = $oModuleModel->getMidList($args); Context::set('mid_list', $mid_list); // 메뉴을 팝업으로 지정 diff --git a/modules/menu/tpl/mid_list.html b/modules/menu/tpl/mid_list.html index a1f8ffab9..d02ddd4a3 100644 --- a/modules/menu/tpl/mid_list.html +++ b/modules/menu/tpl/mid_list.html @@ -1,19 +1,67 @@ -
- - - - - - +
+

{$lang->cmd_search_mid}

+
+ +
+
{$lang->mid}{$lang->title}{$lang->cmd_select}
+ + + + + + + + + - + + + - +
+ + + + + + + + +
+ + + + + +
+
{$lang->mid}{$lang->title}{$lang->cmd_select}
{$key} + + {$lang->not_exists} + + {$module_category[$val->module_category_srl]->title} + + {$val->module}{$key} {$val->browser_title}{$lang->cmd_select}{$lang->cmd_select}
+ +
+ +
diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 49df258b4..3313c1000 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -112,8 +112,8 @@ /** * @brief DB에 생성된 mid목록을 구해옴 **/ - function getMidList() { - $output = executeQuery('module.getMidList'); + function getMidList($args = null) { + $output = executeQuery('module.getMidList', $args); if(!$output->toBool()) return $output; $list = $output->data; diff --git a/modules/module/queries/getMidList.xml b/modules/module/queries/getMidList.xml index 24c488b72..a1da1a6be 100644 --- a/modules/module/queries/getMidList.xml +++ b/modules/module/queries/getMidList.xml @@ -5,6 +5,10 @@ + + + + diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html index c554ae56f..0574e7be7 100644 --- a/modules/page/tpl/index.html +++ b/modules/page/tpl/index.html @@ -17,7 +17,7 @@
- @@ -32,7 +32,7 @@ {$lang->browser_title} {$lang->is_default} {$lang->regdate} - {$lang->cmd_move} + {$lang->cmd_view} {$lang->cmd_delete} @@ -48,11 +48,11 @@ {$module_category[$val->module_category_srl]->title} - {$val->mid} + {$val->mid} {$val->browser_title} {$val->is_default} {zdate($val->regdate,"Y-m-d")} - {$lang->cmd_move} + {$lang->cmd_view} {$lang->cmd_delete} diff --git a/modules/page/tpl/js/page_admin.js b/modules/page/tpl/js/page_admin.js index 8debd7f03..664b957d0 100644 --- a/modules/page/tpl/js/page_admin.js +++ b/modules/page/tpl/js/page_admin.js @@ -41,7 +41,7 @@ function completeDeletePage(ret_obj) { /* 카테고리 이동 */ function doChangeCategory(fo_obj) { - var module_category_srl = fo_obj.category.options[fo_obj.category.selectedIndex].value; + var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value; if(module_category_srl==-1) { location.href = current_url.setQuery('act','dispModuleAdminCategory'); return false;