Skip to content

Commit

Permalink
added UI for categories
Browse files Browse the repository at this point in the history
  • Loading branch information
@ignatov
ignatov committed Jul 28, 2011
1 parent 98442a7 commit 555bdb6
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 134 deletions.
5 changes: 5 additions & 0 deletions src/main/scala/scala/tools/colladoc/model/mapper/Category.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@ class Category extends LongKeyedMapper[Category] with IdPK {

object Category extends Category with LongKeyedMetaMapper[Category] {
override def dbTableName = "categories"

/** Get all categories with non empty names. */
def all = findAll filter { c => c.name.is.trim.length > 0 }

def get(d: Discussion) = Category.find(d.category).open_!
}
17 changes: 10 additions & 7 deletions src/main/scala/scala/tools/colladoc/model/mapper/Discussion.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,23 @@ object Discussion extends Discussion with LongKeyedMetaMapper[Discussion] {
override def dbTableName = "discussions"

/** Get discussion top level comments for template. */
def topLevelComments(qualifiedName: String) = findAll(
def topLevelComments(category: Category, qualifiedName: String) = findAll(
By(Discussion.category, category),
By(Discussion.qualifiedName, qualifiedName),
NullRef(Discussion.parent),
OrderBy(Discussion.dateTime, Ascending))

/** Get discussion comments count for template. */
def count(qualifiedName: String): Long = count(
def count(category: Category, qualifiedName: String): Long = count(
By(Discussion.category, category),
By(Discussion.qualifiedName, qualifiedName),
By(Discussion.valid, true))

/** Get replies for discussion current comment. */
def replies(d: Discussion) = Discussion.findAll(
By(Discussion.qualifiedName, d.qualifiedName.is),
NotNullRef(Discussion.parent),
By(Discussion.parent, d),
OrderBy(Discussion.dateTime, Ascending))
def replies(category: Category, d: Discussion) = Discussion.findAll(
By(Discussion.category, category),
By(Discussion.qualifiedName, d.qualifiedName.is),
NotNullRef(Discussion.parent),
By(Discussion.parent, d),
OrderBy(Discussion.dateTime, Ascending))
}
2 changes: 1 addition & 1 deletion src/main/scala/scala/tools/colladoc/model/mapper/User.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ object User extends User with KeyedMetaMapper[Long, User] {
<div id="categories_list">
<h3>Categories list</h3>
<ul>
{ Category.findAll map categoryToHtml _ }
{ Category.all map categoryToHtml _ }
</ul>
</div>

Expand Down
99 changes: 65 additions & 34 deletions src/main/scala/scala/tools/colladoc/page/Template.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import lib.js.JqUI._
import lib.widgets.Editor
import model.Model
import model.Model.factory._
import model.mapper.{Discussion, Comment, User}
import model.mapper._

import net.liftweb.common._
import net.liftweb.http.{S, SHtml}
Expand Down Expand Up @@ -61,6 +61,14 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
private def id(mbr: MemberEntity, pos: String) =
idAttrEncode(hash(mbr.identifier + System.identityHashCode(mbr) + pos))

/**
* Create unique identifier for given name.
* @param name identifier position
* @return unique positional identifier
*/
private def id(name: String) =
idAttrEncode(hash(name))

override def body =
<body class={ if (tpl.isTrait || tpl.isClass || tpl.qualifiedName == "scala.AnyRef") "type" else "value" } onload="windowTitle();">

Expand Down Expand Up @@ -109,7 +117,7 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
}
</div>

{ if (User.loggedIn_?) discussion }
{ categories }

{ if (constructors.isEmpty) NodeSeq.Empty else
<div id="constructors" class="members">
Expand Down Expand Up @@ -158,23 +166,44 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
</body>

/** Render discussion block. */
private def discussion: NodeSeq =
<div id="discussion">
<h3 id="discussion_header">Discussion ({ Discussion.count(tpl.qualifiedName) })</h3>
<div id="discussion_wrapper">
<ul id="discussion_thread">
{
Discussion.topLevelComments(tpl.qualifiedName) map {
d => discussionToHtmlWithActions(d, 0) }
}
</ul>
{ if (!User.banned_?) discussionCommentAddButton }
private def categories: NodeSeq =
Category.all map categoryToHtmlWithToggle _

private def categoryToHtmlWithToggle(c: Category) = {
val toggle =
"""
$(document).ready(function() {
$('#%s').live('click', function(){
$('#%s').slideToggle(100);
});
});
""" format (id(c.name.is + "header"), id(c.name.is + "discussion_wrapper"))

<xml:group>
{ categoryToHtml(c) }
<script type="text/javascript">
{ toggle }
</script>
</xml:group>
}

private def categoryToHtml(c: Category) =
<div id={ id(c.name.is) } class="category">
<h3 id={ id(c.name.is + "header") } class="header">{ c.name }</h3>
<div id={ id(c.name.is + "discussion_wrapper") } class="discussion_wrapper">
<ul class="discussion_thread">
{
Discussion.topLevelComments(c, tpl.qualifiedName) map {
d => discussionToHtmlWithActions(d, 0) }
}
</ul>
{ if (!User.banned_?) discussionCommentAddButton(c) }
</div>
</div>

/** Render discussion comment. */
def discussionToHtml(d: Discussion, level: Int = 0, withReplies: Boolean = false) = {
val replies = Discussion.replies(d)
val replies = Discussion.replies(Category.get(d), d)

<xml:group>
{
Expand All @@ -197,7 +226,7 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(

</li>
} else
if (replies.length > 0)
if (replies.filter(d => d.valid).length > 0)
<li class={"discussion_comment discussion_level_" + level}>
<div class="discussion_content discussion_deleted">Comment deleted</div>
</li>
Expand All @@ -218,12 +247,12 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
)

/** Render add comment button. */
private def discussionCommentAddButton = {
SHtml.ajaxButton(Text("Add comment"), discussionEditor(None) _, ("class", "button"), ("id", "add_discussion_button"))
private def discussionCommentAddButton(category: Category) = {
SHtml.ajaxButton(Text("Add comment"), discussionEditor(category, None) _, ("class", "button"), ("id", id(category.name.is + "add_discussion_button")))
}

/** Render editor. */
private def discussionEditor(maybe: Option[Discussion] = None)(): JsCmd = {
private def discussionEditor(category: Category, maybe: Option[Discussion] = None)(): JsCmd = {
maybe match {
case Some(d) =>
Editor.editorObj(d.comment.is, preview _, updateDiscussionComment(d) _) match {
Expand All @@ -233,7 +262,7 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
<div class="editor">
{ n }
<div class="buttons">
{ SHtml.ajaxButton(Text("Save"), () => SHtml.submitAjaxForm("edit_form_" + d.id, () => reloadDiscussion)) }
{ SHtml.ajaxButton(Text("Save"), () => SHtml.submitAjaxForm("edit_form_" + d.id, () => reloadDiscussion(category))) }
{ SHtml.a(Text("Cancel"),
Replace("edit_form_" + d.id, discussionToHtmlWithActions(d)) &
PrettyDate &
Expand All @@ -246,16 +275,17 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
case _ => JsCmds.Noop
}
case None =>
Editor.editorObj("", preview _, saveDiscussionComment(_)) match {
Editor.editorObj("", preview _, text => saveDiscussionComment(category, text)) match {
case (n, j) =>
Replace("add_discussion_button",
<form id="discussion_form" class="edit" method="GET">
val formId = id(category.name.is + "discussion_form")
Replace(id(category.name.is + "add_discussion_button"),
<form id={ formId } class="edit" method="GET">
<div class="editor">
{ n }
<div class="buttons">
{ SHtml.ajaxButton(Text("Save"), () => SHtml.submitAjaxForm("discussion_form", () => reloadDiscussion)) }
{ SHtml.ajaxButton(Text("Save"), () => SHtml.submitAjaxForm(formId, () => reloadDiscussion(category))) }
{ SHtml.a(Text("Cancel"),
Replace("discussion_form", discussionCommentAddButton) &
Replace(formId, discussionCommentAddButton(category)) &
PrettyDate &
Jq(Str("button")) ~> Button(),
("class", "button"))
Expand All @@ -269,14 +299,15 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
}

/** Reload discussion block after new comment adding. */
private def reloadDiscussion = Replace("discussion", discussion) &
JsRaw("$('#discussion_wrapper').toggle();") &
PrettyDate &
Jq(Str("button")) ~> Button()
private def reloadDiscussion(category: Category) =
Replace(id(category.name.is), categoryToHtml(category)) &
JsRaw("$('#" + id(category.name.is + "discussion_wrapper") + "').toggle();") &
PrettyDate &
Jq(Str("button")) ~> Button()

/** Save discussion comment to database. */
private def saveDiscussionComment(text: String, parent: Option[Discussion] = None) {
val d = Discussion.create.qualifiedName(tpl.qualifiedName).comment(text).dateTime(now).user(User.currentUser.open_!).valid(true)
private def saveDiscussionComment(category: Category, text: String, parent: Option[Discussion] = None) {
val d = Discussion.create.category(category).qualifiedName(tpl.qualifiedName).comment(text).dateTime(now).user(User.currentUser.open_!).valid(true)
parent match {
case Some(p) => d.parent(p)
case _ =>
Expand All @@ -301,23 +332,23 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(

/** Render delete button for discussion comment. */
def deleteDiscussionButton(d: Discussion) = SHtml.a(
ColladocConfirm("Confirm delete"), () => {d.valid(false).save; reloadDiscussion}, Text("Delete"))
ColladocConfirm("Confirm delete"), () => {d.valid(false).save; reloadDiscussion(Category.get(d))}, Text("Delete"))

/** Render delete button for discussion comment. */
def editDiscussionButton(d: Discussion) = SHtml.a(discussionEditor(Some(d)) _, Text("Edit"))
def editDiscussionButton(d: Discussion) = SHtml.a(discussionEditor(Category.get(d), Some(d)) _, Text("Edit"))

/** Render reply button for discussion comment. */
def replyDiscussionButton(d: Discussion) = SHtml.a(replyEditor(d) _, Text("Reply"))

def replyEditor(parent: Discussion)() =
Editor.editorObj("", preview _, text => { saveDiscussionComment(text, Some(parent)) }) match {
Editor.editorObj("", preview _, text => { saveDiscussionComment(Category.get(parent), text, Some(parent)) }) match {
case (n, j) =>
Replace("reply_for_" + parent.id,
<form id={"reply_form_for_" + parent.id} class="edit" method="GET">
<div class="editor">
{ n }
<div class="buttons">
{ SHtml.ajaxButton(Text("Save"), () => SHtml.submitAjaxForm("reply_form_for_" + parent.id, () => reloadDiscussion)) }
{ SHtml.ajaxButton(Text("Save"), () => SHtml.submitAjaxForm("reply_form_for_" + parent.id, () => reloadDiscussion(Category.get(parent)))) }
{ SHtml.a(Text("Cancel"),
Replace("reply_form_for_" + parent.id, <div id={"reply_for_" + parent.id} />) &
PrettyDate &
Expand Down
86 changes: 2 additions & 84 deletions src/main/webapp/cotemplate.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ background-color: #E5E5E5;

}

#discussion h3 {
.category h3 {
color: black;
padding: 4px;
background-color: #E5E5E5;
font-size: 12pt;
font-weight: bold;
}

#discussion_wrapper {
.discussion_wrapper {
display: none;
margin-left: 20px;
margin-top: 10px;
Expand Down Expand Up @@ -145,86 +145,4 @@ background-color: #E5E5E5;

.discussion_comment_actions > a:hover {
text-decoration: underline;
}

#content h3 {
color: black;
padding: 4px;
background-color: #E5E5E5;
font-size: 12pt;
font-weight: bold;
}

#content_wrapper {
display: none;
margin-left: 20px;
margin-top: 10px;
margin-bottom: 10px;
}

.content_comment {
margin: 20px 20px 20px 0;
list-style: none;
}

.content_comment_actions {
margin-top: 5px;
}

.content_content {
margin-left: 30px;
}

.content_info {
color: #999999;
margin-top: 5px;
margin-left: 30px;
}

.content_avatar {
float: left;
}

.content_comment_actions > a {
color: #000000;
font-weight: bold;
text-decoration: none;
margin-right: 2px;
}

.content_comment_actions > a:hover {
text-decoration: underline;
}

.content_form label {
display: block;
font-weight: bold;
margin-bottom: 2px;
}

.content_form input {
display: block;
border: 1px solid gray;
}

.content_form div {
margin-bottom: 5px;
}

form.edit div.buttons > a {
font-weight: normal;
color: #555;
}

#content_form fieldset {
padding: 0;
border: 0;
margin-top: 8px;
}

.content_form .error {
color: #666666;
display: block;
/*font-size: 8pt;*/
padding-top: 0.2em;
}
8 changes: 0 additions & 8 deletions src/main/webapp/scripts/cotemplate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,6 @@ function confirm(message, callback, options) {
$confirm.dialog($.extend({}, defaults, options));
}

$("#discussion_header").live("click", function(){
$("#discussion_wrapper").slideToggle(100);
});

$("#content_header").live("click", function(){
$("#content_wrapper").slideToggle(100);
});

function prettyDate() {
if (jQuery.prettyDate)
$(".datetime").prettyDate();
Expand Down

0 comments on commit 555bdb6

Please sign in to comment.