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

@@ -11,7 +11,9 @@
         {{time}}
     </p>
 
-   <!-- <div class="media">
+    <div class="media">
+        <!--大图轮播-->
+        {{# coverSwiper}}
         <div class="detail-banner swiper-container">
             <ul class="swiper-wrapper">
                 {{#banner}}
@@ -22,33 +24,45 @@
             </ul>
             <div class="detail-switch">3/5</div>
         </div>
-    </div>-->
+        {{/ coverSwiper}}
+        <!--只有一张封面图-->
+        {{^ coverSwiper}}
+        {{# coverPic}}
+        <img src="{{img}}"/>
+        {{/ coverPic}}
+        {{/ coverSwiper}}
+
+        <!--翻转、变脸、视频-->
+        {{# coverEffect}}
+        <div>{{html}}</div>
+        {{/ coverEffect}}
+    </div>
     <!--内容-->
-    {{# content}}
-        {{> detail/detail_video320}}
-        {{> detail/detail_slide320}}
-        {{> detail/detail_img320}}
-    {{/ content}}
-    <div class="detail-text" cover-url="{{coverUrl}}"></div>
-    <!--标签-->
-    <div class="tags">
-        <ul>
-            {{#tags}}
-            <li>
-                <a href="{{link}}" target="_blank">{{name}}</a>
-            </li>
-            {{/tags}}
-        </ul>
+    <div class="detail-text" cover-url="{{coverUrl}}">
+        {{detailStr}}
     </div>
 </div>
 {{/detail}}
+
+<!--标签-->
+<div class="tags">
+    <ul>
+        {{#tags}}
+        <li>
+            <a href="{{link}}" target="_blank">{{name}}</a>
+        </li>
+        {{/tags}}
+    </ul>
+</div>
+
 <div class="comment">
     <ul class="statslist stats-btn">
         <li class="wow">
             <div>
                 <span>
                     <i style="display: inline;">4</i>
-                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/smile-mobile.png" alt="" style="display: none;">
+                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/smile-mobile.png" alt=""
+                         style="display: none;">
                 </span>
             </div>
         </li>
@@ -56,7 +70,8 @@
             <div>
                 <span>
                     <i style="display: inline;">1</i>
-                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/nothing-mobile.png" alt="" style="display: none;">
+                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/nothing-mobile.png" alt=""
+                         style="display: none;">
                 </span>
             </div>
         </li>
@@ -64,28 +79,42 @@
             <div>
                 <span>
                     <i style="display: inline;">2</i>
-                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/bad-mobile.png" alt="" style="display: none;">
+                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/bad-mobile.png" alt=""
+                         style="display: none;">
                 </span>
             </div>
         </li>
         <li class="comments">
             <div>
-                <span class="comment-num" id="comment-num"><img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/comment-mobile.png"></span>
+                <span class="comment-num" id="comment-num"><img
+                        src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/comment-mobile.png"></span>
             </div>
         </li>
     </ul>
-    <div class="comments-box" cid="1295" ctype="1" cc="101" ctwoc="101001"><ul class="comments-list"></ul><div class="comment-textarea"><textarea placeholder="说点什么..." cid="1295"></textarea><div class="login-status clearfix">
-        <div class="userimg">
-            <img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">
-            <i></i>
-        </div>
-        <div class="userinfo" style="display: none;">
-            <span></span>
-            <a class="exit-btn" href="javascript:;">退出</a>
-        </div>
-        <div class="publish">
-            <a class="publish-btn" href="javascript:;">Publish</a>
+    <div class="comments-box" cid="1295" ctype="1" cc="101" ctwoc="101001">
+        <ul class="comments-list"></ul>
+        <div class="comment-textarea"><textarea placeholder="说点什么..." cid="1295"></textarea>
+
+            <div class="login-status clearfix">
+                <div class="userimg">
+                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">
+                    <i></i>
+                </div>
+                <div class="userinfo" style="display: none;">
+                    <span></span>
+                    <a class="exit-btn" href="javascript:;">退出</a>
+                </div>
+                <div class="publish">
+                    <a class="publish-btn" href="javascript:;">Publish</a>
+                </div>
+            </div>
         </div>
-    </div></div></div>
+    </div>
+</div>
+
+
+<div class="detail-page">
+    <span class="detail-prev"><a href="{{prevLink}}" title="{{prevTitle}}" onclick="prevOrNextClickEvent();">上一篇</a></span>
+    <span class="detail-next"><a href="{{nextLink}}" title="{{nextTitle}}" onclick="prevOrNextClickEvent();">下一篇</a></span>
 </div>
 {{> layout/footer320}}
\ No newline at end of file

@@ -19,7 +19,13 @@
         </ul>
         <div class="follow-us-input-content">
             <input type="text" value="" class="followus-input" placeholder="me@email.com">
-            <button class="button followus-button">订阅</button>
+            {{^ fan}}
+                <button class="button followus-button">订阅</button>
+            {{/ fan}}
+            
+            {{# fan}}
+                <button class="button followus-button">訂閱</button>
+            {{/ fan}}
         </div>
     </div>
 </div>
\ No newline at end of file

@@ -24,6 +24,8 @@
         <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">

 <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 +18,12 @@
     </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

@@ -3,6 +3,6 @@
         <li class="wow"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
         <li class="zzz"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
         <li class="wtf"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
-        <li class="comments"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
+        <li class="comments"><a class="clearfix" href="javascript:;"><strong></strong><span class="comment-num"></span></a></li>
     </ul>
 </div>

@@ -17,7 +17,9 @@
     <p>CopyRight © 2014 南京新与力文化传播有限公司<br />苏ICP备09011225号</p>
 </footer>
 </div>
-<script src="http://localhost:8000/js/lib/sea-debug.js?nowrap"></script>
+<!--<script src="http://localhost:8000/js/lib/sea-debug.js?nowrap"></script>-->
+<script src="http://cmsres.dev.yoho.cn/dist/sea-debug.js"></script>
+<script src="http://cmsres.dev.yoho.cn/dist/mobile.js"></script>
 {{> common/script320}}
 </body>
 </html>
\ No newline at end of file