From 4593918f774c76fbeb54f55141b4e2cd7b7b5b52 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 24 Jul 2007 04:46:09 +0000 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=EC=8B=9C=EC=97=90=20=EC=AA=BD=EC=A7=80?= =?UTF-8?q?=ED=95=A8=EB=B3=B4=EA=B8=B0/=EC=B9=9C=EA=B5=AC=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0/=EC=9E=91=EC=84=B1=EA=B8=80=20=EB=B3=B4=EA=B8=B0?= =?UTF-8?q?=EB=A5=BC=20title=EC=97=90=20select=20box=EB=A1=9C=20=EB=AA=A8?= =?UTF-8?q?=EC=9D=8C.=20=EC=9E=91=EC=84=B1=EA=B8=80=20=EB=B3=B4=EA=B8=B0?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/trunk@1981 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/conf/module.xml | 1 + modules/member/lang/ko.lang.php | 4 +- modules/member/member.class.php | 11 ++- modules/member/member.view.php | 47 ++++++++++- .../member/skins/default/common_header.html | 18 ++++ modules/member/skins/default/css/normal.css | 8 ++ .../member/skins/default/document_list.html | 78 ++++++++++++++++++ .../member/skins/default/friends_list.html | 6 +- .../skins/default/images/bottomGotoFirst.gif | Bin 0 -> 51 bytes .../skins/default/images/bottomGotoLast.gif | Bin 0 -> 51 bytes .../member/skins/default/images/button_go.gif | Bin 0 -> 316 bytes modules/member/skins/default/leave_form.html | 38 ++++----- modules/member/skins/default/member_info.html | 7 +- .../member/skins/default/member_messages.html | 15 ++-- modules/member/skins/default/modify_info.html | 6 +- .../member/skins/default/modify_password.html | 59 ++++++------- 16 files changed, 211 insertions(+), 87 deletions(-) create mode 100644 modules/member/skins/default/document_list.html create mode 100644 modules/member/skins/default/images/bottomGotoFirst.gif create mode 100644 modules/member/skins/default/images/bottomGotoLast.gif create mode 100755 modules/member/skins/default/images/button_go.gif diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index 30a0b9559..f409bce75 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -7,6 +7,7 @@ + diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php index 78c155372..3eae8cb82 100644 --- a/modules/member/lang/ko.lang.php +++ b/modules/member/lang/ko.lang.php @@ -73,9 +73,9 @@ $lang->cmd_login = '로그인'; $lang->cmd_logout = '로그아웃'; $lang->cmd_signup = '회원 가입'; - $lang->cmd_modify_member_info = '회원정보 수정'; + $lang->cmd_modify_member_info = '회원 정보 수정'; $lang->cmd_modify_member_password = '비밀번호 변경'; - $lang->cmd_view_member_info = '회원정보 보기'; + $lang->cmd_view_member_info = '회원 정보 보기'; $lang->cmd_leave = '탈퇴'; $lang->cmd_member_list = '회원 목록'; diff --git a/modules/member/member.class.php b/modules/member/member.class.php index e7a06df76..9f528db28 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -20,6 +20,7 @@ $oModuleController->insertActionForward('member', 'view', 'dispMemberLeave'); $oModuleController->insertActionForward('member', 'view', 'dispMemberLoginForm'); $oModuleController->insertActionForward('member', 'view', 'dispMemberLogout'); + $oModuleController->insertActionForward('member', 'view', 'dispMemberOwnDocument'); $oModuleController->insertActionForward('member', 'view', 'dispMemberMessages'); $oModuleController->insertActionForward('member', 'view', 'dispMemberSendMessage'); @@ -113,6 +114,11 @@ * @brief 설치가 이상이 없는지 체크하는 method **/ function checkUpdate() { + // dispMemberOwnDocument act의 여부 체크 (2007. 7. 24 추가) + $oModuleModel = &getModel('module'); + $act = $oModuleModel->getActionForward('dispMemberOwnDocument'); + if(!$act) return true; + return false; } @@ -120,7 +126,10 @@ * @brief 업데이트 실행 **/ function moduleUpdate() { - return new Object(); + $oModuleController = &getController('module'); + $oModuleController->insertActionForward('member', 'view', 'dispMemberOwnDocument'); + + return new Object(1, 'success_updated'); } } ?> diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 20c1d8c51..af0b6c223 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -10,6 +10,7 @@ var $group_list = NULL; ///< 그룹 목록 정보 var $member_info = NULL; ///< 선택된 사용자의 정보 var $skin = 'default'; + var $my_menu = null; /** * @brief 초기화 @@ -25,6 +26,14 @@ // template path 지정 $tpl_path = sprintf('%sskins/%s', $this->module_path, $skin); $this->setTemplatePath($tpl_path); + + // my_menu 변수 설정 (자신의 정보와 관련된 부분, 차후 애드온등에서 변수 조절 가능) + $this->my_menu = array( + 'dispMemberInfo' => Context::getLang('cmd_view_member_info'), + 'dispMemberMessages' => Context::getLang('cmd_view_message_box'), + 'dispMemberFriend' => Context::getLang('cmd_view_friend'), + 'dispMemberOwnDocument' => Context::getLang('cmd_view_own_document'), + ); } /** @@ -32,10 +41,10 @@ **/ function dispMemberInfo() { $oMemberModel = &getModel('member'); + $logged_info = Context::get('logged_info'); $member_srl = Context::get('member_srl'); if(!$member_srl && Context::get('is_logged')) { - $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl; } elseif(!$member_srl) { return $this->dispMemberSignUpForm(); @@ -52,6 +61,8 @@ Context::set('member_info', $member_info); Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info)); + if($member_info->member_srl == $logged_info->member_srl) Context::set('my_menu', $this->my_menu); + $this->setTemplateFile('member_info'); } @@ -105,11 +116,38 @@ Context::set('editor', $editor); } + if($member_info->member_srl == $logged_info->member_srl) Context::set('my_menu', $this->my_menu); // 템플릿 파일 지정 $this->setTemplateFile('modify_info'); } + /** + * @brief 회원 작성글 보기 + **/ + function dispMemberOwnDocument() { + $oMemberModel = &getModel('member'); + + // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력 + if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged'); + + $logged_info = Context::get('logged_info'); + $member_srl = $logged_info->member_srl; + + $module_srl = Context::get('module_srl'); + Context::set('module_srl',Context::get('selected_module_srl')); + Context::set('search_target','member_srl'); + Context::set('search_keyword',$member_srl); + + $oDocumentAdminView = &getAdminView('document'); + $oDocumentAdminView->dispDocumentAdminList(); + + Context::get('module_srl', $module_srl); + Context::set('my_menu', $this->my_menu); + + $this->setTemplateFile('document_list'); + } + /** * @brief 로그인 폼 출력 **/ @@ -133,6 +171,8 @@ $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); Context::set('member_info',$member_info); + if($member_info->member_srl == $logged_info->member_srl) Context::set('my_menu', $this->my_menu); + // 템플릿 파일 지정 $this->setTemplateFile('modify_password'); } @@ -152,6 +192,8 @@ $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); Context::set('member_info',$member_info); + if($member_info->member_srl == $logged_info->member_srl) Context::set('my_menu', $this->my_menu); + // 템플릿 파일 지정 $this->setTemplateFile('leave_form'); } @@ -188,7 +230,7 @@ if($message->message_srl == $message_srl) Context::set('message', $message); } - // 각 쪽지들의 갯수 구함 + Context::set('my_menu', $this->my_menu); // 목록 추출 $output = $oMemberModel->getMessages($message_type); @@ -293,6 +335,7 @@ Context::set('page', $output->page); Context::set('friend_list', $output->data); Context::set('page_navigation', $output->page_navigation); + Context::set('my_menu', $this->my_menu); $this->setTemplateFile('friends_list'); } diff --git a/modules/member/skins/default/common_header.html b/modules/member/skins/default/common_header.html index 9b3a37887..d15170b75 100644 --- a/modules/member/skins/default/common_header.html +++ b/modules/member/skins/default/common_header.html @@ -6,3 +6,21 @@
+ + +
+

{$member_title}

+ + +
+ + + +
+ +
+ diff --git a/modules/member/skins/default/css/normal.css b/modules/member/skins/default/css/normal.css index 7ecdb231f..130edd00f 100644 --- a/modules/member/skins/default/css/normal.css +++ b/modules/member/skins/default/css/normal.css @@ -17,6 +17,9 @@ .boardHeader { position:relative; _width:100%; border-top:1px solid #e1e1dd; border-bottom:none; background:#ffffff url(../images/normal/bgH3.gif) no-repeat right bottom; overflow:hidden;} .boardHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/normal/lineH3.gif) no-repeat right bottom;} +.boardHeader .member_option { float:right; position:relative; top:1em; right:1em; } +.boardHeader select { vertical-align:bottom; } +.boardHeader input { vertical-align:bottom; _padding-bottom:1px;} .boardHeader .essential { position:absolute; top:1.5em; right:1em; color:#54564b; font-size:.9em;} .boardHeader .essential:first-letter { color:#ff0000;} @@ -32,6 +35,7 @@ .list th select, .list th input { vertical-align:middle;} .list td { border-top:1px solid #eff0ed; padding:.5em; text-align:center; height:35px;} .list td.registDate { font:.8em Tahoma; color:#999999; text-align:center;} +.list td.num { font:.8em Tahoma; color:#999999; text-align:center;} .list td.check { text-align:center;} .list td.user { color:#333333; font-size:.9em;} .list td.user a { color:#333333;} @@ -143,3 +147,7 @@ .pageNavigation a.goToLast { border:none; border-right:1px solid #ffffff; border-left:1px solid #ffffff; z-index:99; vertical-align:top; padding:0px 7px 4px 6px;} .pageNavigation a.goToFirst img, .pageNavigation a.goToLast img { display:inline-block; padding:2px 0; position:relative; top:2px; _top:1px;} .pageNavigation .current { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#ff6600; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } + +/* Own Document */ +img.button_go { position:relative; bottom:-4px; _bottom:-2px;} +.boardInformation strong { font:bold 11px Tahoma; color:#ff6600;} diff --git a/modules/member/skins/default/document_list.html b/modules/member/skins/default/document_list.html new file mode 100644 index 000000000..09f22a5ef --- /dev/null +++ b/modules/member/skins/default/document_list.html @@ -0,0 +1,78 @@ +{@ $member_title = $lang->cmd_view_own_document } + + + +
+ Total : {number_format($total_count)}, + Page {number_format($page)}/{number_format($total_page)} +
+ + + ++++++ + + + + + + + + + + + + + + + + + + + +
{$lang->no} +
+   + +
+ 		{$lang->readed_count}{$lang->voted_count}{$lang->date}
{$no} + {htmlspecialchars($module_list[$oDocument->get('module_srl')]->browser_title)} - + {$oDocument->getTitleText()} + + + [{$oDocument->getCommentCount()}] + + + + [{$oDocument->getTrackbackCount()}] + + {$oDocument->get('readed_count')}{$oDocument->get('voted_count')}{$oDocument->getRegdate("Y-m-d")}
+ + +
+ {$lang->cmd_back} +
+ + +
+ {$lang->first_page} + + + {$page_no} + + {$page_no} + + + {$lang->last_page} +
+ + diff --git a/modules/member/skins/default/friends_list.html b/modules/member/skins/default/friends_list.html index 96e45eba6..656e895e6 100644 --- a/modules/member/skins/default/friends_list.html +++ b/modules/member/skins/default/friends_list.html @@ -1,13 +1,9 @@ +{@ $member_title = $lang->friend_group } - -
-

{$lang->friend_group}

-
-
diff --git a/modules/member/skins/default/images/bottomGotoFirst.gif b/modules/member/skins/default/images/bottomGotoFirst.gif new file mode 100644 index 0000000000000000000000000000000000000000..e0297fecbe6666e8076cf1c4bd48571dc826c5f3 GIT binary patch literal 51 zcmZ?wbhEHbWM^PyXkcVWOH2Fz|G(l-7DfgJMg|=QAOOiQFmd@Ll<#=3_e}661_o;Y DN%IX& literal 0 HcmV?d00001 diff --git a/modules/member/skins/default/images/bottomGotoLast.gif b/modules/member/skins/default/images/bottomGotoLast.gif new file mode 100644 index 0000000000000000000000000000000000000000..0a7141d0d51a0dcece12d04038c8f846f0ae56c0 GIT binary patch literal 51 zcmZ?wbhEHbWM^PyXkcVWOH2Fz|G(l-7DfgJMg|=QAOOiQFmbu$G48y@J<;=(2!k~M DKokru literal 0 HcmV?d00001 diff --git a/modules/member/skins/default/images/button_go.gif b/modules/member/skins/default/images/button_go.gif new file mode 100755 index 0000000000000000000000000000000000000000..895d1a0780039ea61f1da136e380a36e9258c7bc GIT binary patch literal 316 zcmV-C0mJ@BNk%w1VH5xq0K^{v^z`w&ytMxQ{>sb7dU|@n!o4agDpONa#Kpg*rKOyl zoVK>IV`F2})6qjiLzI-1zQ4V?y1I^zj`#QW_xJbj@ay^c_wDZJ)YZ_lw66E}_3-fS z`1tnj?(F~n|NsC0A^8LW0018VEC2ui02BZe000HK;MZVeX`Wc~VVB^#UM$OkcVUBI z?R@WBg2BM^;~0;|ok!?FI-i{7P(#&Bt`mxOOO<-I6zrs0rD&E24|%PDkO3Y<8bGhx zBZ>MMQSj6w5D*0r5eo?t1a%$-eRT;6kPi=t3T+}$1x O86Vl>msg_leave_member} + -
-
-

{$lang->msg_leave_member}

-
- - -
-
- {$lang->msg_leave_member} - - - - - - - - - - -
{$lang->user_id}{$member_info->user_id}
-
-
+ + + + + + + + + + + +
{$lang->user_id}{$member_info->user_id}
- 취소 + {$lang->cmd_back}
diff --git a/modules/member/skins/default/member_info.html b/modules/member/skins/default/member_info.html index bb3f42e01..dad23edd0 100644 --- a/modules/member/skins/default/member_info.html +++ b/modules/member/skins/default/member_info.html @@ -1,9 +1,6 @@ +{@ $member_title = $lang->cmd_view_member_info } -
-

{$lang->cmd_view_member_info}

-
- @@ -104,8 +101,6 @@ {$lang->cmd_modify_member_info}{$lang->cmd_modify_member_password}{$lang->cmd_leave} - {$lang->cmd_view_message_box} - {$lang->cmd_view_friend}{$lang->cmd_back} diff --git a/modules/member/skins/default/member_messages.html b/modules/member/skins/default/member_messages.html index 99e2ce335..822500ded 100644 --- a/modules/member/skins/default/member_messages.html +++ b/modules/member/skins/default/member_messages.html @@ -1,16 +1,11 @@ + + + {@ $member_title = $val} + + -
-

- - - {$val} - - -

-
-
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html index b6616b5cd..c5aa53ed3 100644 --- a/modules/member/skins/default/modify_info.html +++ b/modules/member/skins/default/modify_info.html @@ -1,4 +1,6 @@ +{@ $member_title = $lang->msg_update_member} + @@ -9,10 +11,6 @@ -
-

{$lang->msg_update_member}

-
-
image_name=='Y' || $member_config->image_mark=='Y')-->enctype="multipart/form-data"> diff --git a/modules/member/skins/default/modify_password.html b/modules/member/skins/default/modify_password.html index 3a9c6093a..115db7d82 100644 --- a/modules/member/skins/default/modify_password.html +++ b/modules/member/skins/default/modify_password.html @@ -1,49 +1,40 @@ +{@ $member_title = $lang->cmd_modify_member_password } - -
-
-

{$lang->cmd_modify_member_password}

-
- -
-
- {$lang->cmd_modify_member_password} - -
- - - - - - - - - - - - -
{$lang->user_id}{$member_info->user_id}
- -
- - {$lang->password2} -
- + + + + + + + + + + + + + + + +
{$lang->user_id}{$member_info->user_id}
+ +
+ + {$lang->password2} +

{$lang->about_password}

- - +
+
- 취소 + {$lang->cmd_back}
-