ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit 52513f5948c41f3a99f20625e5f8f3d64615c001 2 parents fd109d12 2556c1a2

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

Inline Side-by-side
Showing 23 changed files with 41 additions and 20 deletions
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 {{# topItems}} 4 {{# topItems}}
5 {{> channel/item}} 5 {{> channel/item}}
6 {{/ topItems}} 6 {{/ topItems}}
  7 + {{> channel/followus}}
7 </div> 8 </div>
8 {{> channel/pager}} 9 {{> channel/pager}}
9 {{> layout/footer }} 10 {{> layout/footer }}
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 {{# bottomItems}} 8 {{# bottomItems}}
9 {{> channel/item}} 9 {{> channel/item}}
10 {{/ bottomItems}} 10 {{/ bottomItems}}
  11 + {{> channel/followus}}
11 </div> 12 </div>
12 {{> channel/pager}} 13 {{> channel/pager}}
13 {{> layout/footer }} 14 {{> layout/footer }}
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 {{# topItems2}} 15 {{# topItems2}}
16 {{> channel/item}} 16 {{> channel/item}}
17 {{/ topItems2}} 17 {{/ topItems2}}
  18 + {{> channel/followus}}
18 </div> 19 </div>
19 {{> channel/pager}} 20 {{> channel/pager}}
20 {{> layout/footer }} 21 {{> layout/footer }}
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 {{# topItems}} 4 {{# topItems}}
5 {{> channel/item}} 5 {{> channel/item}}
6 {{/ topItems}} 6 {{/ topItems}}
  7 + {{> channel/followus}}
7 </div> 8 </div>
8 {{> channel/pager}} 9 {{> channel/pager}}
9 {{> layout/footer }} 10 {{> layout/footer }}
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 {{# bottomItems}} 8 {{# bottomItems}}
9 {{> channel/item}} 9 {{> channel/item}}
10 {{/ bottomItems}} 10 {{/ bottomItems}}
  11 + {{> channel/followus}}
11 </div> 12 </div>
12 {{> channel/pager}} 13 {{> channel/pager}}
13 {{> layout/footer }} 14 {{> layout/footer }}
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 {{# topItems2}} 15 {{# topItems2}}
16 {{> channel/item}} 16 {{> channel/item}}
17 {{/ topItems2}} 17 {{/ topItems2}}
  18 + {{> channel/followus}}
18 </div> 19 </div>
19 {{> channel/pager}} 20 {{> channel/pager}}
20 {{> layout/footer }} 21 {{> layout/footer }}
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 {{# topItems}} 4 {{# topItems}}
5 {{> channel/item}} 5 {{> channel/item}}
6 {{/ topItems}} 6 {{/ topItems}}
  7 + {{> channel/followus}}
7 </div> 8 </div>
8 {{> channel/pager}} 9 {{> channel/pager}}
9 {{> layout/footer }} 10 {{> layout/footer }}
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 {{# bottomItems}} 8 {{# bottomItems}}
9 {{> channel/item}} 9 {{> channel/item}}
10 {{/ bottomItems}} 10 {{/ bottomItems}}
  11 + {{> channel/followus}}
11 </div> 12 </div>
12 {{> channel/pager}} 13 {{> channel/pager}}
13 {{> layout/footer }} 14 {{> layout/footer }}
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 {{# topItems2}} 15 {{# topItems2}}
16 {{> channel/item}} 16 {{> channel/item}}
17 {{/ topItems2}} 17 {{/ topItems2}}
  18 + {{> channel/followus}}
18 </div> 19 </div>
19 {{> channel/pager}} 20 {{> channel/pager}}
20 {{> layout/footer }} 21 {{> layout/footer }}
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 {{# topItems}} 4 {{# topItems}}
5 {{> channel/item}} 5 {{> channel/item}}
6 {{/ topItems}} 6 {{/ topItems}}
  7 + {{> channel/followus}}
7 </div> 8 </div>
8 {{> channel/pager}} 9 {{> channel/pager}}
9 {{> layout/footer }} 10 {{> layout/footer }}
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 {{# bottomItems}} 8 {{# bottomItems}}
9 {{> channel/item}} 9 {{> channel/item}}
10 {{/ bottomItems}} 10 {{/ bottomItems}}
  11 + {{> channel/followus}}
11 </div> 12 </div>
12 {{> channel/pager}} 13 {{> channel/pager}}
13 {{> layout/footer }} 14 {{> layout/footer }}
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 {{# topItems2}} 15 {{# topItems2}}
16 {{> channel/item}} 16 {{> channel/item}}
17 {{/ topItems2}} 17 {{/ topItems2}}
  18 + {{> channel/followus}}
18 </div> 19 </div>
19 {{> channel/pager}} 20 {{> channel/pager}}
20 {{> layout/footer }} 21 {{> layout/footer }}
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 {{# topItems}} 4 {{# topItems}}
5 {{> channel/item}} 5 {{> channel/item}}
6 {{/ topItems}} 6 {{/ topItems}}
  7 + {{> channel/followus}}
7 </div> 8 </div>
8 {{> channel/pager}} 9 {{> channel/pager}}
9 {{> layout/footer }} 10 {{> layout/footer }}
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 {{# bottomItems}} 8 {{# bottomItems}}
9 {{> channel/item}} 9 {{> channel/item}}
10 {{/ bottomItems}} 10 {{/ bottomItems}}
  11 + {{> channel/followus}}
11 </div> 12 </div>
12 {{> channel/pager}} 13 {{> channel/pager}}
13 {{> layout/footer }} 14 {{> layout/footer }}
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 {{# topItems2}} 15 {{# topItems2}}
16 {{> channel/item}} 16 {{> channel/item}}
17 {{/ topItems2}} 17 {{/ topItems2}}
  18 + {{> channel/followus}}
18 </div> 19 </div>
19 {{> channel/pager}} 20 {{> channel/pager}}
20 {{> layout/footer }} 21 {{> layout/footer }}
1 <div class="error-container"> 1 <div class="error-container">
2 <div class="error-img"> 2 <div class="error-img">
3 - <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/other/error.png" alt="404 page"> 3 + <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/other/error.png" alt="404 page">
4 </div> 4 </div>
5 <div class="error-btn clearfix"> 5 <div class="error-btn clearfix">
6 <a class="back-btn" href="javascript:;" onclick="history.go(-1);">返回上一页</a> 6 <a class="back-btn" href="javascript:;" onclick="history.go(-1);">返回上一页</a>
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 </div> 24 </div>
25 {{/ writerInfo}} 25 {{/ writerInfo}}
26 26
27 -<div class="editor-comment-content clearfix" style="display:none" cid="{{cid}}"> 27 +<div class="editor-comment-content clearfix" style="display:none">
28 <div class="usermsg"> 28 <div class="usermsg">
29 <span class="about-username">{{username}} </span> 29 <span class="about-username">{{username}} </span>
30 <span class="about-user"> 30 <span class="about-user">
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <span class="user-right">© Project Copyright Info</span> 34 <span class="user-right">© Project Copyright Info</span>
35 <span class="report">Report</span> 35 <span class="report">Report</span>
36 </div> 36 </div>
37 - <div class="comment-area" style="display:block;"> 37 + <div class="comment-area" style="display:block;" cid="{{cid}}">
38 </div> 38 </div>
39 </div> 39 </div>
40 <div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix"> 40 <div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
1 <div class="content-item-without-border" style="margin-top:0;"> 1 <div class="content-item-without-border" style="margin-top:0;">
2 <div class="follow-us"> 2 <div class="follow-us">
3 - {{^ fan}} 3 + {{^ fanti}}
4 <div class="title">关注我们</div> 4 <div class="title">关注我们</div>
5 - {{/ fan}} 5 + {{/ fanti}}
6 6
7 - {{# fan}} 7 + {{# fanti}}
8 <div class="title">Follow us</div> 8 <div class="title">Follow us</div>
9 - {{/ fan}} 9 + {{/ fanti}}
10 <ul class="icons-content"> 10 <ul class="icons-content">
11 <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li> 11 <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>
12 <li><a href="http://weibo.com/yohomedia" target="_blank" class="icons sina"></a></li> 12 <li><a href="http://weibo.com/yohomedia" target="_blank" class="icons sina"></a></li>
@@ -19,7 +19,13 @@ @@ -19,7 +19,13 @@
19 </ul> 19 </ul>
20 <div class="follow-us-input-content"> 20 <div class="follow-us-input-content">
21 <input type="text" value="" class="followus-input" placeholder="me@email.com"> 21 <input type="text" value="" class="followus-input" placeholder="me@email.com">
22 - <button class="button followus-button">订阅</button> 22 + {{^ fanti}}
  23 + <button class="button followus-button">订阅</button>
  24 + {{/ fanti}}
  25 +
  26 + {{# fanti}}
  27 + <button class="button followus-button">訂閱</button>
  28 + {{/ fanti}}
23 </div> 29 </div>
24 </div> 30 </div>
25 </div> 31 </div>
@@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
9 <div class="userinfo"> 9 <div class="userinfo">
10 <h6>\{{nick}}</h6> 10 <h6>\{{nick}}</h6>
11 <p class="comment-text">\{{content}}</p> 11 <p class="comment-text">\{{content}}</p>
12 - \{{# isSelf}}  
13 - <a class="delete-comment" href="javascript:;" pid="{{id}}"></a>  
14 - \{{/ isSelf}} 12 + \{{#if isSelf}}
  13 + <a class="delete-comment" href="javascript:;" pid="\{{id}}"></a>
  14 + \{{/if}}
15 </div> 15 </div>
16 </li> 16 </li>
17 \{{/ comment}} 17 \{{/ comment}}
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 {{/ fan}} 44 {{/ fan}}
45 <div class="login-status clearfix"> 45 <div class="login-status clearfix">
46 <div class="userimg"> 46 <div class="userimg">
47 - <img src="http://localhost:8000/assets/images/detail/user-img.png" alt=""> 47 + <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/user-img.png" alt="">
48 <i></i> 48 <i></i>
49 </div> 49 </div>
50 <div class="userinfo" style="display: none;"> 50 <div class="userinfo" style="display: none;">
1 <object width="100%" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"> 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}}"> 2 + <param name="movie" value="http://cmsres.test.yoho.cn/res/new/girls/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"> 3 <param name="quality" value="high">
4 <param name="bgcolor" value="#ffffff"> 4 <param name="bgcolor" value="#ffffff">
5 <param value="true" name="allowFullScreen"> 5 <param value="true" name="allowFullScreen">
6 <param name="allowScriptAccess" value="always"> 6 <param name="allowScriptAccess" value="always">
7 <param name="wmode" value="transparent"> 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"> 8 + <embed align="middle" width="100%" src="http://cmsres.test.yoho.cn/res/new/girls/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> 9 </object>
10 <video id="video-ipad" style="display:none;" controls="controls" preload="auto" poster="{{cover}}"><source src="{{video}}" type="video/mp4"></video> 10 <video id="video-ipad" style="display:none;" controls="controls" preload="auto" poster="{{cover}}"><source src="{{video}}" type="video/mp4"></video>
@@ -3,6 +3,6 @@ @@ -3,6 +3,6 @@
3 <li class="wow"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li> 3 <li class="wow"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
4 <li class="zzz"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li> 4 <li class="zzz"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
5 <li class="wtf"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li> 5 <li class="wtf"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
6 - <li class="comments"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li> 6 + <li class="comments"><a class="clearfix" href="javascript:;"><strong></strong><span class="comment-num"></span></a></li>
7 </ul> 7 </ul>
8 </div> 8 </div>
1 <div class="detail-title"> 1 <div class="detail-title">
2 <h1>{{title}}</h1> 2 <h1>{{title}}</h1>
3 <h2>{{subtitle}}</h2> 3 <h2>{{subtitle}}</h2>
4 - <p class="detail-category"><a href="javascript:;">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p> 4 + <p class="detail-category"><a href="{{url}}">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p>
5 </div> 5 </div>
1 -{{^ fan}} 1 +{{^ fanti}}
2 {{> layout/footer_jian}} 2 {{> layout/footer_jian}}
3 -{{/ fan}}  
4 -{{# fan}} 3 +{{/ fanti}}
  4 +{{# fanti}}
5 {{> layout/footer_fan}} 5 {{> layout/footer_fan}}
6 -{{/ fan}}  
  6 +{{/ fanti}}