diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2010-09-01 15:41:56 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2010-09-01 15:41:56 +0000 |
| commit | 8f1a52438a2954c935f59c2e10220beac0e42d03 (patch) | |
| tree | 372f062b7ca82937fd526bea53f82ec43634b6ce /src/compiler/scala/tools/nsc/doc/html/page/Template.scala | |
| parent | d367ae7b26d1d757189ff9a7bea842da81c9df78 (diff) | |
| download | scala-8f1a52438a2954c935f59c2e10220beac0e42d03.tar.gz scala-8f1a52438a2954c935f59c2e10220beac0e42d03.tar.bz2 scala-8f1a52438a2954c935f59c2e10220beac0e42d03.zip | |
[scaladoc] Merges Petr's changes from the colla...
[scaladoc] Merges Petr's changes from the colladoc branch to only
display less-important information in class comments on demand. Also
fixes a bug with index filter. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/doc/html/page/Template.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/page/Template.scala | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala index 3001a1dc5a..622d2cdc22 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala @@ -180,7 +180,13 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { mbr match { case dte: DocTemplateEntity if isSelf => // comment of class itself - <div id="comment" class="fullcomment">{ memberToCommentBodyHtml(mbr, isSelf = true) }</div> + <xml:group> + { if (mbr.comment.isEmpty) NodeSeq.Empty + else + <div class="shortcomment cmt">{ commentToHtml(mbr.comment) }</div> + } + <div id="comment" class="fullcomment">{ memberToCommentBodyHtml(mbr, isSelf = true) }</div> + </xml:group> case dte: DocTemplateEntity if mbr.comment.isDefined => // comment of inner, documented class (only short comment, full comment is on the class' own page) memberToInlineCommentHtml(mbr, isSelf) |