fe / YOHOOD · Commits

Go to a project

Authored by microTT
Commit 89ad2d84ba07be435250b524c04b3c679c3ba336 2 parents 81ec73fa e564ba52

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohood into develop

Inline Side-by-side
Showing 4 changed files with 10 additions and 10 deletions
... ... @@ -451,11 +451,11 @@ define('yohood', function(require, exports) {
});
// 鼠标移入显示彩色logo 移出显示灰色logo
$(".brand-list li .img-box").on("mouseenter", function(event) {
$(".brand-list li .img-box").live("mouseenter", function(event) {
var $img = $(this).find("img");
$img.removeClass("grey-brand-logo");
})
$(".brand-list li .img-box").on("mouseleave", function(event) {
$(".brand-list li .img-box").live("mouseleave", function(event) {
var $img = $(this).find("img");
$img.addClass("grey-brand-logo");
})
... ... @@ -801,7 +801,7 @@ define('yohood', function(require, exports) {
$.each(data.data.recom, function(i, v) {
isVideo = (v.tag == '视频') ? 1 : 0;
isTitleStyle = (v.main_title_type == 1) ? 1 : 0;
recom += template(tools.limitWords(v.title, 38), common.getImages(v.thumb, '0230x0130', 'blogimg', '1'),
recom += template(tools.limitWords(v.title, 55), common.getImages(v.thumb, '0230x0130', 'blogimg', '1'),
'/news/detail/id/' + v.id, isVideo, isTitleStyle, v.title, '', v.create_time);
});
... ...
... ... @@ -78,7 +78,7 @@ EOL;
$groupLen ++;
if($groupLen>= 8)
{
$templates[] ='<div class="{class}"><h2>'.$type.'</h2><ul class="clearfix">'.$html.'</ul></div>';
$templates[] ='<div class="box clearfix"><h2>'.$type.'</h2><ul class="clearfix">'.$html.'</ul></div>';
$html = '';
$groupLen = 0;
$groupNum = 0;
... ... @@ -86,13 +86,13 @@ EOL;
}
if(!empty($html))
{
$templates[] ='<div class="{class}"><h2>'.$type.'</h2><ul class="clearfix">'.$html.'</ul></div>';
$templates[] ='<div class="box clearfix"><h2>'.$type.'</h2><ul class="clearfix">'.$html.'</ul></div>';
$html = '';
}
$groupNum ++;
if($groupNum == 2 && !empty($html))
{
$templates[] ='<div class="{class}"><h2>'.$type.'</h2><ul class="clearfix">'.$html.'</ul></div>';
$templates[] ='<div class="box clearfix big-size"><h2>'.$type.'</h2><ul class="clearfix">'.$html.'</ul></div>';
$html = '';
$groupNum = 0;
$groupLen = 0;
... ... @@ -113,7 +113,7 @@ EOL;
if(count($liLen) >= 8)
{
$temp = preg_replace('@<div class="(\w+)">(.+)<\/div>@isU', "\\2", $temp);
$template .='<div class="box clearfix big-size">'.$temp.'</div>';
$template .='<div class="box clearfix">'.$temp.'</div>';
$pos = -1;
}
else
... ...
... ... @@ -25,7 +25,7 @@
</div>
<div id="pageContent" style="text-align: center;" class="pagination">
<?php $this->_component('Common_Pagination',array(
'pagination' => $this->view->pagination,'next_label' => '>>','prev_label' => '<<','current_class' => 'current',
'pagination' => $this->view->pagination,'next_label' => 'NEXT>>','prev_label' => '<<','current_class' => 'current',
'page_class'=>'pagination-inner', 'id'=>'img_page'
));?>
</div>
... ...
<?php if(!empty($list)):?>
<?php foreach($list as $news):
$description = Lib_Utils_StringHelper::substr_full_en(Lib_Utils_StringHelper::stripTags($news['content']), 120);
$description = Lib_Utils_StringHelper::substr_full_en(Lib_Utils_StringHelper::stripTags($news['content']), 142);
$height = $width = 0;
$thumb_size = json_decode($news['thumb_size'], true);
$video = isset($video)? $video : 0;
... ... @@ -51,7 +51,7 @@ $width = 342;
<h2 <?php echo $news['main_title_type'] == 1 ? 'class="volupia"':'';?> style="white-space:nowrap;text-overflow:ellipsis;overflow: hidden;">
<a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" target="_blank">
<?php
echo Lib_Utils_StringHelper::substr_full_en(Lib_Utils_StringHelper::stripTags($news['title']), 120);
echo $news['title'];
?>
</a>
</h2>
... ...