Commit f0f5702e authored by Liang's avatar Liang

fixed #12286

parent 501b0072
...@@ -953,8 +953,7 @@ button#submitArticle:hover, ...@@ -953,8 +953,7 @@ button#submitArticle:hover,
border-radius: 3px; border-radius: 3px;
box-shadow: 1px 1px 3px #333333; box-shadow: 1px 1px 3px #333333;
line-height: 16px; line-height: 16px;
margin: 24px 12px; margin: 10px;
padding: 5px;
text-align: center; text-align: center;
} }
......
...@@ -401,6 +401,7 @@ button:hover,.button:hover { ...@@ -401,6 +401,7 @@ button:hover,.button:hover {
.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09,
.em10, .em11, .em12, .em13, .em14 { .em10, .em11, .em12, .em13, .em14 {
background-image: url("../images/emotions/emotions.png"); background-image: url("../images/emotions/emotions.png");
background-size: 120px;
float: left; float: left;
height: 24px; height: 24px;
margin-right: 5px; margin-right: 5px;
......
src/main/webapp/images/emotions/em10.png

650 Bytes | W: | H:

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

1.93 KB | W: | H:

src/main/webapp/images/emotions/em10.png
src/main/webapp/images/emotions/em10.png
src/main/webapp/images/emotions/em10.png
src/main/webapp/images/emotions/em10.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -614,11 +614,7 @@ $.extend(Page.prototype, { ...@@ -614,11 +614,7 @@ $.extend(Page.prototype, {
result.userName = Util.getUserName(); result.userName = Util.getUserName();
} }
if (typeof(addComment) === "undefined") { // https://github.com/b3log/solo/issues/12246 that.addCommentAjax(Util.replaceEmString(result.cmtTpl), state);
that.addCommentAjax(Util.replaceEmString(result.cmtTpl), state);
} else { // 1.9.0 向后兼容
that.addCommentAjax(addComment(result, state), state);
}
} }
}); });
} }
......
<li id="${comment.oId}">
<div class="comwrap">
<div class="comtop"><!--TODO comment->comment_approved == '0') : comtop preview;-->
<img alt='${comment.commentName}' src='${comment.commentThumbnailURL}' class='avatar avatar-64 photo' height='64' width='64' />
<div class="com-author">
<#if "http://" == comment.commentURL>
<a>${comment.commentName}</a>
<#else>
<a href='${comment.commentURL}' rel='external nofollow' target="_blank" class='url'>${comment.commentName}</a>
</#if>
<#if comment.isReply>
@
<a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}">${comment.commentOriginalCommentName}</a>
</#if>
</div>
<#if article.commentable>
<div class="comdater">
<!--<span>TODO wptouch_moderate_comment_link(get_comment_ID())</span>-->
${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
<a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
</div>
</#if>
</div><!--end comtop-->
<div class="combody">
<p>${comment.commentContent}</p>
</div>
</div>
</li>
\ No newline at end of file
...@@ -9,34 +9,7 @@ ...@@ -9,34 +9,7 @@
</#if> </#if>
<ol class="commentlist" id="commentlist"> <ol class="commentlist" id="commentlist">
<#list commentList as comment> <#list commentList as comment>
<li id="${comment.oId}"> <#include "common-comment.ftl"/>
<div class="comwrap">
<div class="comtop"><!--TODO comment->comment_approved == '0') : comtop preview;-->
<img alt='${comment.commentName}' src='${comment.commentThumbnailURL}' class='avatar avatar-64 photo' height='64' width='64' />
<div class="com-author">
<#if "http://" == comment.commentURL>
<a>${comment.commentName}</a>
<#else>
<a href='${comment.commentURL}' rel='external nofollow' target="_blank" class='url'>${comment.commentName}</a>
</#if>
<#if comment.isReply>
@
<a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}">${comment.commentOriginalCommentName}</a>
</#if>
</div>
<#if article.commentable>
<div class="comdater">
<!--<span>TODO wptouch_moderate_comment_link(get_comment_ID())</span>-->
${comment.commentDate?string("yyyy-MM-dd HH:mm:ss")}
<a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
</div>
</#if>
</div><!--end comtop-->
<div class="combody">
<p>${comment.commentContent}</p>
</div>
</div>
</li>
</#list> </#list>
</ol> </ol>
<#if article.commentable> <#if article.commentable>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment