From 75496136d9378aabfdba1f29b6f5e8be7b14a01d Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 28 Mar 2007 02:38:28 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@733 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/admin.view.php | 18 ++++++++++-- modules/admin/tpl/filter/login.xml | 10 ------- modules/admin/tpl/filter/logout.xml | 7 ----- modules/admin/tpl/js/admin.js | 14 --------- modules/admin/tpl/login_form.html | 29 ------------------- modules/admin/tpl/logout.html | 20 ------------- .../member/skins/default/filter/logout.xml | 4 +-- 7 files changed, 17 insertions(+), 85 deletions(-) delete mode 100644 modules/admin/tpl/filter/login.xml delete mode 100644 modules/admin/tpl/filter/logout.xml delete mode 100644 modules/admin/tpl/login_form.html delete mode 100644 modules/admin/tpl/logout.html diff --git a/modules/admin/admin.view.php b/modules/admin/admin.view.php index 878857ee5..ee72bf6d7 100644 --- a/modules/admin/admin.view.php +++ b/modules/admin/admin.view.php @@ -77,16 +77,30 @@ * @brief 관리자 로그인 페이지 출력 **/ function dispLogin() { + // 로그인 되어 있으면 메인 페이지 표시 if(Context::get('is_logged')) return $this->dispIndex(); - $this->setTemplateFile('login_form'); + + // member모듈의 로그인 act를 이용 + $oMemberView = &getView('member'); + $oMemberView->dispLoginForm(); + + $this->setTemplatePath($oMemberView->getTemplatePath()); + $this->setTemplateFile($oMemberView->getTemplateFile()); } /** * @brief 관리자 로그아웃 페이지 출력 **/ function dispLogout() { + // 로그인 되어 있지 않으면 메인 페이지 표시 if(!Context::get('is_logged')) return $this->dispIndex(); - $this->setTemplateFile('logout'); + + // member모듈의 로그아웃 act를 이용 + $oMemberView = &getView('member'); + $oMemberView->dispLogout(); + + $this->setTemplatePath($oMemberView->getTemplatePath()); + $this->setTemplateFile($oMemberView->getTemplateFile()); } } ?> diff --git a/modules/admin/tpl/filter/login.xml b/modules/admin/tpl/filter/login.xml deleted file mode 100644 index 955f12908..000000000 --- a/modules/admin/tpl/filter/login.xml +++ /dev/null @@ -1,10 +0,0 @@ - -
- - - - - - - -
diff --git a/modules/admin/tpl/filter/logout.xml b/modules/admin/tpl/filter/logout.xml deleted file mode 100644 index 25ab7fde4..000000000 --- a/modules/admin/tpl/filter/logout.xml +++ /dev/null @@ -1,7 +0,0 @@ - -
- - - - - diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index a8ab15b93..e3c2cd695 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -4,20 +4,6 @@ * @desc : admin 모듈의 javascript **/ -// 로그아웃 -function completeLogout(ret_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; - - location.href = "./admin.php"; -} - -// 로그인폼에서 아이디 포커스 -function doAdminLoginFocus() { - var fo = xGetElementById('user_id'); - if(fo) fo.focus(); -} - // 숏컷 삭제 function doDeleteShortCut(selected_module) { var fo_obj = xGetElementById('fo_shortcut_info'); diff --git a/modules/admin/tpl/login_form.html b/modules/admin/tpl/login_form.html deleted file mode 100644 index 05582a213..000000000 --- a/modules/admin/tpl/login_form.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
{$lang->user_id}
{$lang->password}
- - -
- -
- - diff --git a/modules/admin/tpl/logout.html b/modules/admin/tpl/logout.html deleted file mode 100644 index e18fbbff7..000000000 --- a/modules/admin/tpl/logout.html +++ /dev/null @@ -1,20 +0,0 @@ - - - -
- - - - - - - - - - -
{$lang->cmd_logout}
{$lang->confirm_logout}
- - -
- -
diff --git a/modules/member/skins/default/filter/logout.xml b/modules/member/skins/default/filter/logout.xml index f1c877dbd..444c50ad8 100644 --- a/modules/member/skins/default/filter/logout.xml +++ b/modules/member/skins/default/filter/logout.xml @@ -1,7 +1,5 @@ -
- - +