Merge branch 'ww_develop' into develop

Conflicts:
	actions/default/index.html

-{{> default/header }}
-{{> default/channel_banner }}
+
+
+{{> default/header}}
+{{> default/channel_banner}}
+
 <!--六个小电视-->
 <div class="tv-area">
     {{# tvs}}
@@ -13,7 +16,7 @@
 <div class="content">
     
     {{# topItems}}
-    <div class="home-item-public {{borderClass}}">
+    <div class="home-item-public {{# borderClass}}home-item-border{{/ borderClass}}">
         <a href='{{link}}' target="_blank" class="img-link">
             <img class='img' src='{{img}}'/>
             <span class='arrow-bottom girl-channel-arrow'></span>
@@ -80,4 +83,6 @@
         </div>
     </div>
 </div>
-{{> default/footer }}
\ No newline at end of file
+
+{{> default/footer }}
+

+{{> default/header }}
 {{> default/channel_banner }}
 <div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
     {{# topItems}}
         {{> channel/item}}
     {{/ topItems}}
-</div>
\ No newline at end of file
+</div>
+{{> default/footer }}
\ No newline at end of file

+{{> default/header }}
 {{> default/channel_banner }}
 <div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
     {{# topItems}}
@@ -7,4 +8,5 @@
     {{# bottomItems}}
         {{> channel/item}}
     {{/ bottomItems}}
-</div>
\ No newline at end of file
+</div>
+{{> default/footer }}
\ No newline at end of file

@@ -5,6 +5,7 @@
     advert      //广告的结构体
     pager       //分页结构体
 -->
+{{> default/header }}
 {{> default/channel_banner }}
 <div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
     {{# topItems1}}
@@ -14,4 +15,5 @@
     {{# topItems2}}
         {{> channel/item}}
     {{/ topItems2}}
-</div>
\ No newline at end of file
+</div>
+{{> default/footer }}
\ No newline at end of file

+<!--
+    JSON数据组成说明（有广告且有通栏）：
+    topItem1    //广告之前的两个碎片
+    topItem2    //广告与通栏之间的碎片
+    bottomItem  //通栏之后的广告
+    advert      //广告的结构体
+    centerBanner//通栏的结构体
+    pager       //分页结构体
+-->
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# Items}}
+        {{> channel/item}}
+    {{/ Items}}
+</div>
+
+{{> channel/pager}}
+
+

+
+        
+        <div class="bottom-content">
+            <div class="boys">
+                <span class="boybitmap"></span>
+                <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>
+                <span class="text-area">
+                    <a class="title" target="_blank" href="{{boyDownloadUrl}}">YOHO!BOYS</a>
+                    <a class="subtitle" target="_blank" href="{{boyDownloadUrl}}">We love to Play &amp; Lean</a>
+                    <a class="detail" target="_blank" href="{{boyDownloadUrl}}">线上周刊，潮流百科生活</a>
+                </span>
+            </div>
+            <span class='split-line'></span>
+            <div class="girls">
+                <span class="girlbitmap"></span>
+                <span class="icon"><a href="{{girlDownloadUrl}}" target="_blank"></a></span>
+                <span class="text-area">
+                    <a class="title" target="_blank" href="{{girlDownloadUrl}}">YOHO!GIRLS</a>
+                    <a class="subtitle" target="_blank" href="{{girlDownloadUrl}}">No Fashion,No Life</a>
+                    <a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>
+                </span>
+            </div>
+        </div>
+        <div class="bottom-right">
+            <div class="div-right">
+                <span class="span-links">
+                    <a class="links" href="{{aboutUsUrl}}">关于我们</a><a class="line"></a>
+                    <a class="links" href="{{contactusUrl}}">联系我们</a><a class="line"></a>
+                    <a class="links" href="{{serversUrl}}">版权声明</a><a class="line"></a>
+                    <a class="links" href="{{privacyUrl}}">隐私条款</a><a class="line"></a>
+                    <a class="links" href="{{feedbackUrl}}">意见反馈</a><a class="line"></a>
+                    <a class="links" href="{{linksUrl}}">友情链接</a>
+                </span>
+                <span class="span-right">
+                    CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号
+                </span>
+            </div>
+        </div>
+        
+        
+        
+    </body>
+    <script type="text/javascript" src="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/all-debug.js?nowrap"></script>
+    <script type="text/javascript">
+        seajs.use(['yohogirls-frontend-web/0.0.1/js/channel/detail-debug'], function(detail) {
+            if (detail) {
+                detail.init();
+            }
+        });
+    </script>
+</html>
\ No newline at end of file

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <title>Yoho!Girls | No Fashion, No Life!</title>
+        <link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
+    </head>
+    <body>
+        <!--开头的集团导航-->
+        <div class="enterprise-header-content">
+            <ul class="enterprise-header">
+                <li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集团官网</a></li>
+                <li class="item enterprise-youhuo"><span>YOHO!有货</span><a href="http://www.yohobuy.com" target="_blank">潮流购物</a></li>
+                <li class="item  enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
+                <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
+                <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
+                <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
+                <li class="jianfan"><a class="choosen" href="javascript:;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="http://newboys.test.yoho.cn/go/location">繁</a></li>
+            </ul>
+        </div>
+
+        <!--高的集团导航-->
+        <div class="enterprise" id="maxEnterprise">
+            <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div>
+            <div class='menubar-header menubar-header-{{channel}}'>
+            <div class="menubar">
+               <div class="menu-item menu-item-fashion">
+                    <a class=" menu-link-fashion fashion-choosen menu-link-channel " href="{{fashionUrl}}">fashion</a>
+                        <div class="submenu submenu-fashion">
+                            <span class="arrow"></span>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">测试添加热播资讯</span>
+                                <span class="text detail">热播资讯添加</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">再次发布一条新资讯</span>
+                                <span class="text detail">测试发布资讯</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
+                                <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
+                                <span class="text">测试封面图片添加测试封面图片添加</span>
+                                <span class="text detail">测试封面测试封面测试</span>
+                            </div>
+                            <div class='more-content'><a class='more-content'  href="{{fashionUrl}}">More ></a></div>
+                        </div>
+                    
+                    
+                </div>
+                
+                <div class="menu-item  menu-item-sports">
+                    <a class="menu-link-channel menu-link-beauty beauty-choosen" href="{{beautyUrl}}">beauty</a>
+                    <div class="submenu submenu-beauty">
+                            <span class="arrow"></span>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">测试添加热播资讯</span>
+                                <span class="text detail">热播资讯添加</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">再次发布一条新资讯</span>
+                                <span class="text detail">测试发布资讯</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
+                                <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
+                                <span class="text">测试封面图片添加测试封面图片添加</span>
+                                <span class="text detail">测试封面测试封面测试</span>
+                            </div>
+                            <div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
+                     </div>
+               </div>
+                <div class="menu-item  menu-item-lifestyle">
+                    <a class="menu-link-channel menu-link-sports sports-choosen" href="{{sportsUrl}}">sports</a>
+                    <div class="submenu submenu-sports">
+                            <span class="arrow"></span>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">测试添加热播资讯</span>
+                                <span class="text detail">热播资讯添加</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">再次发布一条新资讯</span>
+                                <span class="text detail">测试发布资讯</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
+                                <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
+                                <span class="text">测试封面图片添加测试封面图片添加</span>
+                                <span class="text detail">测试封面测试封面测试</span>
+                            </div>
+                            <div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div>
+                     </div>
+                </div>
+                <div class="menu-item  menu-item-map">
+                    <a class="menu-link-channel menu-link-lifestyle lifestyle-choosen" href="{{lifestyleUrl}}">lifestyle</a>
+                    <div class="submenu submenu-lifestyle">
+                            <span class="arrow"></span>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">测试添加热播资讯</span>
+                                <span class="text detail">热播资讯添加</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">再次发布一条新资讯</span>
+                                <span class="text detail">测试发布资讯</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
+                                <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
+                                <span class="text">测试封面图片添加测试封面图片添加</span>
+                                <span class="text detail">测试封面测试封面测试</span>
+                            </div>
+                            <div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div>
+                     </div>
+                </div>
+                <div class="menu-item  menu-item-map">
+                    <a class="menu-link-channel menu-link-video video-choosen" href="{{videoUrl}}">video</a>
+                    <div class="submenu submenu-video">
+                            <span class="arrow"></span>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">测试添加热播资讯</span>
+                                <span class="text detail">热播资讯添加</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
+                                <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
+                                <span class="text">再次发布一条新资讯</span>
+                                <span class="text detail">测试发布资讯</span>
+                            </div>
+                            <div class="content-item-menu">
+                                <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
+                                <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
+                                <span class="text">测试封面图片添加测试封面图片添加</span>
+                                <span class="text detail">测试封面测试封面测试</span>
+                            </div>
+                            <div class='more-content'><a class='more-content' href="{{videoUrl}}">More ></a></div>
+                     </div>
+                </div>
+                <div class="menu-item  menu-item-map">
+                    <a class="menu-link-channel menu-link-magazine" href="{{magazineUrl}}">magazine</a>
+                </div>
+                <span class="right iconfont search-area">
+                    <span class="search-loading-icon" style="display: none;"></span>
+                    <a class="search-icon" href="/search"></a>
+                    <span class="search-text search-text-big" style="display: inline;"><span class="search-text-content">search...</span><input class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"><span class="home-search-button" id="search-button" style="display: none;"></span></span>
+                    <span class="splitline"></span>
+                </span>
+                </div>
+            </div>
+        </div>
+
+
+
+
+
+
+
+
+
+
+        <!--矮的集团导航-->
+        <div class="enterprise" id="minEnterprise" style="margin-top: 0px; position: fixed; padding-top: 10px; top: 0px; z-index: 99999; background: rgb(255, 255, 255);display:none;">
+            <div class="menubar menubar-move">
+                <div class="menu-item-logo"><a href="http://www.yohogirls.com"></a></div>
+                <div class="menu-item video menu-item-video">
+                    <a class="menu-link" href="http://www.yohogirls.com"></a>
+                    <div class="submenu-withleft submenu-video">
+                        <div class="left">
+                            <a href="http://newboys.test.yoho.cn/video/list-people-index-1.html" class="left-item" sub="video-people">人物</a>
+                            <a href="http://newboys.test.yoho.cn/video/list-viral-index-1.html" class="left-item" sub="video-viral">网络疯传</a>
+                            <a href="http://newboys.test.yoho.cn/video/list-ahum-index-1.html" class="left-item" sub="video-ahum">嗯哼</a>
+                            <a href="http://newboys.test.yoho.cn/video/list-playboy-index-1.html" class="left-item" sub="video-playboy">公子游</a>
+                            <a href="http://newboys.test.yoho.cn/video/list-sneakerfile-index-1.html" class="left-item" sub="video-sneakerfile">球鞋档案</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="menu-item fashion menu-item-fashion">
+                    <a class="menu-link" href="http://newboys.test.yoho.cn/fashion/index.html"></a>
+                    <div class="submenu submenu-fashion"></div>
+                </div>
+
+                <div class="menu-item sports menu-item-sports">
+                    <a class="menu-link" href="http://newboys.test.yoho.cn/sports/index.html"></a>
+                <div class="submenu submenu-sports"></div>
+                </div>
+                <div class="menu-item lifestyle menu-item-lifestyle">
+                    <a class="menu-link" href="http://newboys.test.yoho.cn/lifestyle/index.html"></a>
+                    <div class="submenu submenu-lifestyle"></div>
+                </div>
+                <div class="menu-item magazine menu-item-magazine">
+                    <a class="menu-link" href="http://newboys.test.yoho.cn/magazine/index.html"></a>
+                </div>
+                <div class="menu-item map  menu-item-map">
+                    <a class="menu-link" href="http://newboys.test.yoho.cn/map/index.html"></a>
+                </div>
+                <span class="right iconfont search-area">
+                    <span class="icons"></span>
+                    <span class="getapp">get our app!
+                        <span class="bitmap" style="display: none;">
+                            <a class="a-link" href="https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&amp;down.myapp.com" target="_blank"></a>
+                            <a class="a-img"></a>
+                            <a class="a-text">DOWNLOAD <br>YOHO!BOYS</a>
+                        </span> 
+                    </span>
+                    <span class="splitline"></span>
+                <span class="search-loading-icon" style="display: none;"></span>
+                <a class="search-icon" href="/search"></a>
+                    <span class="search-text search-text-small" style="display: inline; width: 73px;"><span class="search-text-content">Search...</span><input class="search-input-box search-input-box-small ac_input" autocomplete="off" style="display: none;"><span class="home-search-button" id="search-button" style="display: none;"></span></span>
+                </span>
+            </div>
+        </div>