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

@@ -15,7 +15,7 @@ class Controller_Admin_Index extends Controller_Admin_Base
         $this->_view['data'] = $info;
         $this->_view['type'] = $type;
         $this->_view['typeDescription'] = array( 1 =>'banner', 2 =>'广告', 3 =>'广告', 4=> '广告');
-        $this->_view['sizeDescription'] = array( 1 =>'980x474 [移动端：320x155]', 2 =>'342x420', 3=>'1180x500px[移动端：320x155]', 4 =>'290x356px');
+        $this->_view['sizeDescription'] = array( 1 =>'980x474 [移动端：1180x500]', 2 =>'342x420', 3=>'1180x500px[移动端：320x155]', 4 =>'290x356px');
         $this->_view['key'] = Lib_Images::genKey('fragmentimg');
     }
     

@@ -108,7 +108,7 @@ EOL;
 
                 foreach ($templates as $temp) {
                     preg_match_all("/<li>/i", $temp, $liLen, PREG_SET_ORDER);
-                    if(count($liLen) > 16)
+                    if(count($liLen) > 8)
                     {
                         $temp = preg_replace('@<div class="(.*)">(.+)<\/div>@isU', "\\2", $temp);
                         $template .='<div class="box big-size clearfix">'.$temp.'</div>';
@@ -163,7 +163,7 @@ EOL;
                 // {
                 //     $template .='</div>';
                 // }
-                
+
                 echo $template;
                 ?>
             </div>