[scaladoc] Small fixes for 2.8.0 updated docume...

[scaladoc] Small fixes for 2.8.0 updated documentation: window title
contains version number, authors are not displayed (like in Javadoc),
source links have correct title. No review.

1 files changed, 4 insertions, 12 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 1da65c16b5..dd7633a9a8 100644
--- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
+++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
@@ -18,7 +18,7 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
   val path =
     templateToPath(tpl)
 
-  val title = tpl.name + " (Scaladoc for " + tpl.qualifiedName + ")"
+  val title = tpl.universe.settings.doctitle.value + " (" + tpl.universe.settings.docversion.value + ") — " + tpl.qualifiedName
 
   val headers =
     <xml:group>
@@ -294,10 +294,10 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
       }
     } ++
     { mbr match {
-        case dtpl: DocTemplateEntity if (isSelf && dtpl.sourceUrl.isDefined) =>
-          val sourceUrl = tpl.sourceUrl.get
+        case dtpl: DocTemplateEntity if (isSelf && dtpl.sourceUrl.isDefined && dtpl.inSource.isDefined) =>
+          val (absFile, line) = dtpl.inSource.get
           <div class="block">
-            source: { <a href={ sourceUrl.toString }>{ Text(new java.io.File(sourceUrl.getPath).getName) }</a> }
+            source: { <a href={ dtpl.sourceUrl.get.toString }>{ Text(absFile.file.getName) }</a> }
           </div>
         case _ => NodeSeq.Empty
       }
@@ -330,14 +330,6 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
                 </ol></div>
               else NodeSeq.Empty
             }
-            { if(!comment.authors.isEmpty)
-                <div class="block"><ol>authors:
-                  { val authorsXml:List[scala.xml.NodeSeq]=(for(author <- comment.authors ) yield <li>{bodyToHtml(author)}</li> )
-                    authorsXml.reduceLeft(_ ++ Text(", ") ++ _)
-                  }
-                </ol></div>
-              else NodeSeq.Empty
-            }
           </xml:group>
         case None => NodeSeq.Empty
       }