diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index 349fd2dfd..08f19da9f 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -340,7 +340,7 @@ $oModule = &getModule('module_manager'); $oModule->updateModuleGrant($module_srl, $grant); - $this->add('sid','board'); + $this->add('mo','board'); $this->add('act','dispGrantInfo'); $this->add('page',Context::get('page')); $this->add('module_srl',Context::get('module_srl')); @@ -361,9 +361,9 @@ $oModule = &getModule('module_manager'); $skin_info = $oModule->loadSkinInfo($this->module_path, $skin); - // 입력받은 변수들을 체크 (sid, act, module_srl, page등 기본적인 변수들 없앰) + // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰) $obj = Context::getRequestVars(); - unset($obj->sid); + unset($obj->mo); unset($obj->act); unset($obj->module_srl); unset($obj->page); @@ -427,7 +427,7 @@ $oModule = &getModule('module_manager'); $oModule->updateModuleExtraVars($module_srl, $extra_vars); - $url = sprintf("./admin.php?sid=%s&module_srl=%s&act=dispSkinInfo&page=%s", 'board', $module_srl, Context::get('page')); + $url = sprintf("./admin.php?mo=%s&module_srl=%s&act=dispSkinInfo&page=%s", 'board', $module_srl, Context::get('page')); print ""; exit(); } @@ -444,7 +444,7 @@ // 기본 값외의 것들을 정리 $extra_var = delObjectVars(Context::getRequestVars(), $args); - unset($extra_var->sid); + unset($extra_var->mo); unset($extra_var->act); unset($extra_var->page); @@ -475,7 +475,7 @@ if(!$output->toBool()) return $output; - $this->add('sid','board'); + $this->add('mo','board'); $this->add('act','dispInfo'); $this->add('page',Context::get('page')); $this->add('module_srl',$output->get('module_srl')); @@ -493,7 +493,7 @@ $output = $oModule->deleteModule($module_srl); if(!$output->toBool()) return $output; - $this->add('sid','board'); + $this->add('mo','board'); $this->add('act','dispContent'); $this->add('page',Context::get('page')); $this->setMessage('success_deleted'); @@ -512,7 +512,7 @@ $output = $oDocument->insertCategory($module_srl, $category_title); if(!$output->toBool()) return $output; - $this->add('sid','board'); + $this->add('mo','board'); $this->add('act','dispCategoryInfo'); $this->add('page',Context::get('page')); $this->add('module_srl',$module_srl); diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml index 06f37f354..15ceea73f 100644 --- a/modules/board/conf/module.xml +++ b/modules/board/conf/module.xml @@ -38,6 +38,7 @@ + @@ -50,6 +51,7 @@ + @@ -57,6 +59,7 @@ + diff --git a/modules/board/tpl.admin/board_delete.html b/modules/board/tpl.admin/board_delete.html index 02136ac7c..76367b1dc 100644 --- a/modules/board/tpl.admin/board_delete.html +++ b/modules/board/tpl.admin/board_delete.html @@ -1,8 +1,7 @@ - +
- diff --git a/modules/board/tpl.admin/filter/delete_module.xml b/modules/board/tpl.admin/filter/delete_module.xml new file mode 100644 index 000000000..8dc934dea --- /dev/null +++ b/modules/board/tpl.admin/filter/delete_module.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + +
diff --git a/modules/board/tpl.admin/filter/filter.delete_module.xml b/modules/board/tpl.admin/filter/filter.delete_module.xml deleted file mode 100644 index ce7bba07c..000000000 --- a/modules/board/tpl.admin/filter/filter.delete_module.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/modules/board/tpl.admin/filter/filter.insert.xml b/modules/board/tpl.admin/filter/filter.insert.xml deleted file mode 100644 index 6152deb8d..000000000 --- a/modules/board/tpl.admin/filter/filter.insert.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/modules/board/tpl.admin/filter/filter.insert_category.xml b/modules/board/tpl.admin/filter/filter.insert_category.xml deleted file mode 100644 index 2f67d5148..000000000 --- a/modules/board/tpl.admin/filter/filter.insert_category.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/modules/board/tpl.admin/filter/insert.xml b/modules/board/tpl.admin/filter/insert.xml new file mode 100644 index 000000000..10a083cde --- /dev/null +++ b/modules/board/tpl.admin/filter/insert.xml @@ -0,0 +1,15 @@ + +
+ + + + + + + + + + + + +
 diff --git a/modules/board/tpl.admin/filter/insert_category.xml b/modules/board/tpl.admin/filter/insert_category.xml new file mode 100644 index 000000000..ea7e7c2bb --- /dev/null +++ b/modules/board/tpl.admin/filter/insert_category.xml @@ -0,0 +1,15 @@ + +
