diff --git a/bruce/macro-comments.ftl b/bruce/macro-comments.ftl index c739903..d4b779f 100644 --- a/bruce/macro-comments.ftl +++ b/bruce/macro-comments.ftl @@ -1,36 +1,38 @@ <#macro comments commentList article>
- <#list commentList as comment> -
- ${comment.commentName} -
-
- <#if "http://" == comment.commentURL> - ${comment.commentName} - <#else> - ${comment.commentName} - - <#if comment.isReply>@ - ${comment.commentOriginalCommentName} - +
+ <#list commentList as comment> +
+ ${comment.commentName} +
+
+ <#if "http://" == comment.commentURL> + ${comment.commentName} + <#else> + ${comment.commentName} + + <#if comment.isReply>@ + ${comment.commentOriginalCommentName} + - • ${comment.commentDate?string("yy-MM-dd HH:mm")} • <#if article.commentable> - Reply - + • ${comment.commentDate?string("yy-MM-dd HH:mm")} • <#if article.commentable> + Reply + +
+
${comment.commentContent}
-
${comment.commentContent}
+
-
<#if article.commentable>
- +
<#if !isLoggedIn> @@ -70,7 +72,7 @@ <#if !isLoggedIn> @@ -117,7 +119,7 @@ "externalRelevantArticles1Label": "${externalRelevantArticlesLabel}" }); - var addComment = function(result, state) { + var addComment = function (result, state) { var commentHTML = '
' + result.userName +
                                     '"; page.addReplyForm(id, commentFormHTML); - $("#replyForm label").each(function() { + $("#replyForm label").each(function () { $this = $(this); $this.attr("for", $this.attr("for") + "Reply"); }); }; - $(document).ready(function() { + $(document).ready(function () { page.load(); // emotions page.replaceCommentsEm("#comments"); diff --git a/bruce/macro-head.ftl b/bruce/macro-head.ftl index 68d5337..151602f 100644 --- a/bruce/macro-head.ftl +++ b/bruce/macro-head.ftl @@ -7,6 +7,7 @@ +
- +