ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit d54536a7fd23675160847e1f776d135eb5f08e2a 2 parents dea0445f d372cdcf

最新模板

Inline Side-by-side
Showing 14 changed files with 136 additions and 239 deletions
1 {{> layout/writer_header320}} 1 {{> layout/writer_header320}}
2 <div class="comment"> 2 <div class="comment">
3 <h2 class="about-h2">意见反馈</h2> 3 <h2 class="about-h2">意见反馈</h2>
4 - <div class="about-body feedback-body">  
5 - <div class="comments-box feedback"></div>  
6 - </div> 4 + <div class="comments-box"></div>
7 </div> 5 </div>
8 -{{> common/comment}}  
9 -{{> common/third_login}} 6 +{{> common/comment_publish320}}
  7 +{{> common/comment320}}
  8 +{{> common/third_login320}}
10 {{> layout/footer320}} 9 {{> layout/footer320}}
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 <p> 8 <p>
9 {{# author}} 9 {{# author}}
10 - <a class="detail_author" href="{{links}}" target="_blank">{{name}}</a> 10 + <a class="detail_author" href="{{link}}" target="_blank">{{name}}</a>
11 {{/ author}} 11 {{/ author}}
12 <a href="{{channelLink}}">{{channel}}</a>&nbsp;|&nbsp; 12 <a href="{{channelLink}}">{{channel}}</a>&nbsp;|&nbsp;
13 <a href="{{twoChannelLink}}">{{twoChannel}}</a>&nbsp;|&nbsp; 13 <a href="{{twoChannelLink}}">{{twoChannel}}</a>&nbsp;|&nbsp;
@@ -109,11 +109,14 @@ @@ -109,11 +109,14 @@
109 <h2>相关推荐</h2> 109 <h2>相关推荐</h2>
110 <ul></ul> 110 <ul></ul>
111 </div> 111 </div>
  112 +
  113 +{{> common/comment_publish320}}
  114 +{{> common/comment320}}
  115 +{{> common/third_login320}}
112 {{> default/download320}} 116 {{> default/download320}}
113 {{> default/share320}} 117 {{> default/share320}}
114 {{> layout/footer320}} 118 {{> layout/footer320}}
115 119
116 -  
117 <script id="related-tpl" type="x-tmpl-mustache"> 120 <script id="related-tpl" type="x-tmpl-mustache">
118 \{{#relatedPost}} 121 \{{#relatedPost}}
119 <li> 122 <li>
@@ -131,73 +134,4 @@ @@ -131,73 +134,4 @@
131 </a> 134 </a>
132 </li> 135 </li>
133 \{{/relatedPost}} 136 \{{/relatedPost}}
134 -  
135 -  
136 -</script>  
137 -<script id="comment-textarea-tpl" type="x-tmpl-mustache">  
138 - <div class="comment-textarea">  
139 - <textarea placeholder="说点什么..."></textarea>  
140 - <div class="login-status clearfix">  
141 - <div class="userimg">  
142 - <img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">  
143 - <i></i>  
144 - </div>  
145 - <div class="userinfo" style="display: none;">  
146 - <span></span>  
147 - <a class="exit-btn" href="javascript:;">退出</a>  
148 - </div>  
149 - <div class="publish">  
150 - <a class="publish-btn" href="javascript:;">Publish</a>  
151 - </div>  
152 - </div>  
153 - </div>  
154 -  
155 -</script>  
156 -  
157 -<script id="comment-tpl" type="x-tmpl-mustache">  
158 - <ul class="comments-list">  
159 - \{{# comment}}  
160 - <li class="clearfix">  
161 - <div class="userimg">  
162 - <img src="\{{headpic}}" alt="">  
163 - <i class="\{{partnerType}}"></i>  
164 - </div>  
165 - <div class="userinfo">  
166 - <h6>\{{nick}}</h6>  
167 - <p class="comment-text">\{{content}}</p>  
168 - \{{# isSelf}}  
169 - <a class="delete-comment" href="javascript:;" pid="{{id}}"></a>  
170 - \{{/ isSelf}}  
171 - </div>  
172 - </li>  
173 - \{{/ comment}}  
174 - </ul>  
175 - \{{# more}}  
176 - <div class="view-more"><a href="javascript:;">View&nbsp;<span>\{{moreNum}}</span>&nbsp;more</a></div>  
177 - \{{/ more}}  
178 - \{{# page}}  
179 - <div class="comment-pager-content pager-content-default" style="display:none">  
180 - <div class="channel-index-pager">  
181 - \{{# pageList}}  
182 - <a class="pager-item \{{# isChoosen}}pager-item-choosen\{{/ isChoosen}}" href="\{{link}}">\{{text}}</a>  
183 - \{{/ pageList}}  
184 - </div>  
185 - </div>  
186 - \{{/ page}}  
187 -</script>  
188 -  
189 -  
190 -<script id="third-login-tpl" type="x-tmpl-mustache">  
191 - <div class="third-login-box clearfix">  
192 - {{^ fan}}  
193 - <span>第三方评论</span>  
194 - {{/ fan}}  
195 -  
196 - {{# fan}}  
197 - <span>第三方評論</span>  
198 - {{/ fan}}  
199 - <a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-qq.png" alt="" /></a>  
200 - <a class="yoho" href="javascript:;"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-yoho.png" alt="" /></a>  
201 - <a class="sina" ref="/passport/partner/index/oauth/sina" href="javascript:;"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-sina.png" alt="" /></a>  
202 - </div>  
203 </script> 137 </script>
@@ -19,5 +19,4 @@ @@ -19,5 +19,4 @@
19 {{/ items}} 19 {{/ items}}
20 </div> 20 </div>
21 {{> channel/pager}} 21 {{> channel/pager}}
22 -  
23 {{> layout/footer}} 22 {{> layout/footer}}
  1 +{{> layout/writer_header320}}
1 <div class="tag-wrap"> 2 <div class="tag-wrap">
2 <div class="tags"> 3 <div class="tags">
3 <ul> 4 <ul>
@@ -7,20 +8,6 @@ @@ -7,20 +8,6 @@
7 </ul> 8 </ul>
8 </div> 9 </div>
9 </div> 10 </div>
10 -<!--content-->  
11 -<div class="home-content">  
12 - <ul>  
13 - {{#indexContent}}  
14 - <li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">  
15 - <a class="img-link" href="{{href}}">  
16 - <img src="{{img}}" alt="{{alt}}"/>  
17 - </a>  
18 - <h2>{{title}}</h2>  
19 - <h3>{{subTitle}}</h3>  
20 - <time>{{channel}} | {{time}}</time>  
21 - <p>{{content}}</p>  
22 - </li>  
23 - {{/indexContent}}  
24 - </ul>  
25 -</div>  
26 -{{> default/download320}}  
  11 +{{> channel/content320}}
  12 +{{> default/download320}}
  13 +{{> layout/footer320}}
@@ -6,29 +6,6 @@ @@ -6,29 +6,6 @@
6 </div> 6 </div>
7 <div class="result"></div> 7 <div class="result"></div>
8 </div> 8 </div>
9 -<!--content-->  
10 -<div class="home-content">  
11 - <ul>  
12 - {{#content}}  
13 - <li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">  
14 - <a class="img-link" href="{{link}}" target="_blank">  
15 - <img src="{{img}}" alt=""/>  
16 - </a>  
17 - <h2>  
18 - <a href="{{link}}" target="_blank">{{title}}</a>  
19 - </h2>  
20 - <h3>  
21 - <a href="{{link}}" target="_blank">{{subTitle}}</a>  
22 - </h3>  
23 - <time>  
24 - <a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;{{time}}  
25 - </time>  
26 - <p>  
27 - <a href="{{link}}" target="_blank">{{content}}</a>  
28 - </p>  
29 - </li>  
30 - {{/content}}  
31 - </ul>  
32 -</div> 9 +{{> channel/content320}}
33 {{> default/download320}} 10 {{> default/download320}}
34 {{> layout/footer320}} 11 {{> layout/footer320}}
1 {{> layout/writer_header320}} 1 {{> layout/writer_header320}}
2 -{{#hasComment}} 2 +{{# hasComment}}
3 <div class="has-comment"> 3 <div class="has-comment">
4 <span class="has-user"> 4 <span class="has-user">
5 <img src="{{img}}"> 5 <img src="{{img}}">
@@ -12,76 +12,17 @@ @@ -12,76 +12,17 @@
12 <p _title="{{introduce}}">{{introduce}}</p> 12 <p _title="{{introduce}}">{{introduce}}</p>
13 <span class="line-btn"></span> 13 <span class="line-btn"></span>
14 </div> 14 </div>
15 - <span class="comment_button"><b class="comment-num edit-comment">{{num}}</b></span> 15 + <span class="comment_button"><b class="comment-num edit-comment"></b></span>
16 </div> 16 </div>
17 17
18 </div> 18 </div>
19 -{{/hasComment}}  
20 <div class="comment"> 19 <div class="comment">
21 - <div class="comment-area">  
22 - <ul class="comments-list">  
23 - {{#comment.list}}  
24 - <li class="clearfix">  
25 - <div class="userimg">  
26 - <img src="{{img}}" alt="">  
27 - <i class="qq"></i>  
28 - </div>  
29 - <div class="userinfo">  
30 - <h6>{{author}}</h6>  
31 -  
32 - <p class="comment-text">{{commentText}}</p>  
33 - </div>  
34 - </li>  
35 - {{/comment.list}}  
36 - </ul>  
37 - <div style="display:none" class="pager-content comment-pager-content">  
38 - <div class="channel-index-pager"></div>  
39 - </div>  
40 - <div class="view-more">  
41 - <a href="javascript:;">View&nbsp;<span>{{comment.num}}</span>&nbsp;more</a>  
42 - </div>  
43 - <div class="comment-textarea">  
44 - <textarea placeholder="说点什么..."></textarea>  
45 -  
46 - <div class="login-status clearfix">  
47 - <div class="userimg">  
48 - <img src="{{user}}" alt="">  
49 - <i></i>  
50 - </div>  
51 - <div class="userinfo">  
52 - <span></span>  
53 - <a class="exit-btn" href="javascript:;">退出</a>  
54 - </div>  
55 - <div class="publish">  
56 - <a class="publish-btn" href="javascript:;">Publish</a>  
57 - </div>  
58 - </div>  
59 - </div>  
60 - </div>  
61 -</div>  
62 -<!--content-->  
63 -<div class="home-content">  
64 - <ul>  
65 - {{#content}}  
66 - <li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">  
67 - <a class="img-link" href="{{link}}" target="_blank">  
68 - <img src="{{img}}" alt=""/>  
69 - </a>  
70 - <h2>  
71 - <a href="{{link}}" target="_blank">{{title}}</a>  
72 - </h2>  
73 - <h3>  
74 - <a href="{{link}}" target="_blank">{{subTitle}}</a>  
75 - </h3>  
76 - <time>  
77 - <a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;{{time}}  
78 - </time>  
79 - <p>  
80 - <a href="{{link}}" target="_blank">{{content}}</a>  
81 - </p>  
82 - </li>  
83 - {{/content}}  
84 - </ul> 20 + <div class="comment-area" style="display:block;" data-id="{{id}}"></div>
85 </div> 21 </div>
  22 +{{/ hasComment}}
  23 +{{> common/comment_publish320}}
  24 +{{> common/comment320}}
  25 +{{> common/third_login320}}
  26 +{{> channel/content320}}
86 {{> default/download320}} 27 {{> default/download320}}
87 {{> layout/footer320}} 28 {{> layout/footer320}}
  1 +<script id="comment-tpl" type="x-tmpl-mustache">
  2 + <ul class="comments-list">
  3 + \{{# comment}}
  4 + <li class="clearfix">
  5 + <div class="userimg">
  6 + <img src="\{{headpic}}" alt="">
  7 + <i class="\{{partnerType}}"></i>
  8 + </div>
  9 + <div class="userinfo">
  10 + <h6>\{{nick}}</h6>
  11 + <p class="comment-text">\{{content}}</p>
  12 + \{{# isSelf}}
  13 + <a class="delete-comment" href="javascript:;" pid="{{id}}"></a>
  14 + \{{/ isSelf}}
  15 + </div>
  16 + </li>
  17 + \{{/ comment}}
  18 + </ul>
  19 + \{{# more}}
  20 + <div class="view-more"><a href="javascript:;">View&nbsp;<span>\{{moreNum}}</span>&nbsp;more</a></div>
  21 + \{{/ more}}
  22 + \{{# page}}
  23 + <div class="comment-pager-content pager-content-default" style="display:none">
  24 + <div class="channel-index-pager">
  25 + \{{# pageList}}
  26 + <a class="pager-item \{{# isChoosen}}pager-item-choosen\{{/ isChoosen}}" href="\{{link}}">\{{text}}</a>
  27 + \{{/ pageList}}
  28 + </div>
  29 + </div>
  30 + \{{/ page}}
  31 +</script>
  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:;">Publish</a>
  15 + </div>
  16 + </div>
  17 + </div>
  18 +
  19 +</script>
1 {{# default}} 1 {{# default}}
2 <script type="text/javascript"> 2 <script type="text/javascript">
3 - seajs.use(['js/common','js/channel/home'], function (common,home) {  
4 - common.init(); 3 + seajs.use(['js/channel/home'], function (home) {
5 home.init(); 4 home.init();
6 }); 5 });
7 </script> 6 </script>
8 {{/ default}} 7 {{/ default}}
9 8
10 -{{# fashion}}  
11 -<script type="text/javascript">  
12 - seajs.use(['js/common'], function (common) {  
13 - common.init();  
14 - //home.init();  
15 - });  
16 -</script>  
17 -{{/ fashion}}  
18 -  
19 -{{# beauty}}  
20 -<script type="text/javascript">  
21 - seajs.use(['js/common'], function (common) {  
22 - common.init();  
23 - //home.init();  
24 - });  
25 -</script>  
26 -{{/ beauty}}  
27 -  
28 -{{# sport}}  
29 -<script type="text/javascript">  
30 - seajs.use(['js/common'], function (common) {  
31 - common.init();  
32 - //home.init();  
33 - });  
34 -</script>  
35 -{{/ sport}}  
36 -  
37 -{{# lifestyle}}  
38 -<script type="text/javascript">  
39 - seajs.use(['js/common'], function (common) {  
40 - common.init();  
41 - //home.init();  
42 - });  
43 -</script>  
44 -{{/ lifestyle}}  
45 9
46 {{# magazine}} 10 {{# magazine}}
47 <script type="text/javascript"> 11 <script type="text/javascript">
48 - seajs.use(['js/common','js/channel/magazine'], function (common, magazine) {  
49 - common.init(); 12 + seajs.use(['js/channel/magazine'], function (magazine) {
50 magazine.init(); 13 magazine.init();
51 }); 14 });
52 </script> 15 </script>
53 {{/ magazine}} 16 {{/ magazine}}
54 17
55 -{{# video}}  
56 -<script type="text/javascript">  
57 - seajs.use(['js/common'], function (common) {  
58 - common.init();  
59 - });  
60 -</script>  
61 -{{/ video}}  
62 -  
63 {{# search}} 18 {{# search}}
64 <script type="text/javascript"> 19 <script type="text/javascript">
65 - seajs.use(['js/common','js/channel/search'], function (common,search) {  
66 - common.init(); 20 + seajs.use(['js/channel/search'], function (search) {
67 search.init(); 21 search.init();
68 }); 22 });
69 </script> 23 </script>
@@ -71,7 +25,7 @@ @@ -71,7 +25,7 @@
71 25
72 {{# writer}} 26 {{# writer}}
73 <script type="text/javascript"> 27 <script type="text/javascript">
74 - seajs.use(["js/channel/edit320"], function(edit){ 28 + seajs.use(["js/channel/edit"], function(edit){
75 edit.init(); 29 edit.init();
76 }); 30 });
77 31
@@ -81,8 +35,7 @@ @@ -81,8 +35,7 @@
81 35
82 {{# detail}} 36 {{# detail}}
83 <script type="text/javascript"> 37 <script type="text/javascript">
84 - seajs.use(['js/common','js/channel/detail'], function (common,detail) {  
85 - common.init(); 38 + seajs.use(['js/channel/detail'], function (detail) {
86 detail.init(); 39 detail.init();
87 }); 40 });
88 </script> 41 </script>
@@ -90,8 +43,7 @@ @@ -90,8 +43,7 @@
90 43
91 {{# about}} 44 {{# about}}
92 <script type="text/javascript"> 45 <script type="text/javascript">
93 - seajs.use(['js/common','js/channel/feedback'], function (common,feedback) {  
94 - common.init(); 46 + seajs.use(['js/channel/feedback'], function (feedback) {
95 feedback.init(); 47 feedback.init();
96 }); 48 });
97 </script> 49 </script>
  1 +<script id="third-login-tpl" type="x-tmpl-mustache">
  2 + <div class="third-login-box clearfix">
  3 + {{^ fan}}
  4 + <span>第三方评论</span>
  5 + {{/ fan}}
  6 +
  7 + {{# fan}}
  8 + <span>第三方評論</span>
  9 + {{/ fan}}
  10 + <a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;">
  11 + <img height='12px' src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-qq.png" alt="" />
  12 + </a>
  13 + <a class="yoho" href="javascript:;">
  14 + <img height='12px' src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-yoho.png" alt="" />
  15 + </a>
  16 + <a class="sina" ref="/passport/partner/index/oauth/sina" href="javascript:;">
  17 + <img height='12px' src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-sina.png" alt="" />
  18 + </a>
  19 + </div>
  20 +
  21 +
  22 +</script>
@@ -19,6 +19,11 @@ @@ -19,6 +19,11 @@
19 </div> 19 </div>
20 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script> 20 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
21 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/mobile.js"></script> 21 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/mobile.js"></script>
  22 +<script type="text/javascript">
  23 + seajs.use(['js/common'], function (common) {
  24 + common.init();
  25 + });
  26 +</script>
22 {{> common/script320}} 27 {{> common/script320}}
23 </body> 28 </body>
24 </html> 29 </html>
@@ -4,8 +4,23 @@ @@ -4,8 +4,23 @@
4 <html xmlns="http://www.w3.org/1999/xhtml"> 4 <html xmlns="http://www.w3.org/1999/xhtml">
5 <head> 5 <head>
6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  7 +<<<<<<< HEAD
7 <title>Yoho!Girls | No Fashion, No Life!</title> 8 <title>Yoho!Girls | No Fashion, No Life!</title>
8 <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" /> 9 <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
  10 +=======
  11 +
  12 + <meta name="keywords" content="{{keywords}}" />
  13 + <meta name="description" content="{{description}}" />
  14 +
  15 + <title>{{title}}</title>
  16 + <meta name="author" content="yohogirls.com" />
  17 + <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
  18 + <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
  19 + <link rel="dns-prefetch" href="//img01.yohoboys.com" />
  20 + <link rel="dns-prefetch" href="//img02.yohoboys.com" />
  21 + <link rel="dns-prefetch" href="//video.yohoboys.com" />
  22 + <link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
  23 +>>>>>>> develop
9 </head> 24 </head>
10 <body> 25 <body>
11 <!--开头的集团导航--> 26 <!--开头的集团导航-->
@@ -4,8 +4,23 @@ @@ -4,8 +4,23 @@
4 <html xmlns="http://www.w3.org/1999/xhtml"> 4 <html xmlns="http://www.w3.org/1999/xhtml">
5 <head> 5 <head>
6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  7 +<<<<<<< HEAD
7 <title>Yoho!Girls | No Fashion, No Life!</title> 8 <title>Yoho!Girls | No Fashion, No Life!</title>
8 <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" /> 9 <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
  10 +=======
  11 + <meta name="keywords" content="{{keywords}}" />
  12 + <meta name="description" content="{{description}}" />
  13 +
  14 + <title>{{title}}</title>
  15 +
  16 + <meta name="author" content="yohogirls.com" />
  17 + <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
  18 + <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
  19 + <link rel="dns-prefetch" href="//img01.yohoboys.com" />
  20 + <link rel="dns-prefetch" href="//img02.yohoboys.com" />
  21 + <link rel="dns-prefetch" href="//video.yohoboys.com" />
  22 + <link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
  23 +>>>>>>> develop
9 </head> 24 </head>
10 <body> 25 <body>
11 <!--开头的集团导航--> 26 <!--开头的集团导航-->
@@ -38,4 +38,5 @@ @@ -38,4 +38,5 @@
38 <span class="header-logo">Logo</span> 38 <span class="header-logo">Logo</span>
39 <span class="header-back" onclick="history.go(-1);"></span> 39 <span class="header-back" onclick="history.go(-1);"></span>
40 <span class="header-share">share</span> 40 <span class="header-share">share</span>
  41 + <a class="header-search" href="/search">search</a>
41 </header> 42 </header>