Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

@@ -5,4 +5,6 @@
         <div class="comments-box feedback"></div>
     </div>
 </div>
+{{> common/comment}}
+{{> common/third_login}}
 {{> layout/footer}}
\ No newline at end of file

@@ -7,6 +7,9 @@
     {{# content}}
         {{> detail/detail_video}}
         {{> detail/detail_slide}}
+        {{# coverEffect}}
+            <div>{{{html}}}</div>
+        {{/ coverEffect}}
         {{> detail/detail_img}}
         {{> detail/detail_text}}
     {{/ content}}

@@ -24,7 +24,7 @@
 </div>
 {{/ writerInfo}}
 
-<div class="editor-comment-content clearfix" style="" cid="38">
+<div class="editor-comment-content clearfix" style="display:none" cid="{{cid}}">
         <div class="usermsg">
                 <span class="about-username">{{username}}  </span>
                 <span class="about-user">
@@ -44,6 +44,8 @@
 </div>
 
 {{> channel/pager}}
+{{> common/comment}}
+{{> common/third_login}}
 
 {{> layout/footer}}
 

@@ -24,15 +24,23 @@
         <div class="channel-index-pager">\{{> html}}</div>
     </div>
     \{{/ page}}
+</script>
+<script id="comment-textarea-tpl" type="x-tmpl-mustache">
     <div class="comment-textarea">
         <div class="anonymous-info clearfix">
             <input class="name-input" type="text" placeholder="Name">
             <input class="email-input" type="text" placeholder="E-mail">
         </div>
-        <textarea placeholder="说点什么..." cid="4288"></textarea>
+        {{^ fan}}
+            <textarea placeholder="说点什么..." cid="4288"></textarea>
+        {{/ fan}}
+        
+        {{# fan}}
+            <textarea placeholder="說點什麼..." cid="4288"></textarea>
+        {{/ fan}}
         <div class="login-status clearfix">
             <div class="userimg">
-                <img src="http://res.yohoboys.comboysweb/assets/images/detail/user-img.png" alt="">
+                <img src="http://localhost:8000/assets/images/detail/user-img.png" alt="">
                 <i></i>
             </div>
             <div class="userinfo" style="display: none;"> 

-{{# default_js}}
+{{# default}}
     {{> script/default}}
-{{/ default_js}}
+{{/ default}}
 
 
+{{# fashion}}
+	{{> script/channel}}
+{{/ fashion}}
 
-{{# channel_js}}
-    {{> script/channel}}
-{{/ channel_js}}
+{{# beauty}}
+	{{> script/channel}}
+{{/ beauty}}
 
-{{# fashion_channel_js}}
-    {{> script/fashion}}
-{{/ fashion_channel_js}}
+{{# sport}}
+	{{> script/channel}}
+{{/ sport}}
 
+{{# lifestyle}}
+	{{> script/channel}}
+{{/ lifestyle}}
 
-{{# search_js}}
+{{# video}}
+	{{> script/channel}}
+{{/ video}}
+
+
+{{# search}}
     {{> script/search}}
-{{/ search_js}}
+{{/ search}}
 
 
-{{# detail_js}}
+{{# detail}}
     {{> script/detail}}
-{{/ detail_js}}
+{{/ detail}}
 
 
-{{# magazine_js}}
+{{# magazine}}
     {{> script/magazine}}
-{{/ magazine_js}}
+{{/ magazine}}
+
+
+{{# feedback}}
+    {{> script/feedback}}
+{{/ feedback}}
+
+{{# writer}}
+    {{> script/writer}}
+{{/ writer}}
+

@@ -2,6 +2,21 @@
 <div class="share" data-link="{{url}}" cover-url="{{cover}}">
     <h4>分享：</h4>
     <ul>
+    {{#if ../fan}}
+        <li class="yohoo-share-button-facebook"><a href="javascript:;"></a></li>
+        <li class="yohoo-share-button-tweet"><a href="javascript:;"></a></li>
+        <li class="yohoo-share-button-sina"><a href="javascript:;"></a></li>
+        <li class="yohoo-share-button-wx"><a href="javascript:;"></a>
+            <div class="wx-qrcode-dialog">
+                <div class="wx-popup-hd">
+                     <span>分享到微信朋友圈</span>
+                </div>
+                <div class="wx-popup-bd"></div>
+                <div class="wx-popup-ft">打開微信，點擊底部的“發現”，使用<br>“掃一掃”即可將網頁分享至朋友圈。</div>
+            </div>
+        </li>
+        <li class="yohoo-share-button-qq"><a href="javascript:;"></a></li>  
+    {{^}}
         <li class="yohoo-share-button-sina"><a href="javascript:;"></a></li>
         <li class="yohoo-share-button-wx">
             <a href="javascript:;"></a>
@@ -9,12 +24,13 @@
                 <div class="wx-popup-hd">
                      <span>分享到微信朋友圈</span>
                 </div>
-                <div class="wx-popup-bd">
-                </div>
-                <div class="wx-popup-ft">打开微信，点击底部的“发现”，使用<br>“扫一扫”即可将网页分享至朋友圈。</div>
+                <div class="wx-popup-bd"></div>
+                    <div class="wx-popup-ft">打开微信，点击底部的“发现”，使用<br>“扫一扫”即可将网页分享至朋友圈。</div>
             </div>
         </li>
         <li class="yohoo-share-button-qq"><a href="javascript:;"></a></li>
+    {{/if}}
     </ul>
 </div>
-{{/ share}}
\ No newline at end of file
+{{/ share}}
+

 <script id="third-login-tpl" type="x-tmpl-mustache">
     <div class="third-login-box clearfix">
-        <span>第三方评论</span>
+        {{^ fan}}
+            <span>第三方评论</span>
+        {{/ fan}}
+        
+        {{# fan}}
+            <span>第三方評論</span>
+        {{/ fan}}
         <a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/thirdbtn-qq.png" alt="" /></a>
         <a class="yoho" href="javascript:;"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/thirdbtn-yoho.png" alt="" /></a>
         <a class="sina" ref="/passport/partner/index/oauth/sina" href="javascript:;"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/thirdbtn-sina.png" alt="" /></a>

 <script id="bottom-related-posts" type="x-tmpl-mustache">
-\{{# relatedPost}}
-<div class="related-posts">
-    <h2>新品播报</h2>
-    <ul class="postslist clearfix">
-        {{> detail/related_post}}
-    </ul>
-    <a href="javascript:;" class="load-more"></a>
-</div>
-\{{/ relatedPost}}
+    \{{# relatedPost}}
+        <div class="related-posts">
+        {{#if fan}}
+            <h2>Related Posts</h2>
+        {{^}}
+            <h2>新品播报</h2>
+        {{/if}}
+        <ul class="postslist clearfix">
+            {{> detail/related_post}}
+        </ul>
+        <a href="javascript:;" class="load-more"></a>
+        </div>
+    \{{/ relatedPost}}
 </script>
\ No newline at end of file

 <div class="focus-us clearfix">
-    <h4>关注我们</h4>
+    {{^ fan}}
+        <h4>关注我们</h4>
+    {{/ fan}}
+
+    {{# fan}}
+        <h4>follow us</h4>
+    {{/ fan}}
+    
     <ul class="focuslist clearfix">
         <li class="show"><a href="http://app.yohoshow.com" target="_blank"></a></li>
         <li class="weibo"><a href="http://weibo.com/yohomedia" target="_blank"></a></li>
@@ -12,6 +19,13 @@
     </ul>
     <div class="textbox clearfix">
         <input type="text" placeholder="me@email.com">
-        <a href="javascript:;">订阅</a>
+        {{^ fan}}
+            <a href="javascript:;">订阅</a>
+        {{/ fan}}
+
+        {{# fan}}
+            <a href="javascript:;">訂閱</a>
+        {{/ fan}}
+        
     </div>
 </div>
\ No newline at end of file

 <script id="side-related-posts" type="x-tmpl-mustache">
 \{{# relatedPost}}
 <div class="side-related-posts">
-    <h2>热播</h2>
+    {{#if fan}}
+        <h2>熱播</h2>
+    {{^}}
+        <h2>热播</h2>
+    {{/if}}
     <ul class="postslist">
         {{> detail/related_post}}
     </ul>

@@ -38,7 +38,6 @@
         </div>
         {{> common/menu}}
         <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
-        <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
         {{> common/script}}
     </body>
 </html>
\ No newline at end of file

@@ -40,9 +40,7 @@
         
         {{> common/menu}}
         {{> common/menu_withleft}}
-        <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
-        <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
-        
+        <script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
         {{> common/script}}
     </body>
 

@@ -23,17 +23,18 @@
 
         <!--高的集团导航-->
         <div class="enterprise" id="maxEnterprise">
-            <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div>
+            <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="../index.html"></a></div>
             <div class='menubar-header menubar-header-{{channel}}'>
             <div class="menubar">
                <div class="menu-item menu-item-fashion">
                     <span class=" menu-link-fashion fashion-choosen menu-link-channel ">
                         <a class="text">fashion</a>
                         <a class="hover-text">时尚</a>
-                        <a class="menu" href="{{fashionUrl}}"></a>
+                        <a class="menu" href="/fashion/index.html"></a>
                         <div class="submenu submenu-fashion">
+
                             <!--<span class="arrow"></span>-->
-                            <div class='more-content'><a class='more-content'  href="{{fashionUrl}}">More ></a></div>
+                            <div class='more-content'><a class='more-content'  href="/fashion/index.html">More ></a></div>
                         </div>
                     </span>
                     
@@ -44,21 +45,21 @@
                         
                         <a class="text">beauty</a>
                         <a class="hover-text">美丽</a>
-                    <a class="menu" href="{{beautyUrl}}"></a>
+                    <a class="menu" href="/beauty/index.html"></a>
                     <div class="submenu submenu-beauty">
                         <!--<span class="arrow"></span>-->
-                        <div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
+                        <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
                     </div>
                     </span>
                </div>
                 <div class="menu-item  menu-item-lifestyle">
-                    <span class="menu-link-channel menu-link-sports sports-choosen">
+                    <span class="menu-link-channel menu-link-sport sport-choosen">
                         <a class="text">sports</a>
                         <a class="hover-text">运动</a>
-                        <a class="menu" href="{{sportsUrl}}"></a>
-                    <div class="submenu submenu-sports">
+                        <a class="menu" href="/sports/index.html"></a>
+                    <div class="submenu submenu-sport">
                             <!--<span class="arrow"></span>-->
-                            <div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div>
+                            <div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div>
                      </div>
                      </span>
                 </div>
@@ -66,10 +67,10 @@
                     <span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
                         <a class="text">lifestyle</a>
                         <a class="hover-text">生活</a>
-                        <a class="menu" href="{{lifestyleUrl}}"></a>
+                        <a class="menu" href="/lifestyle/index.html"></a>
                     <div class="submenu submenu-lifestyle">
                             <!--<span class="arrow"></span>-->
-                            <div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div>
+                            <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
                      </div>
                      </span>
                 </div>
@@ -77,7 +78,7 @@
                     <span class="menu-link-channel menu-link-video video-choosen">
                         <a class="text">video</a>
                         <a class="hover-text">视频</a>
-                        <a class="menu" href="{{videoUrl}}"></a>
+                        <a class="menu" href="/video/index.html"></a>
                         <div class="submenu submenu-video">
                                 <div class="left-menu">
                                     {{# videoSubmenu}}
@@ -86,7 +87,7 @@
                                 </div>
                                 <div class="right-content">
                                 </div>
-                                <div class='right-more'><a class='more-content-right' href="{{videoUrl}}">More ></a></div>
+                                <div class='right-more'><a class='more-content-right' href="/video/index.html">More ></a></div>
                          </div>
                      </span>
                 </div>
@@ -94,19 +95,19 @@
                     <span class="menu-link-channel menu-link-magazine">
                         <a class="text" style="text-align:left;">magazine</a>
                         <a class="hover-text">杂志</a>
-                        <a class="menu" href="{{magazineUrl}}"></a>
+                        <a class="menu" href="/magazine/index.html"></a>
                         </span>
                 </div>
                 <span class="right iconfont search-area">
                     <span class="search-loading-icon" style="display: none;"></span>
-                    <a class="search-icon" href="/search"></a>
+                    <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 name="q" class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"/>
-                            <a searchURL="{{searchUrl}}" class="home-search-button" id="search-button" style="display: none;" value=""></a>
+                            <a searchURL="..\search" class="home-search-button" id="search-button" style="display: none;" value=""></a>
                     </span>
                     <span class="splitline"></span>
                 </span>
@@ -145,7 +146,7 @@
         
         
         <div class="minEnterprise" id="minEnterprise" style="display:none;">
-            <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div>
+            <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="../index.html"></a></div>
             <div class='menubar-header menubar-header-{{channel}}'>
             <div class="menubar">
                <div class="menu-item menu-item-fashion">
@@ -155,7 +156,7 @@
                         <a class="menu" href="/fashion/index.html"></a>
                         <div class="submenu submenu-fashion">
                             <!--<span class="arrow"></span>-->
-                            <div class='more-content'><a class='more-content'  href="{{fashionUrl}}">More ></a></div>
+                            <div class='more-content'><a class='more-content'  href="/fashion/index.html">More ></a></div>
                         </div>
                     </span>
                     
@@ -169,7 +170,7 @@
                     <a class="menu" href="/beauty/index.html"></a>
                     <div class="submenu submenu-beauty">
                             <!--<span class="arrow"></span>-->
-                            <div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
+                            <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
                      </div>
                      </span>
                </div>
@@ -178,9 +179,9 @@
                         <a class="text">sports</a>
                         <a class="hover-text">运动</a>
                         <a class="menu" href="/sports/index.html"></a>
-                    <div class="submenu submenu-sports">
+                    <div class="submenu submenu-sport">
                             <!--<span class="arrow"></span>-->
-                            <div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div>
+                            <div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
                      </div>
                      </span>
                 </div>
@@ -191,7 +192,7 @@
                         <a class="menu" href="/lifestyle/index.html"></a>
                     <div class="submenu submenu-lifestyle">
                             <!--<span class="arrow"></span>-->
-                            <div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div>
+                            <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
                      </div>
                      </span>
                 </div>
@@ -208,7 +209,7 @@
                                     </div>
                                     <div class="right-content">
                                     </div>
-                                <div class='more-content'><a class='more-content' href="{{videoUrl}}">More ></a></div>
+                                <div class='more-content'><a class='more-content' href="/video/index.html">More ></a></div>
                          </div>
                      </span>
                 </div>

@@ -5,10 +5,19 @@
             <li class="column-slide02"><img style="margin:11px 0 0 70px;" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column02.png" alt=" "></li>
             <li class="column-slide03"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column03.png" alt="扫一扫下载YOHO!潮流志"><span>iPhone | Android</span></li>
             <li>
-                <h6>YOHO!GIRL</h6>
-                <p>线上周刊，一周一会，
-                    免费喂饱你的潮流胃！</p>
-                <strong>扫一扫即刻下载</strong>
+                {{^ fan}}
+                    <h6>YOHO!GIRL</h6>
+                    <p>线上周刊，一周一会，
+                        免费喂饱你的潮流胃！</p>
+                    <strong>扫一扫即刻下载</strong>
+                {{/ fan}}
+
+                {{# fan}}
+                    <h6>YOHO!GIRL</h6>
+                    <p>線上週刊，一周一會，
+                        免費餵飽你的潮流胃！</p>
+                    <strong>掃一掃即刻下載</strong>
+                {{/ fan}}
             </li>
         </ul>
     </div>

@@ -2,7 +2,12 @@
 <div class="newest-mags clearfix">
     <div class="mags-info">
         <h2></h2>
-        <p class="mags-text">《YOHO!潮流志》是新力传媒着重打造的媒体，也是目前最成熟的媒体之一。他是第一本内地编辑的属于年轻人的潮流时尚杂志，读者受众定位为16—30岁年轻人群，内容包括潮流服饰、原创品牌、明星娱乐、艺术设计、动漫影音等，将年轻人关注的方方面面一网打尽。</p>
+        {{#if ../fan}}
+            <p class="mags-text">《YOHO!潮流誌》是新力傳媒著重打造的媒體，也是目前最成熟的媒體之壹。他是第壹本內地編輯的屬於年輕人的潮流時尚雜誌，讀者受眾定位為16—30歲年輕人群，內容包括潮流服飾、原創品牌、明星娛樂、藝術設計、動漫影音等，將年輕人關註的方方面面壹網打盡。</p>
+        {{^}}
+            <p class="mags-text">《YOHO!潮流志》是新力传媒着重打造的媒体，也是目前最成熟的媒体之一。他是第一本内地编辑的属于年轻人的潮流时尚杂志，读者受众定位为16—30岁年轻人群，内容包括潮流服饰、原创品牌、明星娱乐、艺术设计、动漫影音等，将年轻人关注的方方面面一网打尽。</p>
+        {{/if}}
+        
         <div class="date-price">
             <p><span>{{date}} </span> | {{title}}</p>
             <p class="price">RMB15</p>

 <script type="text/javascript" charset="utf-8">
 	//编辑页面JS
+    seajs.use(['js/channel/writer', 'js/public'], function(writer) {
+        if (writer) {
+            writer.init();
+        }
+    });
 </script>
\ No newline at end of file