1.1 --- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp Fri Oct 09 19:06:51 2020 +0200 1.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp Fri Oct 09 19:07:05 2020 +0200 1.3 @@ -32,10 +32,10 @@ 1.4 <c:set var="issue" scope="page" value="${viewmodel.issue}" /> 1.5 1.6 <form action="./projects/issues/commit" method="post"> 1.7 - <table class="formtable"> 1.8 + <table class="formtable fullwidth"> 1.9 <colgroup> 1.10 <col> 1.11 - <col style="width: 75ch"> 1.12 + <col style="width: 100%"> 1.13 </colgroup> 1.14 <tbody> 1.15 <c:if test="${viewmodel.issue.id ge 0}"> 1.16 @@ -169,3 +169,46 @@ 1.17 </tfoot> 1.18 </table> 1.19 </form> 1.20 +<hr class="comments-separator"/> 1.21 +<h2><fmt:message key="issue.comments"/></h2> 1.22 +<c:if test="${viewmodel.issue.id ge 0}"> 1.23 +<form id="comment-form" action="./projects/issues/comment" method="post"> 1.24 + <table class="formtable fullwidth"> 1.25 + <tbody> 1.26 + <tr> 1.27 + <td><textarea rows="5" name="comment"></textarea></td> 1.28 + </tr> 1.29 + </tbody> 1.30 + <tfoot> 1.31 + <tr> 1.32 + <td> 1.33 + <input type="hidden" name="issueid" value="${issue.id}"/> 1.34 + <button type="submit"><fmt:message key="button.comment"/></button> 1.35 + </td> 1.36 + </tr> 1.37 + </tfoot> 1.38 + </table> 1.39 +</form> 1.40 + <c:forEach var="comment" items="${viewmodel.comments}"> 1.41 + <div class="comment"> 1.42 + <div class="caption"> 1.43 + <c:if test="${not empty comment.author}"> 1.44 + <c:out value="${comment.author.displayname}"/> 1.45 + </c:if> 1.46 + <c:if test="${empty comment.author}"> 1.47 + <fmt:message key="issue.comments.anonauthor"/> 1.48 + </c:if> 1.49 + </div> 1.50 + <div class="smalltext"> 1.51 + <fmt:formatDate type="BOTH" value="${comment.created}" /> 1.52 + <c:if test="${comment.updateCount gt 0}"> 1.53 + <!-- TODO: update count --> 1.54 + </c:if> 1.55 + </div> 1.56 + <div class="medskip"> 1.57 + <c:out value="${comment.comment}"/> 1.58 + </div> 1.59 + </div> 1.60 + </c:forEach> 1.61 +</c:if> 1.62 +