fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix merge error

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9276 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 10:19:58 +00:00
parent c32beaf35e
commit d311ccc377
14 changed files with 59 additions and 2439 deletions
Download patch file Download diff file Expand all files Collapse all files

100
modules/point/tpl/member_list.html
View file

@ -1,4 +1,3 @@
<<<<<<< .working
<load target="js/point_admin.js" usecdn="true" />
<!--#include("header.html")-->
@ -22,9 +21,9 @@
<!--@foreach($member_list as $no => $val)-->
<tr class="row{$cycle_idx}">
<td class="center number">{$no}</td>
<td class="nowrap">{htmlspecialchars($val->user_id)}</td>
<td class="nowrap">{htmlspecialchars($val->user_name)}</td>
<td class="nowrap"><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
<td class="nowrap">{$val->user_id}</td>
<td class="nowrap">{$val->user_name}</td>
<td class="nowrap"><span class="member_{$val->member_srl}">{$val->nick_name}</span></td>
<td class="nowrap">
<form action="./" method="get">
<input type="hidden" name="member_srl" value="{$val->member_srl}" />
@ -91,96 +90,3 @@
<a href="#" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
</fieldset>
</form>
=======
<!--%import("filter/update_point.xml")-->
<!--%import("js/point_admin.js")-->
<!--#include("header.html")-->
<table cellspacing="0" class="crossTable">
<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
<thead>
<tr>
<th scope="col"><div>{$lang->no}</div></th>
<th scope="col"><div>{$lang->user_id}</div></th>
<th scope="col"><div>{$lang->user_name}</div></th>
<th scope="col"><div>{$lang->nick_name}</div></th>
<th scope="col"><div>{$lang->point}</div></th>
<th scope="col"><div>{$lang->level}</div></th>
</tr>
</thead>
<tbody>
<!--@foreach($member_list as $no => $val)-->
<tr class="row{$cycle_idx}">
<td class="center number">{$no}</td>
<td class="nowrap">{$val->user_id}</td>
<td class="nowrap">{$val->user_name}</td>
<td class="nowrap"><span class="member_{$val->member_srl}">{$val->nick_name}</span></td>
<td class="nowrap">
<form action="./" method="get">
<input type="hidden" name="member_srl" value="{$val->member_srl}" />
<input type="text" name="orgpoint" value="{$val->point}" class="inputTypeText w80" readonly />
<input type="text" id="point_{$val->member_srl}" name="point" class="inputTypeText w80" />
<span class="button"><input type="button" value="+" onclick="updatePoint({$val->member_srl}, 'add')"/></span>
<span class="button"><input type="button" value="-" onclick="updatePoint({$val->member_srl}, 'minus')"/></span>
<span class="button"><input type="button" value="{$lang->cmd_update}" onclick="updatePoint({$val->member_srl}, 'update')" /></span>
</form>
</td>
<td class="number center">{$val->level}</td>
</tr>
<!--@end-->
</tbody>
</table>
<form id="updateForm" action="./" method="POST">
<input type="hidden" id="update_action" name="action" value="" />
<input type="hidden" id="update_member_srl" name="member_srl" value="" />
<input type="hidden" id="update_point" name="point" class="inputTypeText w80" />
</form>
<!-- 페이지 네비게이션 -->
<div class="pagination a1">
<a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a>
<!--@while($page_no = $page_navigation->getNextPage())-->
<!--@if($page == $page_no)-->
<strong>{$page_no}</strong>
<!--@else-->
<a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
<!--@end-->
<!--@end-->
<a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
</div>
<!-- 검색 -->
<form action="./" method="get" class="adminSearch">
<input type="hidden" name="module" value="{$module}" />
<input type="hidden" name="act" value="{$act}" />
<fieldset>
<select name="is_admin">
<option value="" <!--@if($is_admin!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
<option value="Y" <!--@if($is_admin=='Y')-->selected="selected"<!--@end-->>{$lang->is_admin}</option>
</select>
<select name="is_denied">
<option value="" <!--@if($is_denied!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
<option value="Y" <!--@if($is_denied=='Y')-->selected="selected"<!--@end-->>{$lang->denied}</option>
</select>
<select name="selected_group_srl">
<option value="0">{$lang->group}</option>
<!--@foreach($group_list as $key => $val)-->
<option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
<!--@end-->
</select>
<select name="search_target">
<option value="">{$lang->search_target}</option>
<!--@foreach($lang->search_target_list as $key => $val)-->
<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
<!--@end-->
</select>
<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
<span class="button black strong"><input type="submit" value="{$lang->cmd_search}" /></span>
<a href="#" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
</fieldset>
</form>
>>>>>>> .merge-right.r9269