merge 1.4.5

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8396 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-05-26 05:07:20 +00:00
parent 0fa007a938
commit d77165d263
16 changed files with 131 additions and 66 deletions

View file

@ -13,13 +13,17 @@
<input type="hidden" name="mode" value="" />
</form>
<form id="fo_group_order" action="./" method="get">
<input type="hidden" name="act" value="procMemberAdminUpdateGroupOrder" />
<table cellspacing="0" class="rowTable">
<thead>
<tr>
<th scope="col"><div>{$lang->group_order}</div></th>
<th scope="col" class="half_wide"><div>{$lang->group_title}</div></th>
<th scope="col" class="half_wide"><div>{$lang->description}</div></th>
<th scope="col"><div>{$lang->regdate}</div></th>
<th scope="col"><div>{$lang->is_default}</div></th>
<th scope="col" class="half_wide"><div>{$lang->group_order_change}</div></th>
<th scope="col" colspan="2"><div>&nbsp;</div></th>
</tr>
</thead>
@ -29,12 +33,16 @@
<td colspan="7">{$lang->msg_group_is_null}</td>
</tr>
<!--@end-->
{@$__i=1}
<!--@foreach($group_list as $group_srl => $group_info)-->
<tr class="row{$cycle_idx}">
<input type="hidden" name="group_srls[]" value="{$group_info->group_srl}" />
<td>{$__i++}</td>
<td><!--@if($config->group_image_mark=='Y' && $group_info->image_mark)--><img src="{$group_info->image_mark}" style="vertical-align: middle; margin-right: 3px;" /><!--@endif-->{$group_info->title}</td>
<td>{nl2br($group_info->description)}&nbsp;</td>
<td>{zdate($group_info->regdate,"Y-m-d H:i:s")}</td>
<td><!--@if($group_info->is_default=='Y')-->Y<!--@else-->&nbsp;<!--@end--></td>
<td><a href="#" class="_up">위로</a> <a href="#" class="_down"><span>아래로</span></a></td>
<td><a href="{getUrl('group_srl',$group_info->group_srl)}" title="{$lang->cmd_modify}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a></td>
<td>
<!--@if($group_info->is_default!='Y' && $group_info->is_admin !='Y')-->
@ -45,9 +53,14 @@
</td>
</tr>
<!--@end-->
<tr>
<th colspan="8" class="button">
<span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
</th>
</tr>
</tbody>
</table>
</form>
<!-- 그룹 추가 -->
<form action="./" method="get" onsubmit="return procFilter(this, insert_group)">
@ -84,4 +97,4 @@
</th>
</tr>
</table>
</form>
</form>

View file

@ -339,27 +339,31 @@ function completeDeleteMembers(ret_obj) {
window.close();
}
function doGorupImageMarkUpdateOrder(id) {
var sort = jQuery('#'+id).sortable('toArray');
var params = { group_image_mark_order : [] };
jQuery.each(sort, function(i, val) {
params['group_image_mark_order'].push(val.replace('group_srl_', ''));
});
var response_tags = ['error','message'];
exec_xml('member', 'procMemberAdminGroupImageMarkUpdateOrder', params, completeGroupImageMarkUpdateOrder, response_tags);
}
function completeGroupImageMarkUpdateOrder(ret_obj) {
alert(ret_obj['message']);
}
jQuery(function($) {
$("#group_image_mark_order")
.sortable({
cursor: 'move',
cancel: '.inactive'
});
$("#fo_group_order > table")
.find("a._up")
.click(function(e){
var $tr = $(this).parent().parent();
var $prev = $tr.prev("tr");
if($prev.length)
{
$prev.before($tr);
$tr.parent().find("tr").removeClass("bg1").filter(":odd").addClass("bg1");
}
e.preventDefault();
})
.end()
.find("a._down")
.click(function(){
var $tr = $(this).parent().parent();
var $next = $tr.next("tr");
if($next.length)
{
$next.after($tr);
$tr.parent().find("tr").removeClass("bg1").filter(":odd").addClass("bg1");
}
e.preventDefault();
})
.end()
});