ued / yohogirls_mustache · Commits

Go to a project

Authored by 2586703@qq.com
Commit 4aaf73981ae5429a678d8a300dca87a7eca61dab 2 parents 26c78595 9bebc187

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

Inline Side-by-side
Showing 8 changed files with 29 additions and 11 deletions
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <h2 class="about-h2">意見反饋</h2> 3 <h2 class="about-h2">意見反饋</h2>
4 <div class="comments-box"></div> 4 <div class="comments-box"></div>
5 </div> 5 </div>
6 -{{> common/comment_publish320}} 6 +{{> common/comment_publish_hk320}}
7 {{> common/comment320}} 7 {{> common/comment320}}
8 {{> common/third_login320}} 8 {{> common/third_login320}}
9 {{> layout/footer_hk320}} 9 {{> layout/footer_hk320}}
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <li><a href="http://www.yoho.cn" target="_blank">YOHO!</a></li> 8 <li><a href="http://www.yoho.cn" target="_blank">YOHO!</a></li>
9 <li><a href="http://www.yohobuy.com" target="_blank">YOHO!BUY</a></li> 9 <li><a href="http://www.yohobuy.com" target="_blank">YOHO!BUY</a></li>
10 <li class="mr-none"><a href="http://www.yohoshow.com" target="_blank">YOHO!SHOW</a></li> 10 <li class="mr-none"><a href="http://www.yohoshow.com" target="_blank">YOHO!SHOW</a></li>
11 - <li><a href="http://www.yohogirls.com" target="_blank">YOHO!GIRLS</a></li> 11 + <li><a href="http://www.yohoboys.com" target="_blank">YOHO!BOYS</a></li>
12 </ul> 12 </ul>
13 </div> 13 </div>
14 <div class="link-logo"> 14 <div class="link-logo">
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <li><a href="http://www.yoho.cn" target="_blank">YOHO!</a></li> 8 <li><a href="http://www.yoho.cn" target="_blank">YOHO!</a></li>
9 <li><a href="http://www.yohobuy.com" target="_blank">YOHO!BUY</a></li> 9 <li><a href="http://www.yohobuy.com" target="_blank">YOHO!BUY</a></li>
10 <li class="mr-none"><a href="http://www.yohoshow.com" target="_blank">YOHO!SHOW</a></li> 10 <li class="mr-none"><a href="http://www.yohoshow.com" target="_blank">YOHO!SHOW</a></li>
11 - <li><a href="http://www.yohogirls.com" target="_blank">YOHO!GIRLS</a></li> 11 + <li><a href="http://hk.yohoboys.com/" target="_blank">YOHO!BOYS</a></li>
12 </ul> 12 </ul>
13 </div> 13 </div>
14 <div class="link-logo"> 14 <div class="link-logo">
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 <div class="author-channel"> 8 <div class="author-channel">
9 {{# author}} 9 {{# author}}
10 - <p><a class="detail_author" href="{{link}}" target="_blank">By&nbsp;{{name}}</a></p> 10 + <p><a class="detail_author" href="{{link}}" target="_blank">text:&nbsp;{{name}}</a></p>
11 {{/ author}} 11 {{/ author}}
12 {{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}} 12 {{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
13 {{# twoChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ twoChannel}} 13 {{# twoChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ twoChannel}}
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 <div class="author-channel"> 8 <div class="author-channel">
9 {{# author}} 9 {{# author}}
10 - <p><a class="detail_author" href="{{link}}" target="_blank">By&nbsp;{{name}}</a></p> 10 + <p><a class="detail_author" href="{{link}}" target="_blank">text:&nbsp;{{name}}</a></p>
11 {{/ author}} 11 {{/ author}}
12 {{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}} 12 {{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
13 {{# twoChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ twoChannel}} 13 {{# twoChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ twoChannel}}
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 <i></i> 83 <i></i>
84 </div> 84 </div>
85 </li> 85 </li>
86 - <li class="comments"> 86 + <li class="comments" id="comment-hk">
87 <div class="status-white"> 87 <div class="status-white">
88 <span class="comment-num" id="comment-num" style="right: -15px;"></span> 88 <span class="comment-num" id="comment-num" style="right: -15px;"></span>
89 <i style="right: -20px;bottom: 2px;"></i> 89 <i style="right: -20px;bottom: 2px;"></i>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 {{/only}} 21 {{/only}}
22 <div class="magazine-more"> 22 <div class="magazine-more">
23 <time>{{title}}&nbsp;|&nbsp;{{subTitle}}</time> 23 <time>{{title}}&nbsp;|&nbsp;{{subTitle}}</time>
24 - <span>RBM 15</span> 24 + <span>KD$ 20</span>
25 </div> 25 </div>
26 </div> 26 </div>
27 {{/magazineBanner}} 27 {{/magazineBanner}}
  1 +<script id="comment-textarea-tpl" type="x-tmpl-mustache">
  2 + <div class="comment-textarea">
  3 + <textarea placeholder="說點什麽..."></textarea>
  4 + <div class="login-status clearfix">
  5 + <div class="userimg">
  6 + <img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">
  7 + <i></i>
  8 + </div>
  9 + <div class="userinfo" style="display: none;">
  10 + <span></span>
  11 + <a class="exit-btn" href="javascript:;">退出</a>
  12 + </div>
  13 + <div class="publish">
  14 + <a class="publish-btn" href="javascript:;" onclick="YOHODCLICK('comment','mobile','publish')">Publish</a>
  15 + </div>
  16 + </div>
  17 + </div>
  18 +</script>
1 <script id="third-login-tpl" type="x-tmpl-mustache"> 1 <script id="third-login-tpl" type="x-tmpl-mustache">
2 <div class="third-login-box clearfix"> 2 <div class="third-login-box clearfix">
3 - {{^ fan}} 3 + {{^ fanti}}
4 <span>第三方评论</span> 4 <span>第三方评论</span>
5 - {{/ fan}}  
6 - {{# fan}} 5 + {{/ fanti}}
  6 + {{# fanti}}
7 <span>第三方評論</span> 7 <span>第三方評論</span>
8 - {{/ fan}} 8 + {{/ fanti}}
9 <a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;" onclick="YOHODCLICK('login','mobile','qq')"> 9 <a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;" onclick="YOHODCLICK('login','mobile','qq')">
10 <img height='12px' src="{{> common/environment320_image}}/about/thirdbtn-qq.png" alt="" /> 10 <img height='12px' src="{{> common/environment320_image}}/about/thirdbtn-qq.png" alt="" />
11 </a> 11 </a>