merge sandbox to trunk for 1.4.4.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7743 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-30 08:12:09 +00:00
parent b8299c8a65
commit 9139515e57
23 changed files with 93 additions and 38 deletions

View file

@ -28,4 +28,6 @@
'last_update' => 'Last update',
'ipaddress' => 'IP Address',
);
$lang->no_text_comment = 'No text in this comment.';
?>

View file

@ -28,4 +28,6 @@
'last_update' => 'Ultima actualización',
'ipaddress' => 'Dirección IP',
);
$lang->no_text_comment = 'No text in this comment.';
?>

View file

@ -29,4 +29,6 @@
'last_update' => 'Mise à Jour',
'ipaddress' => 'Adresse IP',
);
$lang->no_text_comment = 'No text in this comment.';
?>

View file

@ -29,4 +29,6 @@
'last_update' => '最終更新日 ',
'ipaddress' => 'IPアドレス',
);
$lang->no_text_comment = 'No text in this comment.';
?>

View file

@ -29,4 +29,6 @@
'last_update' => '최근수정일 ',
'ipaddress' => 'IP 주소',
);
$lang->no_text_comment = '텍스트가 없는 댓글입니다.';
?>

View file

@ -29,4 +29,6 @@
'last_update' => 'Дата последнего обновления',
'ipaddress' => 'IP-адрес',
);
$lang->no_text_comment = 'No text in this comment.';
?>

View file

@ -30,4 +30,6 @@
'last_update' => 'Cập nhật lần cuối',
'ipaddress' => 'IP',
);
$lang->no_text_comment = 'No text in this comment.';
?>

View file

@ -29,4 +29,6 @@
'last_update' => '最后更新 ',
'ipaddress' => 'IP 地址',
);
$lang->no_text_comment = 'No text in this comment.';
?>

View file

@ -29,4 +29,6 @@
'last_update' => '最後更新',
'ipaddress' => 'IP位址',
);
$lang->no_text_comment = 'No text in this comment.';
?>

View file

@ -45,10 +45,11 @@
</thead>
<tbody>
<!--@foreach($comment_list as $no => $val)-->
{@ $comment = cut_str(trim(htmlspecialchars(strip_tags($val->content))), 200, '...')}
<tr>
<td class="number center">{$no}</td>
<td class="center"><input type="checkbox" name="cart" value="{$val->comment_srl}" /></td>
<td class="left"><a href="{getUrl('','document_srl',$val->document_srl)}#comment_{$val->comment_srl}" onclick="window.open(this.href);return false;">{cut_str(htmlspecialchars(strip_tags($val->content)),200,'...')}</a></td>
<td class="left"><a href="{getUrl('','document_srl',$val->document_srl)}#comment_{$val->comment_srl}" onclick="window.open(this.href);return false;"><!--@if(strlen($comment))-->{$comment}<!--@else--><em style="font-style:italic;">{$lang->no_text_comment}</em><!--@end--></a></td>
<td class="nowrap"><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
<td class="date center nowrap">{(zdate($val->regdate,"Y-m-d\nH:i:s"))}</td>
<td class="number left nowrap"><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>