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

@@ -28,4 +28,4 @@ css/
 .sass-cache/
 .sass-cache/
 script/nginx/logs/
 script/nginx/logs/
 *.DS_Store
 *.DS_Store
-compile
+compile/

@@ -328,7 +328,7 @@
             {{/opts}}
             {{/opts}}
         </div>
         </div>
 
 
-        <div class="goods-container">
+        <div class="goods-container clearfix{{#if opts.sixPerLine}} six-per-line{{/if}}">
             {{#each goods}}
             {{#each goods}}
                 {{> product/good}}
                 {{> product/good}}
             {{/each}}
             {{/each}}

@@ -59,4 +59,10 @@ a:focus {
     outline: none;
     outline: none;
 }
 }
 
 
+.yoho-page {
+    width: 1150px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
 @import "home/index", "product/index";
 @import "home/index", "product/index";

@@ -263,7 +263,7 @@ class BoysController extends AbstractAction
             )
             )
         );
         );
         $data = array(
         $data = array(
-            'headerdata' => array($headerdata),
+            'headerdata' => $headerdata,
             'boysHomePage' => true,
             'boysHomePage' => true,
                 'boy' => array(
                 'boy' => array(
                 'bigSlide' => array(
                 'bigSlide' => array(