Authored by lore-w

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

Showing 25 changed files with 65 additions and 56 deletions
  1 +<object width="100%" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
  2 + <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}}">
  3 + <param name="quality" value="high">
  4 + <param name="bgcolor" value="#ffffff">
  5 + <param value="true" name="allowFullScreen">
  6 + <param name="allowScriptAccess" value="always">
  7 + <param name="wmode" value="transparent">
  8 + <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">
  9 +</object>
  10 +<video id="video-ipad" style="display:none;" controls="controls" preload="auto" poster="{{cover}}"><source src="{{video}}" type="video/mp4"></video>
1 -{{# video}}  
2 -<div class="side-video">  
3 - <div class="video-area">  
4 - <i class="play-icon"></i>  
5 - <img src="{{src}}" alt=" ">  
6 - </div>  
7 - <a href="{{url}};">  
8 - <h3>{{title}}</h3>  
9 - <p>{{subtitle}}</p>  
10 - </a>  
11 -</div>  
12 -{{/ video}}  
1 -{{# video}}  
2 -<div class="detail-video">  
3 - <div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src=""></div>  
4 - <div class="videoPlaceholder">  
5 - <div class="video-wrap">  
6 - <a href="javascript:;" class="video-close-btn"></a>  
7 - <object id="video_0" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">  
8 - <param value="" name="movie">  
9 - <param value="high" name="quality">  
10 - <param value="#ffffff" name="bgcolor">  
11 - <param name="allowFullScreen" value="true">  
12 - <param value="always" name="allowScriptAccess">  
13 - <param value="transparent" name="wmode">  
14 - <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"  
15 - quality="high" wmode="transparent" name="vMessage" src="" />  
16 - </object>  
17 - <video id="video-ipad" style="display:none;" controls="controls" preload="auto" poster="">  
18 - <source src="" type="video/mp4">  
19 - </video>  
20 - </div>  
21 - </div>  
22 -</div>  
23 -{{/ video}}  
1 -{{# relatedPost}}  
2 -<div class="related-posts"> 1 +<script id="side-related-posts" type="x-tmpl-mustache">
  2 +\{{# relatedPost}}
  3 +<div class="side-related-posts">
3 <h2>新品播报</h2> 4 <h2>新品播报</h2>
4 <ul class="postslist clearfix"> 5 <ul class="postslist clearfix">
5 {{> detail/related_post}} 6 {{> detail/related_post}}
6 </ul> 7 </ul>
7 <a href="javascript:;" class="load-more"></a> 8 <a href="javascript:;" class="load-more"></a>
8 </div> 9 </div>
9 -{{/ relatedPost}}  
  10 +\{{/ relatedPost}}
  11 +</script>
1 -<script id="side-related-posts" type="x-tmpl-mustache"> 1 +<script id="side-related" type="x-tmpl-mustache">
2 {{# relatedPost}} 2 {{# relatedPost}}
3 <div class="side-related-posts"> 3 <div class="side-related-posts">
4 <h2>热播</h2> 4 <h2>热播</h2>
  1 +<script id="side-video-tpl" type="x-tmpl-mustache">
  2 +\{{# video}}
  3 +<div class="side-video">
  4 + <div class="video-area">
  5 + <object width="100%" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
  6 + <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}}">
  7 + <param name="quality" value="high">
  8 + <param name="bgcolor" value="#ffffff">
  9 + <param value="true" name="allowFullScreen">
  10 + <param name="allowScriptAccess" value="always">
  11 + <param name="wmode" value="transparent">
  12 + <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">
  13 + </object>
  14 + <video id="side-video-ipad" style="display:none;" controls="controls" preload="auto" poster="\{{cover}}"><source src="\{{video}}" type="video/mp4"></video>
  15 + </div>
  16 + <a href="\{{link}};">
  17 + <h3>\{{title}}</h3>
  18 + <p>\{{subtitle}}</p>
  19 + </a>
  20 +</div>
  21 +\{{/ video}}
  22 +</script>
  1 +{{# video}}
  2 +<div class="detail-video">
  3 + <div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src=""></div>
  4 + <div class="videoPlaceholder">
  5 + {{> common/video}}
  6 + </div>
  7 +</div>
  8 +{{/ video}}
1 -{{# postList}}  
2 -<li>  
3 - <a href="{{url}}" target="_blank">  
4 - <div class="pic">  
5 - <img src="{{src}}" alt="">  
6 - {{# isVideo}}  
7 - <span class="play-icon"></span>  
8 - {{/ isVideo}}  
9 - <span class="arrow-bottom girl-{{channel}}-arrow"></span>  
10 - </div>  
11 - <div class="post-title">  
12 - <h4>{{title}}</h4>  
13 - <p>{{subtitle}}</p>  
14 - </div>  
15 - </a>  
16 -</li>  
17 -{{/ postList}}  
  1 +\{{# postList}}
  2 +<li class="clearfix">
  3 + <a href="\{{link}}" target="_blank">
  4 + <div class="pic">
  5 + <img src="\{{coverImage}}" alt="">
  6 + \{{# isVideo}}
  7 + <span class="play-icon"></span>
  8 + \{{/ isVideo}}
  9 + \{{# hasArrow}}
  10 + <span class="arrow-bottom girl-\{{channel}}-arrow"></span>
  11 + \{{/ hasArrow}}
  12 + </div>
  13 + <div class="post-title">
  14 + <h4>\{{title}}</h4>
  15 + <p>\{{subtitle}}</p>
  16 + </div>
  17 + </a>
  18 +</li>
  19 +\{{/ postList}}