merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,28 +1,32 @@
<load target="css/member.css" />
<div class="xm">
<div class="hx h2">
<h2>{$lang->member_info}</h2>
</div>
<div class="co">
<dl class="dl">
<block loop="$displayDatas => $item">
<dt>{$item->title} <em cond="$item->required || $item->mustRequired">*</em></dt>
<dd>{$item->value}</dd>
</block>
<dt>{$lang->member_group}</dt>
<dd>{implode(', ', $memberInfo['group_list'])}</dd>
<dt>{$lang->signup_date}</dt>
<dd>{zdate($memberInfo[regdate],"Y-m-d")}</dd>
<block cond="$memberInfo[member_srl] == $logged_info->member_srl || $logged_info->is_admin == 'Y'">
<dt>{$lang->last_login}</dt>
<dd>{zdate($memberInfo[last_login],"Y-m-d")}</dd>
</block>
</dl>
<ul class="ba" cond="$memberInfo['member_srl'] == $logged_info->member_srl">
<li cond="$member_config->identifier == 'email_address'"><a href="{getUrl('act', 'dispMemberModifyEmailAddress')}">{$lang->cmd_modify_member_email_address}</a></li>
<li><a href="{getUrl('act','dispMemberModifyInfo','member_srl','')}">{$lang->cmd_modify_member_info}</a></li>
<li><a href="{getUrl('act','dispMemberModifyPassword','member_srl','')}">{$lang->cmd_modify_member_password}</a></li>
<li><a href="{getUrl('act','dispMemberLeave','member_srl','')}">{$lang->cmd_leave}</a></li>
</ul>
</div>
<h2 class="hx h2">{$lang->member_info}</h2>
<div class="table even">
<table class="table table-striped table-hover">
<tr loop="$displayDatas => $item">
<th scope="row" >{$item->title} <em 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>
<tr>
<th>{$lang->signup_date}</th>
<td>{zdate($memberInfo[regdate],"Y-m-d")}</td>
</tr>
<!--@if($memberInfo[member_srl] == $logged_info->member_srl || $logged_info->is_admin == 'Y' )-->
<tr>
<th>{$lang->last_login}</th>
<td>{zdate($memberInfo[last_login],"Y-m-d")}</td>
</tr>
<!--@end-->
</table>
</div>
<div class="ba" cond="$memberInfo['member_srl'] == $logged_info->member_srl">
<li><a class="bn" cond="$member_config->identifier == 'email_address'" href="{getUrl('act', 'dispMemberModifyEmailAddress')}">{$lang->cmd_modify_member_email_address}...</a></li>
<li><a class="bn" href="{getUrl('act','dispMemberModifyInfo','member_srl','')}">{$lang->cmd_modify_member_info}...</a></li>
<li><a class="bn" href="{getUrl('act','dispMemberModifyPassword','member_srl','')}">{$lang->cmd_modify_member_password}...</a></li>
<li><a class="bn" href="{getUrl('act','dispMemberLeave','member_srl','')}">{$lang->cmd_leave}...</a></li>
</div>
</div>