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

@ -30,7 +30,7 @@
<label for="signup_point">{$lang->point_signup}</label>
<br />
<input type="text" value="{$config->login_point}" name="login_point" id="login_point" style="width:30px" /> :
<label for="login_point">{$lang->cmd_login}</label>
<label for="login_point">{$lang->cmd_login}...</label>
<br />
<input type="text" name="insert_document" value="{$config->insert_document}" id="insert_document" style="width:30px" /> :
<label for="insert_document">{$lang->point_insert_document}</label>
@ -116,6 +116,7 @@
</div>
</fieldset>
<fieldset>
{@$point_group = @array_flip($config->point_group)}
<h2 class="h2">{$lang->level_point}</h2>
<div class="table">
<table width="100%" border="1" cellspacing="0">
@ -131,17 +132,37 @@
<th scope="col">{$lang->level}</th>
<th scope="col">{$lang->level_icon}</th>
<th scope="col">{$lang->point}</th>
<th scope="col">{$lang->member_group}</th>
</tr>
<tr>
<td>1</td>
<td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/1.gif" alt="" /></td>
<td><input type="text" name="level_step_1" value="{$config->level_step[1]}" style="width:40px;text-align:right" /> {$config->point_name}</td>
{@$point_group_item = $point_group[1]}
{@$title=array()}
<!--@if($point_group_item)-->
<!--@if($config->group_reset != 'N')-->
{@$title[0] = $group_list[$point_group_item.'']->title}
<!--@else-->
{@$title[] = $group_list[$point_group_item.'']->title}
<!--@end-->
<!--@end-->
<td>{implode(', ', $title)}</td>
</tr>
<!--@for($i=2;$i<=$config->max_level;$i++)-->
{@$point_group_item = $point_group[$i]}
<!--@if($point_group_item)-->
<!--@if($config->group_reset != 'N')-->
{@$title[0] = $group_list[$point_group_item.'']->title}
<!--@else-->
{@$title[] = $group_list[$point_group_item.'']->title}
<!--@end-->
<!--@end-->
<tr class="row{(($i-1)%2+1)}">
<td>{$i}</td>
<td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/{$i}.gif" alt="" /></td>
<td><input type="text" id="level_step_{$i}" name="level_step_{$i}" value="{$config->level_step[$i]}" style="width:40px;text-align:right" /> {$config->point_name}</td>
<td>{implode(', ', $title)}</td>
</tr>
<!--@end-->
</table>

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">