From cd0a673824576d276ccfa29fcfc127897d842fd4 Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Tue, 25 Sep 2012 15:22:41 +0000
Subject: [PATCH] issue 2533 update theme in member info page.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11516 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.admin.view.php  |  5 ++
 modules/member/tpl/insert_member.html |  1 +
 modules/member/tpl/member_info.html   | 66 +++++++++------------------
 3 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 9dbe7b3e6..52bd731d9 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -171,6 +171,7 @@
         function dispMemberAdminInfo() {
             $oMemberModel = &getModel('member');
             $oModuleModel = &getModel('module');
+
             $member_config = $oModuleModel->getModuleConfig('member');
             Context::set('member_config', $member_config);
 			$extendForm = $oMemberModel->getCombineJoinForm($this->memberInfo);            
@@ -185,6 +186,10 @@
 			$security = new Security();
 			$security->encodeHTML('member_config..');
 			$security->encodeHTML('extend_form_list...');
+
+			$oMemberView = getView('member');
+
+			$oMemberView->_getDisplayedMemberInfo($this->memberInfo, $extendForm, $member_config);
 			
             $this->setTemplateFile('member_info');
         }
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index a7d0a0de5..8aa711f02 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -106,6 +106,7 @@
 		</div>
 	</div>
 	<div class="x_clearfix">
+		<span class="x_pull-left" cond="$member_srl"><button class="x_btn x_btn-large" type="button" onclick="history.go(-1)">{$lang->cmd_cancel}</button></span>
 		<span class="x_pull-right"><input class="x_btn x_btn-primary x_btn-large" type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
 </form>
diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html
index 445bc8e82..c49427cd3 100644
--- a/modules/member/tpl/member_info.html
+++ b/modules/member/tpl/member_info.html
@@ -1,47 +1,22 @@
 <h1 class="h1">{$lang->member_info}</h1>
-<div class="table even">
-	<table width="100%" border="1" cellspacing="0">
-		<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
-		<!--@if($formInfo->isDefaultForm)-->
-{@$title = Context::getLang($formInfo->name)}
-{@$value = $memberInfo[$formInfo->name]}
-			<!--@if($formInfo->name == 'find_account_question')-->
-{@$value = $lang->find_account_question_items[$value].' : '.$memberInfo['find_account_answer']}
-			<!--@elseif($formInfo->name == 'profile_image' && $memberInfo['profile_image'])-->
-{@$target = $memberInfo['profile_image']}
-{@$value = '<img src="'.$target->src.'" />'}
-			<!--@elseif($formInfo->name == 'image_name' && $memberInfo['image_name'])-->
-{@$target = $memberInfo['image_name']}
-{@$value = '<img src="'.$target->src.'" />'}
-			<!--@elseif($formInfo->name == 'image_mark' && $memberInfo['image_mark'])-->
-{@$target = $memberInfo['image_mark']}
-{@$value = '<img src="'.$target->src.'" />'}
-			<!--@end-->
-		<!--@else-->
-{@$title = $extend_form_list[$formInfo->member_join_form_srl]->column_title}
-{@$orgValue = $extend_form_list[$formInfo->member_join_form_srl]->value}
-			<!--@if($formInfo->type=='tel')-->
-				{@$value = $orgValue[0]}
-					<!--@if($orgValue[1])-->-<!--@end-->
-				{@$value .= $orgValue[1]}
-					<!--@if($orgValue[2])-->-<!--@end-->
-				{@$value .= $orgValue[2]}
-			<!--@elseif($formInfo->type=='kr_zip')-->
-				{@$value = $orgValue[0]}<!--@if($orgValue[1]&&$orgValue[0])--><br /><!--@end-->{@$value .= $orgValue[1]}
-			<!--@elseif($formInfo->type=='checkbox' && is_array($orgValue))-->
-				{@$value = implode(", ",$orgValue)}
-			<!--@elseif($formInfo->type=='date')-->
-				{@$value = zdate($orgValue, "Y-m-d")}
-			<!--@else-->
-				{@$value = nl2br($orgValue)}
-			<!--@end-->
-		<!--@end-->
-
-		<tr cond="$formInfo->isUse && $formInfo->name != 'password'">
-			<th scope="row" >{$title} <em cond="$formInfo->required || $formInfo->mustRequired">*</em></th>
-			<td class="text">{$value}</td>
+<div>
+	<table class="x_table x_table-striped x_table-hover">
+		<tr>
+			<th style="width:120px">{$lang->signup_date}</th>
+			<td>{zdate($memberInfo[regdate],"Y-m-d")}</td>
+		</tr>
+		<tr>
+			<th>{$lang->last_login}</th>
+			<td>{zdate($memberInfo[last_login],"Y-m-d H:i:s")}</td>
+		</tr>
+		<tr loop="$displayDatas => $item">
+			<th scope="row" >{$item->title} <em style="color:red" cond="$item->required || $item->mustRequired">*</em></th>
+			<td class="text">{$item->value}</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->member_group}</th>
+			<td class="text">{implode(', ', $memberInfo['group_list'])}</td>
 		</tr>
-		<!--@end-->
 		<tr>
 			<th scope="row">{$lang->allow_mailing}</th>
 			<td class="text"><!--@if($memberInfo['allow_mailing'] == 'Y')-->{$lang->cmd_yes}<!--@else-->{$lang->cmd_no}<!--@end--></td>
@@ -70,8 +45,9 @@
 			<th scope="row"><div>{$lang->description}</div></th>
 			<td>{$memberInfo['description']}&nbsp;</td>
 		</tr>
-	</table>
+    </table>
 </div>
-<div class="btnArea">
-	<span class="btn medium"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_srl)}">{$lang->cmd_modify}...</a></span>
+<div class="x_clearfix">
+	<span class="x_pull-left" cond="$member_srl"><button class="x_btn x_btn-large" type="button" onclick="history.go(-1)">{$lang->cmd_back}</button></span>
+	<span class="x_pull-right"><a class="x_btn x_btn-primary x_btn-large" href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_srl)}">{$lang->cmd_modify}...</a></span>
 </div>