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

@ -89,8 +89,8 @@ function completeGetPollList(ret_obj, response_tags)
var objPoll = poll_list[x];
htmlListBuffer += '<tr>' +
'<td class="title">'+objPoll.title+'</td>' +
'<td>'+objPoll.poll_count+'</td>' +
'<td>'+objPoll.nick_name+'</td>' +
'<td class="nowr">'+objPoll.poll_count+'</td>' +
'<td class="nowr">'+objPoll.nick_name+'</td>' +
'</tr>' +
'<input type="hidden" name="cart[]" value="'+objPoll.poll_index_srl+'" />';
}

View file

@ -18,20 +18,22 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<thead>
<tr>
<th scope="col" class="text">{$lang->title}</th>
<th scope="col">{$lang->poll_checkcount}</th>
<th scope="col">{$lang->poll_join_count}</th>
<th scope="col">{$lang->author}</th>
<th scope="col">{$lang->regdate}</th>
<th scope="col" class="nowr">{$lang->poll_checkcount}</th>
<th scope="col" class="nowr">{$lang->poll_join_count}</th>
<th scope="col" class="nowr">{$lang->author}</th>
<th scope="col" class="nowr">{$lang->regdate}</th>
<th scope="col" class="nowr">{$lang->poll_stop_date}</th>
<th scope="col"><input type="checkbox" data-name="cart"title="Check All" /></th>
</tr>
</thead>
<tfoot>
<tr>
<th scope="col" class="text">{$lang->title}</th>
<th scope="col">{$lang->poll_checkcount}</th>
<th scope="col">{$lang->poll_join_count}</th>
<th scope="col">{$lang->author}</th>
<th scope="col">{$lang->regdate}</th>
<th scope="col" class="nowr">{$lang->poll_checkcount}</th>
<th scope="col" class="nowr">{$lang->poll_join_count}</th>
<th scope="col" class="nowr">{$lang->author}</th>
<th scope="col" class="nowr">{$lang->regdate}</th>
<th scope="col" class="nowr">{$lang->poll_stop_date}</th>
<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
</tr>
</tfoot>
@ -39,10 +41,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<!--@foreach($poll_list as $no => $val)-->
<tr>
<td class="title"><a href="<!--@if($val->document_srl)-->{getUrl('')}?document_srl={$val->document_srl}<!--@end--><!--@if($val->comment_srl)-->#comment_{$val->comment_srl}<!--@end-->" target="_blank">{$val->title}</a></td>
<td><!--@if($val->checkcount == 1)-->{$lang->single_check}<!--@else-->{$lang->multi_check}<!--@end--></td>
<td>{$val->poll_count}</td>
<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
<td>{zdate($val->regdate,"Y-m-d H:i")}</td>
<td class="nowr"><!--@if($val->checkcount == 1)-->{$lang->single_check}<!--@else-->{$lang->multi_check}<!--@end--></td>
<td class="nowr">{$val->poll_count}</td>
<td class="nowr"><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
<td class="nowr">{zdate($val->poll_regdate,"Y-m-d H:i")}</td>
<td class="nowr">{zdate($val->poll_stop_date,"Y-m-d")}</td>
<td>
<input type="checkbox" name="cart" value="{$val->poll_index_srl}" />
</td>