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

@@ -573,7 +573,7 @@ define('yohood', function(require, exports) {
 					'</div>' +
 					'<div class="content">' +
 					'<h2 {titleStyle}>' +
-					'<a href="' + url + '" title="' + title + '">' + topic + '</a>' +
+					'<a href="' + url + '" title="' + title + '" target="_blank">' + topic + '</a>' +
 					'</h2>' +
 					'</div>' +
 					'</div>';

@@ -2,7 +2,10 @@
 <?php $this->_block('main');?>
     <div class="scene-tab">
          <ul class="clearfix">
-            <?php foreach(current($this->view->navs) as $nav):?>
+            <?php 
+              $navs = current($this->view->navs);
+              ksort($navs);
+             foreach($navs as $nav):?>
                <li 
                      <?php if($nav['timestamp'] == $this->view->currentday && $nav['enable']) echo 'class="current"';
                        else if (!$nav['enable']) echo 'class="disable"';?>

@@ -34,9 +34,9 @@ else
      </div>
      <div class="content">
          <h2 <?php echo $news['main_title_type'] == 1 ? 'class="volupia"':'';?>>
-             <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>"><?php echo $news['title'];?></a>
+             <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" target="_blank"><?php echo $news['title'];?></a>
          </h2>
-         <p class="text-content"><?php echo $description;?></p>
+         <p class="text-content"><a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" target="_blank"><?php echo $description;?></a></p>
          <p class="time"><?php echo date('Y.m.d', $news['create_time']);?></p>
      </div>
 </div>

@@ -3,23 +3,21 @@ $title = Util_StringHelper::substr_cn($news['title'], 90);
 $description = Lib_Utils_StringHelper::substr_cn(Lib_Utils_StringHelper::stripTags($news['content']), 68);
 $height = $width = 0;
 $thumb_size = json_decode($news['thumb_size'], true);
-if ($news['thumb'])
+if(empty($news['client_thumb']))
 {
-	$thumb = Lib_Images::getImageUrl($news['thumb'], 'source','fragmentimg');
+	$thumb = $news['thumb'];
 }
 else
 {
-	$thumb = SITE_IMG.'/pic01.png';
+    $thumb = $news['client_thumb'];
 }
-if($thumb_size['height'] < 308 && $thumb_size['width'] < 308)
+if (!empty($thumb))
 {
-    $height = $thumb_size['height'];
-    $width = $thumb_size['width'];
+	$thumb = Lib_Images::getImageUrl($thumb, 'source','fragmentimg');
 }
 else
 {
-    $height = ceil($thumb_size['height'] * (308 / $thumb_size['width']));
-    $width = 308;
+	$thumb = SITE_IMG.'/pic01.png';
 }
 ?>
 <div class="layout-item tiled">