From de019fad0fd0df99dfb0dfebeddc81061fda6029 Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Mon, 6 Mar 2017 08:25:36 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EB=AA=A9=EB=A1=9D=EC=97=90=EC=84=9C=20=ED=94=84?=
 =?UTF-8?q?=EB=A1=9C=ED=95=84=EC=82=AC=EC=A7=84=EC=9D=84=20=EB=B3=BC=20?=
 =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.admin.view.php | 1 +
 modules/member/tpl/member_list.html  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index fa07e8f48..0d324443a 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -91,6 +91,7 @@ class memberAdminView extends member
 			foreach($output->data as $key => $member)
 			{
 				$output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl,0);
+				$output->data[$key]->profile_image = $oMemberModel->getProfileImage($member->member_srl);
 			}
 		}
 		$config = $this->memberConfig;
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index ef96b80d7..0e5c69a49 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -28,6 +28,7 @@
 		</caption>
 		<thead>
 			<tr>
+				<th scope="col" class="nowr">{$lang->profile_image}</th>
 				<th scope="col" class="nowr">{$lang->email}</th>
 				<th scope="col" class="nowr" loop="$usedIdentifiers=>$name,$title">{$title}</th>
 				<th scope="col" class="nowr">{$lang->status}</th>
@@ -43,6 +44,13 @@
 		<tbody>
 			<tr loop="$member_list=>$no,$member_info">
 				{@$member_info = get_object_vars($member_info)}
+				<td class="nowr">
+					<!--@if($member_info['profile_image'])-->
+					<img src="{$member_info['profile_image']->src}" style="border-radius: 50%; border:1px solid #e0e0e0; padding:1px;width:40px; height:40px;" />
+					<!--@else-->
+					<i style="display:block;font-style:normal;border:1px solid #ddd;width:40px;height:40px;line-height:40px;font-size:16px;font-weight:bold;background:#fff;color:#666;border-radius:50%;text-align:center;">?</i>
+					<!--@end-->
+				</td>
 				<td class="nowr">
 					<a href="#popup_menu_area" class="member_{$member_info['member_srl']}" title="Info">{getEncodeEmailAddress($member_info['email_address'])}</a>
 				</td>

From 3f716c566d4dc397666d660fbbd67d5a47b3363e Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Mon, 6 Mar 2017 08:30:37 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=97=90=EC=84=9C=20=ED=94=84=EB=A1=9C?=
 =?UTF-8?q?=ED=95=84=EC=82=AC=EC=A7=84=EC=9D=84=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=ED=95=A0=EB=95=8C=EC=97=90=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.admin.view.php | 1 +
 modules/member/tpl/member_list.html  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 0d324443a..188735866 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -116,6 +116,7 @@ class memberAdminView extends member
 		Context::set('member_list', $output->data);
 		Context::set('usedIdentifiers', $usedIdentifiers);
 		Context::set('page_navigation', $output->page_navigation);
+		Context::set('profileImageConfig', $config->profile_image);
 
 		$security = new Security();
 		$security->encodeHTML('member_list..user_name', 'member_list..nick_name', 'member_list..group_list..');
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index 0e5c69a49..ebeb89f61 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -28,7 +28,7 @@
 		</caption>
 		<thead>
 			<tr>
-				<th scope="col" class="nowr">{$lang->profile_image}</th>
+				<th scope="col" class="nowr" cond="$profileImageConfig == 'Y'">{$lang->profile_image}</th>
 				<th scope="col" class="nowr">{$lang->email}</th>
 				<th scope="col" class="nowr" loop="$usedIdentifiers=>$name,$title">{$title}</th>
 				<th scope="col" class="nowr">{$lang->status}</th>
@@ -44,7 +44,7 @@
 		<tbody>
 			<tr loop="$member_list=>$no,$member_info">
 				{@$member_info = get_object_vars($member_info)}
-				<td class="nowr">
+				<td class="nowr" cond="$profileImageConfig == 'Y'">
 					<!--@if($member_info['profile_image'])-->
 					<img src="{$member_info['profile_image']->src}" style="border-radius: 50%; border:1px solid #e0e0e0; padding:1px;width:40px; height:40px;" />
 					<!--@else-->

From b5a5b9fff8fa176d93ac6928cf4cf3d24408d5d6 Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Mon, 6 Mar 2017 09:38:50 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EC=9D=B8=EB=9D=BC=EC=9D=B8=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=EB=A5=BC=20css=ED=8C=8C=EC=9D=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EA=B5=90=EC=B2=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/tpl/css/member.css   | 2 ++
 modules/member/tpl/member_list.html | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 modules/member/tpl/css/member.css

diff --git a/modules/member/tpl/css/member.css b/modules/member/tpl/css/member.css
new file mode 100644
index 000000000..e8570c9a9
--- /dev/null
+++ b/modules/member/tpl/css/member.css
@@ -0,0 +1,2 @@
+.profile_img {border-radius: 50%;border:1px solid #e0e0e0;padding:1px;width:40px;height:40px}
+.no_profile {display:block;font-style:normal;border:1px solid #ddd;width:40px;height:40px;line-height:40px;font-size:16px;font-weight:bold;background:#fff;color:#666;border-radius:50%;text-align:center;}
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index ebeb89f61..666bf9597 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -1,3 +1,4 @@
+<load target="css/member.css" />
 <load target="js/member_admin_list.js" type="body" />
 <script>
 	xe.lang.msg_select_user = '{$lang->msg_select_user}';
@@ -46,9 +47,9 @@
 				{@$member_info = get_object_vars($member_info)}
 				<td class="nowr" cond="$profileImageConfig == 'Y'">
 					<!--@if($member_info['profile_image'])-->
-					<img src="{$member_info['profile_image']->src}" style="border-radius: 50%; border:1px solid #e0e0e0; padding:1px;width:40px; height:40px;" />
+					<img src="{$member_info['profile_image']->src}" class="profile_img" />
 					<!--@else-->
-					<i style="display:block;font-style:normal;border:1px solid #ddd;width:40px;height:40px;line-height:40px;font-size:16px;font-weight:bold;background:#fff;color:#666;border-radius:50%;text-align:center;">?</i>
+					<i class="no_profile">?</i>
 					<!--@end-->
 				</td>
 				<td class="nowr">