Skip to content

Commit

Permalink
css properties for discussion comments list changed
Browse files Browse the repository at this point in the history
  • Loading branch information
ignatov committed Jul 19, 2011
1 parent 55fa6ae commit b974ba2
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
13 changes: 8 additions & 5 deletions src/main/scala/scala/tools/colladoc/page/Template.scala
Original file line number Diff line number Diff line change
Expand Up @@ -162,24 +162,27 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
<div id="discussion">
<h3 id="discussion_header">Discussion ({discussionCommentsCount})</h3>
<div id="discussion_wrapper">
<ol id="discussion_thread">
<ul id="discussion_thread">
{discussionComments map (d => discussionToHtml(d))}
</ol>
</ul>
{ discussionCommentAddButton }
</div>
</div>

/** Get discussion comments for current template. */
private def discussionComments = Discussion.findAll(By(Discussion.qualifiedName, tpl.qualifiedName), By(Discussion.valid, true))
private def discussionComments = Discussion.findAll(
By(Discussion.qualifiedName, tpl.qualifiedName),
By(Discussion.valid, true),
OrderBy(Discussion.dateTime, Ascending))

/** Get discussion comments count for current template. */
private def discussionCommentsCount = discussionComments.length

/** Render discussion comment. */
private def discussionToHtml(d: Discussion) =
<li class="discussion_comment">
<span class="comment">{bodyToHtml(parseWiki(d.comment.is, NoPosition))}</span>
<span class="info">{d.userNameDate}</span>
<span class="discussion_content">{bodyToHtml(parseWiki(d.comment.is, NoPosition))}</span>
<span class="discussion_info">{d.userNameDate}</span>
</li>

/** Render add comment button. */
Expand Down
14 changes: 14 additions & 0 deletions src/main/webapp/cotemplate.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,18 @@ background-color: #E5E5E5;
#discussion_wrapper {
display: none;
padding: 4px;
}

.discussion_comment {
margin: 7px 0;
list-style: none;
}

.discussion_content {
display: block;
}

.discussion_info {
display: block;
color: #999999;
}

0 comments on commit b974ba2

Please sign in to comment.