ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit a36bd2b1d8ceb992d543a16328ffd50f7fbe4551 2 parents 6d4bcb5e b74553e1

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

Inline Side-by-side
Showing 11 changed files with 106 additions and 238 deletions
{{> layout/writer_header320}}
<div class="comment">
<h2 class="about-h2">意见反馈</h2>
<div class="about-body feedback-body">
<div class="comments-box feedback"></div>
</div>
<div class="comments-box"></div>
</div>
{{> common/comment}}
{{> common/third_login}}
{{> common/comment_publish320}}
{{> common/comment320}}
{{> common/third_login320}}
{{> layout/footer320}}
\ No newline at end of file
... ...
... ... @@ -7,7 +7,7 @@
<p>
{{# author}}
<a class="detail_author" href="{{links}}" target="_blank">{{name}}</a>
<a class="detail_author" href="{{link}}" target="_blank">{{name}}</a>
{{/ author}}
<a href="{{channelLink}}">{{channel}}</a>&nbsp;|&nbsp;
<a href="{{twoChannelLink}}">{{twoChannel}}</a>&nbsp;|&nbsp;
... ... @@ -109,11 +109,14 @@
<h2>相关推荐</h2>
<ul></ul>
</div>
{{> common/comment_publish320}}
{{> common/comment320}}
{{> common/third_login320}}
{{> default/download320}}
{{> default/share320}}
{{> layout/footer320}}
<script id="related-tpl" type="x-tmpl-mustache">
\{{#relatedPost}}
<li>
... ... @@ -131,73 +134,4 @@
</a>
</li>
\{{/relatedPost}}
</script>
<script id="comment-textarea-tpl" type="x-tmpl-mustache">
<div class="comment-textarea">
<textarea placeholder="说点什么..."></textarea>
<div class="login-status clearfix">
<div class="userimg">
<img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">
<i></i>
</div>
<div class="userinfo" style="display: none;">
<span></span>
<a class="exit-btn" href="javascript:;">退出</a>
</div>
<div class="publish">
<a class="publish-btn" href="javascript:;">Publish</a>
</div>
</div>
</div>
</script>
<script id="comment-tpl" type="x-tmpl-mustache">
<ul class="comments-list">
\{{# comment}}
<li class="clearfix">
<div class="userimg">
<img src="\{{headpic}}" alt="">
<i class="\{{partnerType}}"></i>
</div>
<div class="userinfo">
<h6>\{{nick}}</h6>
<p class="comment-text">\{{content}}</p>
\{{# isSelf}}
<a class="delete-comment" href="javascript:;" pid="{{id}}"></a>
\{{/ isSelf}}
</div>
</li>
\{{/ comment}}
</ul>
\{{# more}}
<div class="view-more"><a href="javascript:;">View&nbsp;<span>\{{moreNum}}</span>&nbsp;more</a></div>
\{{/ more}}
\{{# page}}
<div class="comment-pager-content pager-content-default" style="display:none">
<div class="channel-index-pager">
\{{# pageList}}
<a class="pager-item \{{# isChoosen}}pager-item-choosen\{{/ isChoosen}}" href="\{{link}}">\{{text}}</a>
\{{/ pageList}}
</div>
</div>
\{{/ page}}
</script>
<script id="third-login-tpl" type="x-tmpl-mustache">
<div class="third-login-box clearfix">
{{^ fan}}
<span>第三方评论</span>
{{/ fan}}
{{# fan}}
<span>第三方評論</span>
{{/ fan}}
<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>
<a class="yoho" href="javascript:;"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-yoho.png" alt="" /></a>
<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>
</div>
</script>
\ No newline at end of file
... ...
{{> layout/writer_header320}}
<div class="tag-wrap">
<div class="tags">
<ul>
... ... @@ -7,20 +8,6 @@
</ul>
</div>
</div>
<!--content-->
<div class="home-content">
<ul>
{{#indexContent}}
<li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">
<a class="img-link" href="{{href}}">
<img src="{{img}}" alt="{{alt}}"/>
</a>
<h2>{{title}}</h2>
<h3>{{subTitle}}</h3>
<time>{{channel}} | {{time}}</time>
<p>{{content}}</p>
</li>
{{/indexContent}}
</ul>
</div>
{{> default/download320}}
\ No newline at end of file
{{> channel/content320}}
{{> default/download320}}
{{> layout/footer320}}
\ No newline at end of file
... ...
... ... @@ -6,29 +6,6 @@
</div>
<div class="result"></div>
</div>
<!--content-->
<div class="home-content">
<ul>
{{#content}}
<li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">
<a class="img-link" href="{{link}}" target="_blank">
<img src="{{img}}" alt=""/>
</a>
<h2>
<a href="{{link}}" target="_blank">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
<a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;{{time}}
</time>
<p>
<a href="{{link}}" target="_blank">{{content}}</a>
</p>
</li>
{{/content}}
</ul>
</div>
{{> channel/content320}}
{{> default/download320}}
{{> layout/footer320}}
\ No newline at end of file
... ...
{{> layout/writer_header320}}
{{#hasComment}}
{{# hasComment}}
<div class="has-comment">
<span class="has-user">
<img src="{{img}}">
... ... @@ -12,76 +12,17 @@
<p _title="{{introduce}}">{{introduce}}</p>
<span class="line-btn"></span>
</div>
<span class="comment_button"><b class="comment-num edit-comment">{{num}}</b></span>
<span class="comment_button"><b class="comment-num edit-comment"></b></span>
</div>
</div>
{{/hasComment}}
<div class="comment">
<div class="comment-area">
<ul class="comments-list">
{{#comment.list}}
<li class="clearfix">
<div class="userimg">
<img src="{{img}}" alt="">
<i class="qq"></i>
</div>
<div class="userinfo">
<h6>{{author}}</h6>
<p class="comment-text">{{commentText}}</p>
</div>
</li>
{{/comment.list}}
</ul>
<div style="display:none" class="pager-content comment-pager-content">
<div class="channel-index-pager"></div>
</div>
<div class="view-more">
<a href="javascript:;">View&nbsp;<span>{{comment.num}}</span>&nbsp;more</a>
</div>
<div class="comment-textarea">
<textarea placeholder="说点什么..."></textarea>
<div class="login-status clearfix">
<div class="userimg">
<img src="{{user}}" alt="">
<i></i>
</div>
<div class="userinfo">
<span></span>
<a class="exit-btn" href="javascript:;">退出</a>
</div>
<div class="publish">
<a class="publish-btn" href="javascript:;">Publish</a>
</div>
</div>
</div>
</div>
</div>
<!--content-->
<div class="home-content">
<ul>
{{#content}}
<li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">
<a class="img-link" href="{{link}}" target="_blank">
<img src="{{img}}" alt=""/>
</a>
<h2>
<a href="{{link}}" target="_blank">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
<a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;{{time}}
</time>
<p>
<a href="{{link}}" target="_blank">{{content}}</a>
</p>
</li>
{{/content}}
</ul>
<div class="comment-area" style="display:block;" data-id="{{id}}"></div>
</div>
{{/ hasComment}}
{{> common/comment_publish320}}
{{> common/comment320}}
{{> common/third_login320}}
{{> channel/content320}}
{{> default/download320}}
{{> layout/footer320}}
\ No newline at end of file
... ...
<script id="comment-tpl" type="x-tmpl-mustache">
<ul class="comments-list">
\{{# comment}}
<li class="clearfix">
<div class="userimg">
<img src="\{{headpic}}" alt="">
<i class="\{{partnerType}}"></i>
</div>
<div class="userinfo">
<h6>\{{nick}}</h6>
<p class="comment-text">\{{content}}</p>
\{{# isSelf}}
<a class="delete-comment" href="javascript:;" pid="{{id}}"></a>
\{{/ isSelf}}
</div>
</li>
\{{/ comment}}
</ul>
\{{# more}}
<div class="view-more"><a href="javascript:;">View&nbsp;<span>\{{moreNum}}</span>&nbsp;more</a></div>
\{{/ more}}
\{{# page}}
<div class="comment-pager-content pager-content-default" style="display:none">
<div class="channel-index-pager">
\{{# pageList}}
<a class="pager-item \{{# isChoosen}}pager-item-choosen\{{/ isChoosen}}" href="\{{link}}">\{{text}}</a>
\{{/ pageList}}
</div>
</div>
\{{/ page}}
</script>
\ No newline at end of file
... ...
<script id="comment-textarea-tpl" type="x-tmpl-mustache">
<div class="comment-textarea">
<textarea placeholder="说点什么..."></textarea>
<div class="login-status clearfix">
<div class="userimg">
<img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">
<i></i>
</div>
<div class="userinfo" style="display: none;">
<span></span>
<a class="exit-btn" href="javascript:;">退出</a>
</div>
<div class="publish">
<a class="publish-btn" href="javascript:;">Publish</a>
</div>
</div>
</div>
</script>
\ No newline at end of file
... ...
{{# default}}
<script type="text/javascript">
seajs.use(['js/common','js/channel/home'], function (common,home) {
common.init();
seajs.use(['js/channel/home'], function (home) {
home.init();
});
</script>
{{/ default}}
{{# fashion}}
<script type="text/javascript">
seajs.use(['js/common'], function (common) {
common.init();
//home.init();
});
</script>
{{/ fashion}}
{{# beauty}}
<script type="text/javascript">
seajs.use(['js/common'], function (common) {
common.init();
//home.init();
});
</script>
{{/ beauty}}
{{# sport}}
<script type="text/javascript">
seajs.use(['js/common'], function (common) {
common.init();
//home.init();
});
</script>
{{/ sport}}
{{# lifestyle}}
<script type="text/javascript">
seajs.use(['js/common'], function (common) {
common.init();
//home.init();
});
</script>
{{/ lifestyle}}
{{# magazine}}
<script type="text/javascript">
seajs.use(['js/common','js/channel/magazine'], function (common, magazine) {
common.init();
seajs.use(['js/channel/magazine'], function (magazine) {
magazine.init();
});
</script>
{{/ magazine}}
{{# video}}
<script type="text/javascript">
seajs.use(['js/common'], function (common) {
common.init();
});
</script>
{{/ video}}
{{# search}}
<script type="text/javascript">
seajs.use(['js/common','js/channel/search'], function (common,search) {
common.init();
seajs.use(['js/channel/search'], function (search) {
search.init();
});
</script>
... ... @@ -71,7 +25,7 @@
{{# writer}}
<script type="text/javascript">
seajs.use(["js/channel/edit320"], function(edit){
seajs.use(["js/channel/edit"], function(edit){
edit.init();
});
... ... @@ -81,8 +35,7 @@
{{# detail}}
<script type="text/javascript">
seajs.use(['js/common','js/channel/detail'], function (common,detail) {
common.init();
seajs.use(['js/channel/detail'], function (detail) {
detail.init();
});
</script>
... ... @@ -90,8 +43,7 @@
{{# about}}
<script type="text/javascript">
seajs.use(['js/common','js/channel/feedback'], function (common,feedback) {
common.init();
seajs.use(['js/channel/feedback'], function (feedback) {
feedback.init();
});
</script>
... ...
<script id="third-login-tpl" type="x-tmpl-mustache">
<div class="third-login-box clearfix">
{{^ fan}}
<span>第三方评论</span>
{{/ fan}}
{{# fan}}
<span>第三方評論</span>
{{/ fan}}
<a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;">
<img height='12px' src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-qq.png" alt="" />
</a>
<a class="yoho" href="javascript:;">
<img height='12px' src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-yoho.png" alt="" />
</a>
<a class="sina" ref="/passport/partner/index/oauth/sina" href="javascript:;">
<img height='12px' src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-sina.png" alt="" />
</a>
</div>
</script>
\ No newline at end of file
... ...
... ... @@ -19,6 +19,11 @@
</div>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/mobile.js"></script>
<script type="text/javascript">
seajs.use(['js/common'], function (common) {
common.init();
});
</script>
{{> common/script320}}
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -38,4 +38,5 @@
<span class="header-logo">Logo</span>
<span class="header-back" onclick="history.go(-1);"></span>
<span class="header-share">share</span>
<a class="header-search" href="/search">search</a>
</header>
\ No newline at end of file
... ...