This commit is contained in:
Van 2015-09-30 21:38:37 +08:00
parent 232e095b4d
commit 7e2f33269f
2 changed files with 55 additions and 40 deletions

View File

@ -88,6 +88,12 @@ h4, h5, h6 {
margin-bottom: 0em; margin-bottom: 0em;
} }
.form-control,
#captcha,
#captchaReply {
margin-top: 15px;
}
.cmtFromSym { .cmtFromSym {
font-size: 12px; font-size: 12px;
color: #ccc; color: #ccc;
@ -98,10 +104,6 @@ h4, h5, h6 {
margin-top: 24px; margin-top: 24px;
} }
.cmtReplyForm {
margin-top: 128px;
}
.gray { .gray {
color: #ccc; color: #ccc;
} }

View File

@ -1,58 +1,66 @@
<#macro comments commentList article> <#macro comments commentList article>
<div class="row" id="comments"> <div class="row" id="comments">
<div class="col-sm-12"> <#list commentList as comment>
<#list commentList as comment> <div class="row comment" id="${comment.oId}">
<div class="row comment" id="${comment.oId}"> <img class="col-sm-1" title="${comment.commentName}"
<img class="col-sm-1" title="${comment.commentName}" alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/> <div class="col-sm-11">
<div class="col-sm-11"> <div class="row">
<div class="row"> <#if "http://" == comment.commentURL>
<#if "http://" == comment.commentURL> <a>${comment.commentName}</a>
<a>${comment.commentName}</a> <#else>
<#else> <a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a> </#if>
</#if> <#if comment.isReply>@
<#if comment.isReply>@ <a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}"
<a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}" onmouseover="page.showComment(this, '${comment.commentOriginalCommentId}', 20);"
onmouseover="page.showComment(this, '${comment.commentOriginalCommentId}', 20);" onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}</a>
onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}</a> </#if>
</#if>
<span class="gray">• ${comment.commentDate?string("yy-MM-dd HH:mm")} • <#if article.commentable> <span class="gray">• ${comment.commentDate?string("yy-MM-dd HH:mm")} • <#if article.commentable>
<a rel="nofollow" href="javascript:replyTo('${comment.oId}');">Reply</a> <a rel="nofollow" href="javascript:replyTo('${comment.oId}');">Reply</a>
</#if></span> </#if></span>
</div>
<div class="row code-highlight">${comment.commentContent}</div>
</div> </div>
<div class="row code-highlight">${comment.commentContent}</div>
</div> </div>
</#list>
</div> </div>
</#list>
</div> </div>
<#if article.commentable> <#if article.commentable>
<div class="row cmtForm"> <div class="row cmtForm">
<table id="commentForm" class="col-sm-12"> <table id="commentForm" class="col-sm-12 form-horizontal">
<tbody> <tbody>
<#if !isLoggedIn> <#if !isLoggedIn>
<tr> <tr>
<td colspan="2"> <td>
<input type="text" class="normalInput" id="commentName" placeholder="Name"/> <label for="commentName" class="col-sm-2 control-label">Name</label>
</td>
<td>
<input type="text" class="form-control" id="commentName" placeholder="Name"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td>
<input type="text" class="normalInput" id="commentEmail" placeholder="Email"/> <label for="commentName" class="col-sm-2 control-label">Email</label>
</td>
<td>
<input type="text" class="form-control" id="commentEmail" placeholder="Email"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td>
<input type="text" id="commentURL" placeholder="URL"/> <label for="commentName" class="col-sm-2 control-label">URL</label>
</td>
<td>
<input type="text" id="commentURL" placeholder="URL" class="form-control"/>
</td> </td>
</tr> </tr>
</#if> </#if>
<tr> <tr>
<td id="emotions" colspan="2"> <td>&nbsp;</td>
<td id="emotions">
<span class="em00" title="${em00Label}"></span> <span class="em00" title="${em00Label}"></span>
<span class="em01" title="${em01Label}"></span> <span class="em01" title="${em01Label}"></span>
<span class="em02" title="${em02Label}"></span> <span class="em02" title="${em02Label}"></span>
@ -71,15 +79,20 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td>&nbsp;</td>
<textarea rows="10" style="width: 100%;" id="comment"></textarea> <td>
<textarea rows="3" id="comment" class="form-control"></textarea>
</td> </td>
</tr> </tr>
<#if !isLoggedIn> <#if !isLoggedIn>
<tr> <tr>
<td colspan="2"> <td>&nbsp;</td>
<input type="text" id="commentValidate"/> <td>
<form class="form-inline">
<input type="text" id="commentValidate" class="form-control"/>
<img id="captcha" alt="validate" src="${servePath}/captcha.do" /> <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
</form>
</td> </td>
</tr> </tr>
</#if> </#if>
@ -147,7 +160,7 @@
}; };
var replyTo = function (id) { var replyTo = function (id) {
var commentFormHTML = "<table class='cmtReplyForm' id='replyForm'>"; var commentFormHTML = "<table class='cmtReplyForm col-sm-12 form-horizontal' id='replyForm'>";
page.addReplyForm(id, commentFormHTML); page.addReplyForm(id, commentFormHTML);
$("#replyForm label").each(function () { $("#replyForm label").each(function () {
$this = $(this); $this = $(this);