#92 closed: "Discussions should have their own section"

colladoc · Jul 29, 2011 · da414f4 · da414f4
1 parent 555bdb6
commit da414f4
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/src/main/scala/scala/tools/colladoc/page/Template.scala b/src/main/scala/scala/tools/colladoc/page/Template.scala
@@ -117,7 +117,7 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
           }
         </div>
 
-        { categories }
+        { discussions }
 
         { if (constructors.isEmpty) NodeSeq.Empty else
             <div id="constructors" class="members">
@@ -165,6 +165,14 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
 
     </body>
 
+  private def discussions =
+    <div id="discussions">
+      <h3 id="discussions_header" class="header">Discussions</h3>
+      <div id="discussions_wrapper">
+        { categories }
+      </div>
+    </div>
+
   /** Render discussion block. */
   private def categories: NodeSeq =
     Category.all map categoryToHtmlWithToggle _
@@ -177,7 +185,7 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
             $('#%s').slideToggle(100);
           });
         });
-      """ format (id(c.name.is + "header"), id(c.name.is + "discussion_wrapper"))
+      """ format (id(c.name.is + "header"), id(c.name.is + "wrapper"))
 
     <xml:group>
       { categoryToHtml(c) }
@@ -190,7 +198,7 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
   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">
+      <div id={ id(c.name.is + "wrapper") } class="wrapper">
         <ul class="discussion_thread">
         {
           Discussion.topLevelComments(c, tpl.qualifiedName) map {
@@ -301,7 +309,7 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
   /** Reload discussion block after new comment adding. */
   private def reloadDiscussion(category: Category) =
     Replace(id(category.name.is), categoryToHtml(category)) &
-    JsRaw("$('#" + id(category.name.is + "discussion_wrapper") + "').toggle();") &
+    JsRaw("$('#" + id(category.name.is + "wrapper") + "').toggle();") &
     PrettyDate &
     Jq(Str("button")) ~> Button()
 

diff --git a/src/main/webapp/cotemplate.css b/src/main/webapp/cotemplate.css
@@ -89,15 +89,30 @@ background-color: #E5E5E5;
 
 }
 
-.category h3 {
+#discussions_header {
     color: black;
     padding: 4px;
     background-color: #E5E5E5;
     font-size: 12pt;
     font-weight: bold;
+    cursor: pointer;
+}
+
+#discussions_wrapper {
+    display: none;
+}
+
+.category h3 {
+    color: black;
+    padding: 4px 4px 4px 16px;
+    border-top: 1px dotted #555;
+    background-color: #E5E5E5;
+    font-size: 12pt;
+    font-weight: bold;
+    cursor: pointer;
 }
 
-.discussion_wrapper {
+.wrapper {
     display: none;
     margin-left: 20px;
     margin-top: 10px;

diff --git a/src/main/webapp/scripts/cotemplate.js b/src/main/webapp/scripts/cotemplate.js
@@ -132,4 +132,10 @@ function prettyDate() {
 
 $(document).ready(function() {
   prettyDate();
+});
+
+$(document).ready(function() {
+  $('#discussions_header').live('click', function(){
+    $('#discussions_wrapper').slideToggle(100);
+  });
 });