fe / YOHOOD · Commits

Go to a project

Authored by 2586703@qq.com
Commit 5ee8e1531bca11be20cd4c9677a934953d02b8a3 2 parents 2e5750a1 fef77a3d

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

Conflicts:
	res/css/index.css
Inline Side-by-side
Showing 5 changed files with 6 additions and 6 deletions
@@ -618,7 +618,7 @@ seajs.config({ @@ -618,7 +618,7 @@ seajs.config({
618 'jquery': 'lib/jquery', 618 'jquery': 'lib/jquery',
619 'zepto': 'lib/zepto' 619 'zepto': 'lib/zepto'
620 }, 620 },
621 - //base: '../../res/js/',  
622 - base: YohoConfig.resUrl + 'js/', 621 + base: '../../res/js/',
  622 + //base: YohoConfig.resUrl + 'js/',
623 charset: 'utf-8' 623 charset: 'utf-8'
624 }); 624 });
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <?php endforeach;?> 19 <?php endforeach;?>
20 </div> 20 </div>
21 <div class="content"> 21 <div class="content">
22 - <p><?php echo $title;?></p> 22 + <p><?php echo Lib_Helper_Emoji::convert_view($title);?></p>
23 <p class="time"><?php echo date('Y.m.d', $fragment['publishTime'])?></p> 23 <p class="time"><?php echo date('Y.m.d', $fragment['publishTime'])?></p>
24 </div> 24 </div>
25 </div> 25 </div>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <?php endforeach;?> 18 <?php endforeach;?>
19 </div> 19 </div>
20 <div class="content"> 20 <div class="content">
21 - <p><?php echo Lib_Utils_StringHelper::stripTags($fragment['content']);?></p> 21 + <p><?php echo Lib_Helper_Emoji::convert_view(Lib_Utils_StringHelper::stripTags($fragment['content']));?></p>
22 <p class="time"><?php echo date('Y.m.d', $fragment['publishTime'])?></p> 22 <p class="time"><?php echo date('Y.m.d', $fragment['publishTime'])?></p>
23 </div> 23 </div>
24 </div> 24 </div>
@@ -17,7 +17,7 @@ $width = 308; @@ -17,7 +17,7 @@ $width = 308;
17 ?> 17 ?>
18 <div class="<?php !isset($video) ?'fluid-item':'';?>layout-item tiled"> 18 <div class="<?php !isset($video) ?'fluid-item':'';?>layout-item tiled">
19 <div class="image-box"> 19 <div class="image-box">
20 - <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" target="_blank" title="<?php echo $news['title'];?>" 20 + <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" target="_blank" title="<?php echo Lib_Utils_StringHelper::stripTags($news['title']);?>"
21 <?php echo $video !=1 ? sprintf("style=\"height:%spx;width:%spx;overflow: hidden;\"", $height, $width):''; ?>> 21 <?php echo $video !=1 ? sprintf("style=\"height:%spx;width:%spx;overflow: hidden;\"", $height, $width):''; ?>>
22 <img src="<?php echo $thumb;?>" alt="" <?php echo $video !=1 ? sprintf("style=\"height:%spx;width:%spx;\"", $height, $width):''; ?>> 22 <img src="<?php echo $thumb;?>" alt="" <?php echo $video !=1 ? sprintf("style=\"height:%spx;width:%spx;\"", $height, $width):''; ?>>
23 <?php if(trim($news['tag']) == '视频'):?> 23 <?php if(trim($news['tag']) == '视频'):?>
@@ -21,7 +21,7 @@ else @@ -21,7 +21,7 @@ else
21 ?> 21 ?>
22 <div class="layout-item tiled"> 22 <div class="layout-item tiled">
23 <div class="image-box"> 23 <div class="image-box">
24 - <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" title="<?php echo $news['title'];?>"> 24 + <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" title="<?php echo Lib_Utils_StringHelper::stripTags($news['title']);?>">
25 <img src="<?php echo $thumb;?>" alt="" style=""> 25 <img src="<?php echo $thumb;?>" alt="" style="">
26 <?php if(trim($news['tag']) == '视频'):?> 26 <?php if(trim($news['tag']) == '视频'):?>
27 <i class="play-icon"></i> 27 <i class="play-icon"></i>