diff options
| author | Pedro Furlanetto <pedrofurla@gmail.com> | 2010-09-20 03:10:18 +0000 |
|---|---|---|
| committer | Pedro Furlanetto <pedrofurla@gmail.com> | 2010-09-20 03:10:18 +0000 |
| commit | df90c36a13d51ef27b9d07c60760322260250538 (patch) | |
| tree | 74f09430f65063e3c9c2a20a49720efafc0d52d3 /src/compiler/scala/tools/nsc | |
| parent | fd2bfa28b0aaa2d9f7fa3a0dd702fcb0c93b80a4 (diff) | |
| download | scala-df90c36a13d51ef27b9d07c60760322260250538.tar.gz scala-df90c36a13d51ef27b9d07c60760322260250538.tar.bz2 scala-df90c36a13d51ef27b9d07c60760322260250538.zip | |
Adds links from letters to the reference index ...
Adds links from letters to the reference index on the upper section
of the left frame. Needs some layout/color improvements. Review by
dubochet.
Diffstat (limited to 'src/compiler/scala/tools/nsc')
4 files changed, 20 insertions, 15 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala b/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala index 1869fbb9fd..cc25c6b461 100644 --- a/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala @@ -62,7 +62,7 @@ class HtmlFactory(val universe: Universe, indexModel: IndexModelFactory#IndexMod copyResource("lib/filter_box_right.png") copyResource("lib/remove.png") - new page.Index(universe) writeFor this + new page.Index(universe,indexModel) writeFor this val written = mutable.HashSet.empty[DocTemplateEntity] diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Index.scala b/src/compiler/scala/tools/nsc/doc/html/page/Index.scala index 23ba7f0aaf..09da71fc1f 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Index.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Index.scala @@ -13,7 +13,7 @@ import model._ import scala.collection._ import scala.xml._ -class Index(universe: Universe) extends HtmlPage { +class Index(universe: Universe, indexModel: IndexModelFactory#IndexModel) extends HtmlPage { def path = List("index.html") @@ -48,7 +48,17 @@ class Index(universe: Universe) extends HtmlPage { </body> def browser = + <xml:group> <div id="browser" class="ui-layout-west"> + <div class="ui-west-north">{ + <div class="letters"> + { for(l <- indexModel.keySet.toList.sortBy( _.toString )) yield { // TODO there should be a better way to do that + val ch = if(l=='#') "%23" else l // url encoding if needed + <a target="template" href={"index/index-"+ch+".html"}>{l.toUpper}</a> ++ xml.Text(" ") + } } + </div> + }</div> + <div class="ui-west-center"> <div id="filter"></div> <div class="pack" id="tpl">{ def isExcluded(dtpl: DocTemplateEntity) = { @@ -118,8 +128,9 @@ class Index(universe: Universe) extends HtmlPage { </xml:group> } packageElem(universe.rootPackage) - }</div> + }</div></div> </div> + </xml:group> def packageQualifiedName(ety: DocTemplateEntity): String = if (ety.inTemplate.isPackage) ety.name else (packageQualifiedName(ety.inTemplate) + "." + ety.name) diff --git a/src/compiler/scala/tools/nsc/doc/html/page/ReferenceIndex.scala b/src/compiler/scala/tools/nsc/doc/html/page/ReferenceIndex.scala index 124b6852ba..7bdd5b22ea 100755 --- a/src/compiler/scala/tools/nsc/doc/html/page/ReferenceIndex.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/ReferenceIndex.scala @@ -22,23 +22,12 @@ class ReferenceIndex(letter: Char, indexModel: model.IndexModelFactory#IndexMode def headers = <xml:group> <link href={ relativeLinkTo(List("ref-index.css", "lib")) } media="screen" type="text/css" rel="stylesheet"/> - <script type="text/javascript" src={ relativeLinkTo{List("jquery.js", "lib")} }></script> + <script type="text/javascript" src={ relativeLinkTo{List("jquery.js", "lib")} }></script> </xml:group> val groupedMembers = indexModel(letter) - def indexLinks = - <div class="letters"> - { for(l <- indexModel.keySet.toList.sortBy( _.toString )) yield { // TODO there should be a better way to do that - val ch = if(l=='#') "%23" else l // url encoding if needed - ( if(letter != l) - <span><a href={"index-"+ch+".html"}>{l.toUpper}</a></span> - else - xml.Text(l.toUpper.toString) ) ++ xml.Text(" | ") - } } - </div> def body = <body> - { indexLinks } { for(groups <- groupedMembers) yield { <div class="entry"> <div class="name">{ groups._1 }</div> diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js index 21c09bf5e1..e598dca727 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js @@ -14,6 +14,11 @@ var title = $(document).attr('title') $(document).ready(function() { $('body').layout({ west__size: '20%' }); + $('#browser').layout({ + center__paneSelector: ".ui-west-center" + //,center__initClosed:true + ,north__paneSelector: ".ui-west-north" + }); $('iframe').bind("load", function(){ var subtitle = $(this).contents().find('title').text(); $(document).attr('title', (title ? title + " - " : "") + subtitle); |