merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -10,8 +10,7 @@
<thead>
<tr>
<th scope="col">{$lang->no}</th>
<th scope="col">{$lang->user_id}</th>
<th scope="col">{$lang->user_name}</th>
<th scope="col">{Context::getLang($identifier)}</th>
<th scope="col">{$lang->nick_name}</th>
<th scope="col">{$lang->point}</th>
<th scope="col">{$lang->level}</th>
@ -21,8 +20,8 @@
<!--@foreach($member_list as $no => $val)-->
<tr>
<td>{$no}</td>
<td>{$val->user_id}</td>
<td>{$val->user_name}</td>
<td cond="$identifier == 'user_id'">{$val->user_id}</td>
<td cond="$identifier != 'user_id'">{$val->email_address}</td>
<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
<td>
<form action="./" method="get">