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

@@ -22,14 +22,14 @@ class Controller_Brand extends Controller_Abstract
         $client = $this->_request->query('client', 0);
         $client = $this->_request->query('client', 0);
         if($client || $this->_platform != 'web')
         if($client || $this->_platform != 'web')
         {
         {
-            $signBrands = Facade_Brand::getSignBrand();
+            $yohobuyBrands = Facade_Brand::getYohobuyBrand();
             $yohobuyBrandId = '0';
             $yohobuyBrandId = '0';
-            foreach($signBrands as $signBrand)
+            foreach($yohobuyBrands as $yohobuyBrand)
             {
             {
-                $signBrand['brand_name'] = trim(strtolower($signBrand['brand_name']));
-                if(strtolower($info['name']) == $signBrand['brand_name'])
+                $yohobuyBrand['brand_name'] = trim(strtolower($yohobuyBrand['brand_name']));
+                if(strtolower($info['name']) == $yohobuyBrand['brand_name'])
                 {
                 {
-                    $yohobuyBrandId = $signBrand['brand_id'];
+                    $yohobuyBrandId = $yohobuyBrand['brand_id'];
                     break;
                     break;
                 }
                 }
             }
             }

@@ -17,7 +17,7 @@
                   <li>
                   <li>
                    <a href="<?php echo $partner['url'];?>" title="<?php echo $partner['name'];?>" target="_blank">
                    <a href="<?php echo $partner['url'];?>" title="<?php echo $partner['name'];?>" target="_blank">
                        <div class="img-box">
                        <div class="img-box">
-                           <img src="<?php echo Lib_Images::getImageUrl($partner['pic'], 'source','fragmentimg'); ?>" alt="">
+                           <img src="<?php echo Lib_Images::getImageUrl($partner['pic'], 'source','fragmentimg'); ?>" alt="" width="138" height="92">
                        </div>
                        </div>
                    </a>
                    </a>
                  </li>
                  </li>

@@ -17,7 +17,7 @@
                       <li>
                       <li>
                        <a href="<?php echo $partner['url'];?>" title="<?php echo $partner['name'];?>" target="_blank">
                        <a href="<?php echo $partner['url'];?>" title="<?php echo $partner['name'];?>" target="_blank">
                            <div class="img-box">
                            <div class="img-box">
-                               <img src="<?php echo Lib_Images::getImageUrl($partner['pic'], 'source','fragmentimg'); ?>" alt="">
+                               <img src="<?php echo Lib_Images::getImageUrl($partner['pic'], 'source','fragmentimg'); ?>" alt="" >
                            </div>
                            </div>
                        </a>
                        </a>
                      </li>
                      </li>

@@ -65,7 +65,7 @@
              	        $html.= <<<EOL
              	        $html.= <<<EOL
                         <li>
                         <li>
                       <a href="{$partner['url']}" title="{$partner['name']}" target="_blank">
                       <a href="{$partner['url']}" title="{$partner['name']}" target="_blank">
-                        <img src="{$pic}" alt="" style="height:70px;width:70px;"/>
+                        <img src="{$pic}" alt="" style="width:70px;"/>
                      </a>
                      </a>
                    </li>                     	
                    </li>                     	
 EOL;
 EOL;