From 5278a58c809dc029144981432c6f747e53ac88df Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 25 Jul 2007 07:55:41 +0000
Subject: [PATCH] =?UTF-8?q?=EC=B9=9C=EA=B5=AC=EB=B3=B4=EA=B8=B0=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=B9=9C=EA=B5=AC=EA=B7=B8=EB=A3=B9=EC=9D=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95/=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=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@2013 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/en.lang.php               |  1 +
 modules/member/lang/jp.lang.php               |  1 +
 modules/member/lang/ko.lang.php               |  1 +
 modules/member/lang/zh-CN.lang.php            |  1 +
 modules/member/queries/getFriendGroup.xml     |  2 +-
 .../member/skins/default/friends_list.html    | 20 ++++++++++++-------
 modules/member/skins/default/js/member.js     | 10 ++++++++--
 7 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php
index 9c93b5f84..5e44fbe53 100644
--- a/modules/member/lang/en.lang.php
+++ b/modules/member/lang/en.lang.php
@@ -94,6 +94,7 @@
     $lang->cmd_view_message_box = 'View Message Box';
     $lang->cmd_store = "Keep";
     $lang->cmd_add_friend_group = 'Add Friend Group';
+    $lang->cmd_rename_friend_group = '친구 그룹 이름 변경';
 
     $lang->msg_alreay_scrapped = '이미 스크랩된 게시물입니다';
 
diff --git a/modules/member/lang/jp.lang.php b/modules/member/lang/jp.lang.php
index c1d09ec55..6ef772ccd 100644
--- a/modules/member/lang/jp.lang.php
+++ b/modules/member/lang/jp.lang.php
@@ -94,6 +94,7 @@
     $lang->cmd_view_message_box = 'メッセージ表示';
     $lang->cmd_store = "保存";
     $lang->cmd_add_friend_group = '友達グループ追加';
+    $lang->cmd_rename_friend_group = '친구 그룹 이름 변경';
 
     $lang->msg_alreay_scrapped = '이미 스크랩된 게시물입니다';
 
diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index 2a128b900..9e88e50dc 100644
--- a/modules/member/lang/ko.lang.php
+++ b/modules/member/lang/ko.lang.php
@@ -94,6 +94,7 @@
     $lang->cmd_view_message_box = '쪽지함 보기';
     $lang->cmd_store = "보관";
     $lang->cmd_add_friend_group = '친구 그룹 추가';
+    $lang->cmd_rename_friend_group = '친구 그룹 이름 변경';
 
     $lang->msg_alreay_scrapped = '이미 스크랩된 게시물입니다';
 
diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
index 9dca8c06b..91ef83c92 100644
--- a/modules/member/lang/zh-CN.lang.php
+++ b/modules/member/lang/zh-CN.lang.php
@@ -94,6 +94,7 @@
     $lang->cmd_view_message_box = '查看短信箱';
     $lang->cmd_store = "保管";
     $lang->cmd_add_friend_group = '添加好友组';
+    $lang->cmd_rename_friend_group = '친구 그룹 이름 변경';
 
     $lang->msg_alreay_scrapped = '이미 스크랩된 게시물입니다';
 
diff --git a/modules/member/queries/getFriendGroup.xml b/modules/member/queries/getFriendGroup.xml
index a0db0468f..372996035 100644
--- a/modules/member/queries/getFriendGroup.xml
+++ b/modules/member/queries/getFriendGroup.xml
@@ -7,6 +7,6 @@
     </columns>
     <conditions>
         <condition operation="equal" column="member_srl" var="member_srl" />
-        <condition operation="equal" column="friend_group_srl" var="friend_group_srl" />
+        <condition operation="equal" column="friend_group_srl" var="friend_group_srl" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/member/skins/default/friends_list.html b/modules/member/skins/default/friends_list.html
index 656e895e6..ab7b5fe31 100644
--- a/modules/member/skins/default/friends_list.html
+++ b/modules/member/skins/default/friends_list.html
@@ -1,4 +1,4 @@
-{@ $member_title = $lang->friend_group }
+{@ $member_title = $lang->cmd_view_friend }
 <!--#include("./common_header.html")-->
 <!--%import("filter/delete_checked_friend.xml")-->
 <!--%import("filter/delete_friend_group.xml")-->
@@ -7,13 +7,19 @@
 <form id="fo_friend_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked_friend)">
 
     <div class="boardInformation">
-            <span class="friendNum">{$lang->friend} : <strong>{$total_count}</strong></span> <div class="fr"><a href="#" onclick="popopen('{getUrl('module','member','act','dispMemberAddFriendGroup')}');return false;" class="button"><span>{$lang->cmd_add_friend_group}</span></a></div>
+            <span class="friendNum">{$lang->friend} : <strong>{$total_count}</strong></span> 
+            <div class="fr">
+                <select name="friend_group_list" id="friend_group_list">
+                    <!--@foreach($friend_group_list as $key => $val)-->
+                    <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
+                    <!--@end-->
+                </select>
+                <a href="#" onclick="doRenameFriendGroup();return false;" class="button"><span>{$lang->cmd_modify}</span></a>
+                <a href="#" onclick="doDeleteFriendGroup();return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+                <a href="#" onclick="popopen('{getUrl('module','member','act','dispMemberAddFriendGroup')}');return false;" class="button"><span>{$lang->cmd_add_friend_group}</span></a>
+            </div>
     </div>
 
-    <!--
-    <a href="#" onclick="doDeleteFriendGroup('{$val->friend_group_srl}');return false;">{$lang->cmd_delete}</a>
-    <a href="#" onclick="doRenameFriendGroup('{$val->friend_group_srl}');return false;">{$lang->cmd_modify}</a>
-    -->
     <table cellspacing="0" class="list">
     <col width="40" />
     <col width="150" />
@@ -26,7 +32,7 @@
         <tr>
             <th scope="col" class="check first-child"><input name="check_all" type="checkbox" onclick="doCheckAll(this, 'fo_friend_list');" /></th>
             <th scope="col" class="friendGroup">
-                    <select name="jumpMenu" id="jumpMenu">
+                <select name="jumpMenu" id="jumpMenu">
                     <option value="">{$lang->default_friend_group}</option>
                     <!--@foreach($friend_group_list as $key => $val)-->
                     <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js
index b24e47e50..149d97eba 100644
--- a/modules/member/skins/default/js/member.js
+++ b/modules/member/skins/default/js/member.js
@@ -182,7 +182,10 @@ function completeAddFriendGroup(ret_obj) {
 }
 
 /* 친구 그룹 삭제 */
-function doDeleteFriendGroup(friend_group_srl) {
+function doDeleteFriendGroup() {
+    var obj = xGetElementById('friend_group_list');
+    if(obj.options.length<1) return;
+    var friend_group_srl = obj.options[obj.selectedIndex].value;
     var fo_obj = xGetElementById('for_delete_group');
     fo_obj.friend_group_srl.value = friend_group_srl;
     procFilter(fo_obj, delete_friend_group);
@@ -194,7 +197,10 @@ function completeDeleteFriendGroup(ret_obj) {
 }
 
 /* 친구 그룹의 이름 변경 */
-function doRenameFriendGroup(friend_group_srl) {
+function doRenameFriendGroup() {
+    var obj = xGetElementById('friend_group_list');
+    if(obj.options.length<1) return;
+    var friend_group_srl = obj.options[obj.selectedIndex].value;
     popopen("./?module=member&act=dispMemberAddFriendGroup&friend_group_srl="+friend_group_srl);
 }