Merge branch 'feature/mBrandShop' of http://git.dev.yoho.cn/web/yohobuywap into feature/mBrandShop

some_change

@@ -20,7 +20,7 @@
                 </div>
             </div>
 
-            <ul id="nav" class="nav">
+            <ul id="nav" class="nav home-nav">
                 <li class="active">
                     <a href="#" tab="home-page" class="color" >首页</a>
                 </li>
@@ -97,11 +97,19 @@
             </ul>
         </div>
 
-        <ul id="pos-nav" class="nav">
-            <li>首页</li>
-            <li>上新</li>
-            <li>人气</li>
-            <li>全部商品</li>
+        <ul id="pos-nav" class="nav home-nav">
+             <li class="active">
+                <a href="#" tab="home-page" class="color" >首页</a>
+            </li>
+            <li>
+                <a href="#" tab="new-arrival">上新</a>
+            </li>
+            <li>
+                <a href="#" tab="popularity">人气</a>
+            </li>
+            <li>
+                <a href="#" target="_blank">全部商品</a>
+            </li>
         </ul>
         <ul id="pos-list" class="nav hide">
             <li>最新</li>

@@ -19,7 +19,7 @@ class ShopController extends AbstractAction
     {
     
         $data = array(
-            'branner-top' => '',
+            'branerImg' => '',
             'goodList' => 'http://www.baidu.com',
             'brands' => false,
             'brandImg' => array(