+ + + + + + + + + + + + +
 diff --git a/modules/board/tpl.admin/filter/filter.insert_grant.xml b/modules/board/tpl.admin/filter/insert_grant.xml similarity index 100% rename from modules/board/tpl.admin/filter/filter.insert_grant.xml rename to modules/board/tpl.admin/filter/insert_grant.xml diff --git a/modules/board/tpl.admin/filter/filter.update_category.xml b/modules/board/tpl.admin/filter/update_category.xml similarity index 100% rename from modules/board/tpl.admin/filter/filter.update_category.xml rename to modules/board/tpl.admin/filter/update_category.xml diff --git a/modules/board/tpl.admin/js/admin.js b/modules/board/tpl.admin/js/admin.js index 6a53ad5ca..1f0d47a3a 100644 --- a/modules/board/tpl.admin/js/admin.js +++ b/modules/board/tpl.admin/js/admin.js @@ -5,29 +5,31 @@ **/ /* 모듈 생성 후 */ -function procInsert(ret_obj, response_tags) { +function completeBoardInsert(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; - var sid = ret_obj['sid']; + + var mo = ret_obj['mo']; var act = ret_obj['act']; var page = ret_obj['page']; var module_srl = ret_obj['module_srl']; + alert(message); - url = "./admin.php?sid="+sid+"&module_srl="+module_srl+"&page="+page+"&act="+act; + var url = "./?module=admin&mo="+mo+"&module_srl="+module_srl+"&page="+page+"&act="+act; location.href = url; } /* 모듈 삭제 후 */ -function procDelete(ret_obj, response_tags) { +function completeBoardDelet(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; - var sid = ret_obj['sid']; + var mo = ret_obj['mo']; var act = ret_obj['act']; var page = ret_obj['page']; alert(message); - url = "./admin.php?sid="+sid+"&page="+page+"&act="+act; + var url = "./?module=admin&mo="+mo+"&page="+page+"&act="+act; location.href = url; } @@ -39,30 +41,23 @@ function doUpdateCategory(category_srl, mode, message) { fo_obj.category_srl.value = category_srl; fo_obj.mode.value = mode; - procFormFilter(fo_obj, update_category, procReload); + procFilter(fo_obj, update_category); } /* 카테고리 정보 수정 후 */ -function procUpdateCategory(ret_obj, response_tags) { +function completCategoryUpdate(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; var module_srl = ret_obj['module_srl']; + alert(message); - var url = "./admin.php?sid=board&module_srl="+module_srl+"&act=dispCategoryInfo"; + var url = "./?module=admin&mo=board&module_srl="+module_srl+"&act=dispAdminCategoryInfo"; location.href = url; } -/* 메세지 출력후 현페이지 리로드 */ -function procReload(ret_obj, response_tags) { - var error = ret_obj['error']; - var message = ret_obj['message']; - if(message) alert(message); - location.href = location.href; -} - /* 권한 관련 */ -function procSelectAll(obj, key) { +function doSelectAll(obj, key) { var fo_obj = obj.parentNode; while(fo_obj.nodeName != 'FORM') { fo_obj = fo_obj.parentNode; } for(var i=0;i