merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -5,7 +5,7 @@
{@$thumbnail_idx = $widget_info->content_items[0]->getFirstThumbnailIdx() }
{@$have_first_thumbnail=true}
<p class="widgetThumb floatLeft" style="margin-right:-{$widget_info->thumbnail_width}px">
<a href="{$widget_info->content_items[$thumbnail_idx]->getLink()}" class="thumb"><img src="{$widget_info->content_items[$thumbnail_idx]->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"></a>
<a href="{$widget_info->content_items[$thumbnail_idx]->getLink()}" class="thumb" target="_blank"|cond="$widget_info->new_window"><img src="{$widget_info->content_items[$thumbnail_idx]->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"></a>
</p>
<!--@end-->
@ -17,14 +17,14 @@
<!--@foreach($widget_info->option_view_arr as $k => $v)-->
<!--@if($v=='title')-->
<!--@if($widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
<a href="{getSiteUrl($item->domain, '', 'mid', $item->get('mid'))}" class="board"><strong>{$item->getBrowserTitle()}</strong></a>
<a href="{getSiteUrl($item->domain, '', 'mid', $item->get('mid'))}" class="board" target="_blank"|cond="$widget_info->new_window"><strong>{$item->getBrowserTitle()}</strong></a>
<!--@end-->
<!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
<a href="{getSiteUrl($item->domain,'','mid',$item->get('mid'),'category',$item->get('category_srl'))}"><strong class="category">{$item->getCategory()}</strong></a>
<a href="{getSiteUrl($item->domain,'','mid',$item->get('mid'),'category',$item->get('category_srl'))}" target="_blank"|cond="$widget_info->new_window"><strong class="category">{$item->getCategory()}</strong></a>
<!--@end-->
<a href="{$item->getLink()}">{$item->getTitle($widget_info->subject_cut_size)}</a>
<a href="{$item->getLink()}" target="_blank"|cond="$widget_info->new_window">{$item->getTitle($widget_info->subject_cut_size)}</a>
<!--@if($widget_info->show_comment_count=='Y' && $item->getCommentCount())-->
<em class="replyNum" title="Replies"><a href="{$item->getLink()}#comment">{$item->getCommentCount()}</a></em>
@ -63,7 +63,7 @@
{@$thumbnail_idx = $widget_info->content_items[0]->getFirstThumbnailIdx() }
{@$have_first_thumbnail=true}
<p class="widgetThumb floatLeft" style="margin-right:-{$widget_info->thumbnail_width}px">
<a href="{$widget_info->content_items[$thumbnail_idx]->getLink()}" class="thumb"><img src="{$widget_info->content_items[$thumbnail_idx]->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"></a>
<a href="{$widget_info->content_items[$thumbnail_idx]->getLink()}" class="thumb" target="_blank"|cond="$widget_info->new_window"><img src="{$widget_info->content_items[$thumbnail_idx]->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"></a>
</p>
<!--@end-->
@ -78,21 +78,21 @@
<td class="title">
<!--@if($widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
<a href="{getSiteUrl($item->domain, '', 'mid', $item->get('mid'))}"><strong class="board">{$item->getBrowserTitle()}</strong></a>
<a href="{getSiteUrl($item->domain, '', 'mid', $item->get('mid'))}" target="_blank"|cond="$widget_info->new_window"><strong class="board">{$item->getBrowserTitle()}</strong></a>
<!--@end-->
<!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
<a href="{getSiteUrl($item->domain,'','mid',$item->get('mid'),'category',$item->get('category_srl'))}"><strong class="category">{$item->getCategory()}</strong></a>
<a href="{getSiteUrl($item->domain,'','mid',$item->get('mid'),'category',$item->get('category_srl'))}" target="_blank"|cond="$widget_info->new_window"><strong class="category">{$item->getCategory()}</strong></a>
<!--@end-->
<a href="{$item->getLink()}">{$item->getTitle($widget_info->subject_cut_size)}</a>
<a href="{$item->getLink()}" target="_blank"|cond="$widget_info->new_window">{$item->getTitle($widget_info->subject_cut_size)}</a>
<!--@if($widget_info->show_comment_count=='Y' && $item->getCommentCount())-->
<em class="replyNum" title="Replies"><a href="{$item->getLink()}#comment">{$item->getCommentCount()}</a></em>
<em class="replyNum" title="Replies"><a href="{$item->getLink()}#comment" target="_blank"|cond="$widget_info->new_window">{$item->getCommentCount()}</a></em>
<!--@end-->
<!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
<em class="trackbackNum" title="Trackbacks"><a href="{$item->getLink()}#trackback">{$item->getTrackbackCount()}</a></em>
<em class="trackbackNum" title="Trackbacks"><a href="{$item->getLink()}#trackback" target="_blank"|cond="$widget_info->new_window">{$item->getTrackbackCount()}</a></em>
<!--@end-->
<!--@if($widget_info->show_icon=='Y')-->