Merge branch 'ww_develop' into develop

@@ -2,7 +2,6 @@
 
 {{> default/header}}
 {{> default/channel_banner}}
-
 <!--六个小电视-->
 <div class="tv-area">
     {{# tvs}}
@@ -83,6 +82,4 @@
         </div>
     </div>
 </div>
-
 {{> default/footer }}
-

+
+
+
+<!--
+    JSON数据组成说明（有广告且有通栏）：
+    topItem1    //广告之前的两个碎片
+    topItem2    //广告与通栏之间的碎片
+    bottomItem  //通栏之后的广告
+    advert      //广告的结构体
+    centerBanner//通栏的结构体
+    pager       //分页结构体
+-->
+{{> default/header}}
+
+
+<div class="editor-content">
+    <span class="photo-span">
+        <img class="photo" src="http://img02.yohoboys.com/contentimg/2015/01/22/16/021a05773e08fdb9dcbe920c96cd01bc3d.png">
+    </span>
+    <span class="username">Mh</span>
+    <span class="usermark">
+        测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡    </span>
+    <span class="comment_button comment-num edit-comment">10</span>
+</div>
+
+
+<div class="editor-comment-content clearfix" style="" cid="38">
+        <div class="usermsg">
+                <span class="about-username">About Mh </span>
+                <span class="about-user">
+                    测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡                </span>
+                <span class="discuss">Discuss This Editor<br>(<em class="comment-num zero">10</em> Comments)</span>
+                <span class="login-explorer">You must Sign up to join the conversation.</span>
+                <span class="user-right">©  Project Copyright Info</span>
+                <span class="report">Report</span>
+        </div>
+        <div class="comment-area" style="display:block;">
+        </div>
+</div>
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# Items}}
+        {{> channel/item}}
+    {{/ Items}}
+</div>
+
+{{> channel/pager}}
+
+{{> default/footer}}
+
+

@@ -7,7 +7,13 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> default/channel_banner }}
+{{> default/header}}
+
+
+<div class="tag-content">
+        <span class="tag-icon"></span>
+        <span class="tag-text">大发现</span>
+</div>
 <div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
     {{# Items}}
         {{> channel/item}}
@@ -16,4 +22,6 @@
 
 {{> channel/pager}}
 
+{{> default/footer}}
+
 

@@ -2,7 +2,7 @@
     <span class="content-item-detail-a-img">
         <a href="{{link}}" target="_blank" class="link" title="{{title}}">
             <img class="lazy pic" src="{{img}}" data-original="{{img}}" alt="{{alt}}" style="display: inline;">
-            <span class='arrow-bottom girl-channel-arrow'></span>
+            <span class='arrow-bottom girl-channel-arrow{{# channelClass}}-{{.}}{{/ channelClass}}'></span>
         </a>
         <span href="{{link}}" style='{{^ isVideo}}display:none;{{/ isVideo}}' target="_blank" class="video-icon" title="{{alt}}"></a>
             
@@ -13,7 +13,7 @@
         </a> 
         &nbsp;/&nbsp;&nbsp;<span>{{date}}</span>
     </span>
-    <a href="{{link}}" target="_blank" class="content-item-detail-title" len="24">{{title}}</a>
-    <a href="{{link}}" target="_blank" class="content-item-detail-subtitle" len="18">{{subtitle}}</a>
+    <a href="{{link}}" target="_blank" class=" content-item-detail-title-style content-item-detail-title{{# channelClass}}-{{.}}{{/ channelClass}}" len="24">{{title}}</a>
+    <a href="{{link}}" target="_blank" class=" content-item-detail-title-style content-item-detail-subtitle{{# channelClass}}-{{.}} content-item-detail-subtitle-style{{/ channelClass}}" len="18">{{subtitle}}</a>
     <a href="{{link}}" target="_blank" class="content-item-detail-detail" len="258" _title="{{detail}}">{{detail}}</a>
 </div>
\ No newline at end of file

@@ -5,28 +5,21 @@
             <img src='http://img02.yohoboys.com/staticimg/2015/04/15/09/02272ce1267b46280b7ea71d4b879cb592.jpg'/>
             <span class='date'>2014/12月号</span>
             <span class='detail'>Theme:PARTY</span>
-            <span class='button-container'>
-                <span class='button prev-button'></span>
-                <span class='button next-button'></span>
-            </span>
         </a>
         <a class='pop-link'>
             <img src='http://img02.yohoboys.com/staticimg/2015/04/15/09/02272ce1267b46280b7ea71d4b879cb592.jpg'/>
             <span class='date'>2014/12月号</span>
             <span class='detail'>Theme:PARTY</span>
-            <span class='button-container'>
-                <span class='button prev-button'></span>
-                <span class='button next-button'></span>
-            </span>
         </a>
         <a class='pop-link'>
             <img src='http://img02.yohoboys.com/staticimg/2015/04/15/09/02272ce1267b46280b7ea71d4b879cb592.jpg'/>
             <span class='date'>2014/12月号</span>
             <span class='detail'>Theme:PARTY</span>
-            <span class='button-container'>
+        </a>
+    </span>
+    
+    <span class='button-container'>
                 <span class='button prev-button'></span>
                 <span class='button next-button'></span>
-            </span>
-        </a>
     </span>
 </div>
\ No newline at end of file

@@ -26,9 +26,9 @@
             <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>
+                    <span class=" menu-link-fashion fashion-choosen menu-link-channel ">fashion<a class="menu" href="{{fashionUrl}}"></a>
                         <div class="submenu submenu-fashion">
-                            <span class="arrow"></span>
+                            <!--<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>
@@ -49,14 +49,14 @@
                             </div>
                             <div class='more-content'><a class='more-content'  href="{{fashionUrl}}">More ></a></div>
                         </div>
-                    
+                    </span>
                     
                 </div>
                 
                 <div class="menu-item  menu-item-sports">
-                    <a class="menu-link-channel menu-link-beauty beauty-choosen" href="{{beautyUrl}}">beauty</a>
+                    <span class="menu-link-channel menu-link-beauty beauty-choosen">beauty<a class="menu" href="{{beautyUrl}}"></a>
                     <div class="submenu submenu-beauty">
-                            <span class="arrow"></span>
+                            <!--<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>
@@ -77,11 +77,12 @@
                             </div>
                             <div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
                      </div>
+                     </span>
                </div>
                 <div class="menu-item  menu-item-lifestyle">
-                    <a class="menu-link-channel menu-link-sports sports-choosen" href="{{sportsUrl}}">sports</a>
+                    <span class="menu-link-channel menu-link-sports sports-choosen">sports<a class="menu" href="{{sportsUrl}}"></a>
                     <div class="submenu submenu-sports">
-                            <span class="arrow"></span>
+                            <!--<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>
@@ -102,11 +103,12 @@
                             </div>
                             <div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div>
                      </div>
+                     </span>
                 </div>
                 <div class="menu-item  menu-item-map">
-                    <a class="menu-link-channel menu-link-lifestyle lifestyle-choosen" href="{{lifestyleUrl}}">lifestyle</a>
+                    <span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">lifestyle<a class="menu" href="{{lifestyleUrl}}"></a>
                     <div class="submenu submenu-lifestyle">
-                            <span class="arrow"></span>
+                            <!--<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>
@@ -127,11 +129,12 @@
                             </div>
                             <div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div>
                      </div>
+                     </span>
                 </div>
                 <div class="menu-item  menu-item-map">
-                    <a class="menu-link-channel menu-link-video video-choosen" href="{{videoUrl}}">video</a>
+                    <span class="menu-link-channel menu-link-video video-choosen">video<a class="menu" href="{{videoUrl}}"></a>
                     <div class="submenu submenu-video">
-                            <span class="arrow"></span>
+                            <!--<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>
@@ -152,6 +155,7 @@
                             </div>
                             <div class='more-content'><a class='more-content' href="{{videoUrl}}">More ></a></div>
                      </div>
+                     </span>
                 </div>
                 <div class="menu-item  menu-item-map">
                     <a class="menu-link-channel menu-link-magazine" href="{{magazineUrl}}">magazine</a>