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

+<object width="100%" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
+    <param name="movie" value="http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util/VideoPlayerSmall.swf?url={{video}}&amp;language={{language}}&amp;title1=【Yoho!Boys】{{title}}{{subtitle}}&amp;shareurl={{link}}&amp;sharepic={{cover}}&amp;coverpic={{cover}}">
+    <param name="quality" value="high">
+    <param name="bgcolor" value="#ffffff">
+    <param value="true" name="allowFullScreen">
+    <param name="allowScriptAccess" value="always">
+    <param name="wmode" value="transparent">
+    <embed align="middle" width="100%" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util/VideoPlayerSmall.swf?url={{video}}&amp;language={{language}}&amp;title1=【Yoho!Boys】{{title}}{{subtitle}}&amp;shareurl={{link}}&amp;shareurl={{link}}&amp;sharepic={{cover}}&amp;coverpic={{cover}}" name="vMessage" wmode="transparent" quality="high" bgcolor="#ffffff" play="true" loop="false" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" id="flash">
+</object>
+<video id="video-ipad" style="display:none;" controls="controls" preload="auto" poster="{{cover}}"><source src="{{video}}" type="video/mp4"></video>

-{{# video}}
-<div class="side-video">
-    <div class="video-area">
-        <i class="play-icon"></i>
-        <img src="{{src}}" alt=" ">
-    </div>
-    <a href="{{url}};">
-        <h3>{{title}}</h3>
-        <p>{{subtitle}}</p>
-    </a>
-</div>
-{{/ video}}
\ No newline at end of file

-{{# video}}
-<div class="detail-video">
-    <div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src=""></div>
-    <div class="videoPlaceholder">
-        <div class="video-wrap">
-            <a href="javascript:;" class="video-close-btn"></a>
-            <object id="video_0" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
-                <param value="" name="movie">
-                <param value="high" name="quality">
-                <param value="#ffffff" name="bgcolor">
-                <param name="allowFullScreen" value="true">
-                <param value="always" name="allowScriptAccess">
-                <param value="transparent" name="wmode">
-                <embed id="flash" align="middle" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" loop="false" play="true" bgcolor="#ffffff" 
-                       quality="high" wmode="transparent" name="vMessage" src="" />
-            </object>
-            <video id="video-ipad" style="display:none;" controls="controls" preload="auto" poster="">
-                <source src="" type="video/mp4">
-            </video>
-        </div>
-    </div>
-</div>
-{{/ video}}

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

-<script id="side-related-posts" type="x-tmpl-mustache">
+<script id="side-related" type="x-tmpl-mustache">
 {{# relatedPost}}
 <div class="side-related-posts">
     <h2>热播</h2>

+<script id="side-video-tpl" type="x-tmpl-mustache">
+\{{# video}}
+<div class="side-video">
+    <div class="video-area">
+        <object width="100%" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
+            <param name="movie" value="http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util/VideoPlayerSmall.swf?url=\{{video}}&amp;language=\{{language}}&amp;title1=【Yoho!Boys】\{{title}}\{{subtitle}}&amp;shareurl=\{{link}}&amp;sharepic=\{{cover}}&amp;coverpic=\{{cover}}">
+            <param name="quality" value="high">
+            <param name="bgcolor" value="#ffffff">
+            <param value="true" name="allowFullScreen">
+            <param name="allowScriptAccess" value="always">
+            <param name="wmode" value="transparent">
+            <embed align="middle" width="100%" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util/VideoPlayerSmall.swf?url=\{{video}}&amp;language=\{{language}}&amp;title1=【Yoho!Boys】\{{title}}\{{subtitle}}&amp;shareurl=\{{link}}&amp;shareurl=\{{link}}&amp;sharepic=\{{cover}}&amp;coverpic=\{{cover}}" name="vMessage" wmode="transparent" quality="high" bgcolor="#ffffff" play="true" loop="false" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" id="flash">
+        </object>
+        <video id="side-video-ipad" style="display:none;" controls="controls" preload="auto" poster="\{{cover}}"><source src="\{{video}}" type="video/mp4"></video>
+    </div>
+    <a href="\{{link}};">
+        <h3>\{{title}}</h3>
+        <p>\{{subtitle}}</p>
+    </a>
+</div>
+\{{/ video}}
+</script>
\ No newline at end of file

+{{# video}}
+<div class="detail-video">
+    <div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src=""></div>
+    <div class="videoPlaceholder">
+        {{> common/video}}
+    </div>
+</div>
+{{/ video}}

-{{# postList}}
-<li>
-    <a href="{{url}}" target="_blank">
-        <div class="pic">
-            <img src="{{src}}" alt="">
-            {{# isVideo}}
-                <span class="play-icon"></span>
-            {{/ isVideo}}
-            <span class="arrow-bottom girl-{{channel}}-arrow"></span>
-        </div>
-        <div class="post-title">
-            <h4>{{title}}</h4>
-            <p>{{subtitle}}</p>
-        </div>
-    </a>
-</li>
-{{/ postList}}
\ No newline at end of file

+\{{# postList}}
+<li class="clearfix">
+    <a href="\{{link}}" target="_blank">
+        <div class="pic">
+            <img src="\{{coverImage}}" alt="">
+            \{{# isVideo}}
+                <span class="play-icon"></span>
+            \{{/ isVideo}}
+            \{{# hasArrow}}
+            <span class="arrow-bottom girl-\{{channel}}-arrow"></span>
+            \{{/ hasArrow}}
+        </div>
+        <div class="post-title">
+            <h4>\{{title}}</h4>
+            <p>\{{subtitle}}</p>
+        </div>
+    </a>
+</li>
+\{{/ postList}}
\ No newline at end of file