diff --git a/addons/message/lang/ko.lang.php b/addons/message/lang/ko.lang.php new file mode 100644 index 000000000..cfbf117f5 --- /dev/null +++ b/addons/message/lang/ko.lang.php @@ -0,0 +1,9 @@ +cmd_send_message = '쪽지 보내기'; +?> diff --git a/addons/message/message.addon.php b/addons/message/message.addon.php index 834e5454b..8dce4b6e1 100644 --- a/addons/message/message.addon.php +++ b/addons/message/message.addon.php @@ -12,16 +12,25 @@ // MemberModel::getMemberMenu의 결과값인 menu_list에 쪽지 관련 기능 추가 (아이디 클릭시 팝업메뉴) if($called_position == 'after_module_proc' && $this->module == 'member' && $this->act == 'getMemberMenu') { - // 템플릿에서 사용되기 전의 menu_list - $menu_list = $this->get('menu_list'); + + // 비로그인 사용자라면 패스 + if(!Context::get('is_logged')) return; // 로그인된 사용자 정보를 구함 $logged_info = Context::get('logged_info'); $member_srl = Context::get('member_srl'); - if($logged_info->member_srl != $member_srl) { - $menu_list .= "\nhaha,gg,kk"; - $this->add('menu_list', $menu_list); - } + + // 자신이라면 패스 + if($logged_info->member_srl == $member_srl) return; + + // 언어파일 읽음 + Context::loadLang($addon_path."lang"); + + // 템플릿에서 사용되기 전의 menu_list + $menu_list = $this->get('menu_list'); + + $menu_list .= sprintf("\n%s,winopen('%s','messageBox','width=10,height=10,left=10,top=10,resizable=no,scrollbars=no,toolbars=no')", Context::getLang('cmd_send_message'), './?module=message&act=dispSendMessage&target_member_srl='.$member_srl); + $this->add('menu_list', $menu_list); // 출력 되기 바로 직전일 경우 } else if($called_position == "before_display_content") { diff --git a/common/css/default.css b/common/css/default.css index 30513c19c..842093c8c 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -124,24 +124,30 @@ h6 { } #membermenuarea .item { + color:#777777; padding:2px; margin-bottom:3px; + cursor:pointer; +} + +#membermenuarea .item_on { + padding:2px; + margin-bottom:3px; + color:#FFFFFF; + background-color:#000000; + cursor:pointer; } #membermenuarea .last_item { + color:#777777; padding:2px; + cursor:pointer; } -#membermenuarea A { - color:#777777; - text-decoration:none; +#membermenuarea .last_item_on { padding:2px; -} - -#membermenuarea A:hover { - color:#777777; - text-decoration:none; color:#FFFFFF; background-color:#000000; - padding:2px; + cursor:pointer; } + diff --git a/common/js/common.js b/common/js/common.js index 4c3877b29..54f35383a 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -412,20 +412,16 @@ function displayMemberMenu(ret_obj, response_tags, params) { for(var i=0;i"+str+""; + if(!str || !func) continue; + + html += "
"+str+"
"; } } loaded_member_menu_list[member_srl] = html; diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 9de1dec5c..3d33b1b17 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -37,7 +37,7 @@ $addon = trim($addon_list[$i]); if(!$addon) continue; - $buff .= sprintf(' if(file_exists("./addons/%s/%s.addon.php")) include("./addons/%s/%s.addon.php"); ', $addon, $addon, $addon, $addon); + $buff .= sprintf(' if(file_exists("./addons/%s/%s.addon.php")) { $addon_path = "./addons/%s/"; include("./addons/%s/%s.addon.php"); }', $addon, $addon, $addon, $addon, $addon); } $buff = sprintf('', $buff); diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 812c217c1..d8d757f72 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -486,17 +486,17 @@ // 게시판이나 블로그등일 경우는 특별 옵션 지정 if($mid) { // 회원 정보 보기 - $menu_list[] = sprintf('%s,movePage,%s', Context::getLang('cmd_view_member_info'), sprintf('./?mid=%s&act=dispSignUpForm&member_srl=%s', $mid, $member_srl)); + $menu_list[] = sprintf('%s,movePage(\'%s\')', Context::getLang('cmd_view_member_info'), sprintf('./?mid=%s&act=dispSignUpForm&member_srl=%s', $mid, $member_srl)); // 아이디로 검색 - $menu_list[] = sprintf('%s,movePage,%s', Context::getLang('cmd_view_own_document'), sprintf('./?mid=%s&search_target=user_id&search_keyword=%s', $mid, $user_id)); + $menu_list[] = sprintf('%s,movePage(\'%s\')', Context::getLang('cmd_view_own_document'), sprintf('./?mid=%s&search_target=user_id&search_keyword=%s', $mid, $user_id)); } // 다른 사람의 아이디를 클릭한 경우 (메일, 쪽지 보내기등은 다른 사람에게만 보내는거로 설정) if($member_srl != $logged_info->member_srl) { // 메일 보내기 - $menu_list[] = sprintf('%s,sendMailTo,%s)', Context::getLang('cmd_send_email'), sprintf('%s <%s>', $user_name, $email_address)); + $menu_list[] = sprintf('%s,sendMailTo(\'%s\')', Context::getLang('cmd_send_email'), sprintf('%s <%s>', $user_name, $email_address)); }