Skip to content

Commit f0f5702

Browse files
Vanessa219Vanessa219
committed
✨ fixed b3log#12286 
1 parent 501b007 commit f0f5702

File tree

8 files changed

+32
-35
lines changed

8 files changed

+32
-35
lines changed

‎src/main/webapp/css/default-admin.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,8 +953,7 @@ button#submitArticle:hover,
953953
border-radius: 3px;
954954
box-shadow: 1px 1px 3px #333333;
955955
line-height: 16px;
956-
margin: 24px 12px;
957-
padding: 5px;
956+
margin: 10px;
958957
text-align: center;
959958
}
960959

‎src/main/webapp/css/default-base.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ button:hover,.button:hover {
401401
.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09,
402402
.em10, .em11, .em12, .em13, .em14 {
403403
background-image: url("../images/emotions/emotions.png");
404+
background-size: 120px;
404405
float: left;
405406
height: 24px;
406407
margin-right: 5px;

‎src/main/webapp/images/emotions/em10.png

1.3 KB
Loading

‎src/main/webapp/images/emotions/emotions.png

208 Bytes
Loading

‎src/main/webapp/js/lib/emojify.js-1.1.0/images/basic/sunglasses.png

1.3 KB
Loading

‎src/main/webapp/js/page.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -614,11 +614,7 @@ $.extend(Page.prototype, {
614614
result.userName = Util.getUserName();
615615
}
616616

617-
if (typeof(addComment) === "undefined") { // https://github.com/b3log/solo/issues/12246
618-
that.addCommentAjax(Util.replaceEmString(result.cmtTpl), state);
619-
} else { // 1.9.0 向后兼容
620-
that.addCommentAjax(addComment(result, state), state);
621-
}
617+
that.addCommentAjax(Util.replaceEmString(result.cmtTpl), state);
622618
}
623619
});
624620
}

‎src/main/webapp/skins/mobile/common-comment.ftl

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<li id="${comment.oId}">
2+
<div class="comwrap">
3+
<div class="comtop"><!--TODO comment->comment_approved == '0') : comtop preview;-->
4+
<img alt='${comment.commentName}' src='${comment.commentThumbnailURL}' class='avatar avatar-64 photo' height='64' width='64' />
5+
<div class="com-author">
6+
<#if "http://" == comment.commentURL>
7+
<a>${comment.commentName}</a>
8+
<#else>
9+
<a href='${comment.commentURL}' rel='external nofollow' target="_blank" class='url'>${comment.commentName}</a>
10+
</#if>
11+
<#if comment.isReply>
12+
@
13+
<a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}">${comment.commentOriginalCommentName}</a>
14+
</#if>
15+
</div>
16+
<#if article.commentable>
17+
<div class="comdater">
18+
<!--<span>TODO wptouch_moderate_comment_link(get_comment_ID())</span>-->
19+
${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
20+
<a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
21+
</div>
22+
</#if>
23+
</div><!--end comtop-->
24+
<div class="combody">
25+
<p>${comment.commentContent}</p>
26+
</div>
27+
</div>
28+
</li>

‎src/main/webapp/skins/mobile/macro-comments.ftl

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,7 @@
99
</#if>
1010
<ol class="commentlist" id="commentlist">
1111
<#list commentList as comment>
12-
<li id="${comment.oId}">
13-
<div class="comwrap">
14-
<div class="comtop"><!--TODO comment->comment_approved == '0') : comtop preview;-->
15-
<img alt='${comment.commentName}' src='${comment.commentThumbnailURL}' class='avatar avatar-64 photo' height='64' width='64' />
16-
<div class="com-author">
17-
<#if "http://" == comment.commentURL>
18-
<a>${comment.commentName}</a>
19-
<#else>
20-
<a href='${comment.commentURL}' rel='external nofollow' target="_blank" class='url'>${comment.commentName}</a>
21-
</#if>
22-
<#if comment.isReply>
23-
@
24-
<a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}">${comment.commentOriginalCommentName}</a>
25-
</#if>
26-
</div>
27-
<#if article.commentable>
28-
<div class="comdater">
29-
<!--<span>TODO wptouch_moderate_comment_link(get_comment_ID())</span>-->
30-
${comment.commentDate?string("yyyy-MM-dd HH:mm:ss")}
31-
<a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
32-
</div>
33-
</#if>
34-
</div><!--end comtop-->
35-
<div class="combody">
36-
<p>${comment.commentContent}</p>
37-
</div>
38-
</div>
39-
</li>
12+
<#include "common-comment.ftl"/>
4013
</#list>
4114
</ol>
4215
<#if article.commentable>

0 commit comments

Comments
 (0)