Skip to content

Commit

Permalink
some fixes after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
ignatov committed Aug 15, 2011
1 parent d615c8c commit c1dc5ba
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@ organization := "scala.tools.colladoc"

scalaHome := Some(file("scala/build/pack"))

jettyScanDirs := Nil

libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )

libraryDependencies ++= {
val liftVersion = "2.2"
val liftVersion = "2.4-M2"
Seq(
"net.liftweb" % "lift-webkit_2.8.1" % liftVersion % "compile->default",
"net.liftweb" % "lift-mapper_2.8.1" % liftVersion % "compile->default",
"net.liftweb" % "lift-openid_2.8.1" % liftVersion % "compile->default",
"net.liftweb" % "lift-widgets_2.8.1" % liftVersion % "compile->default"
"net.liftweb" % "lift-webkit_2.9.0-1" % liftVersion % "compile->default",
"net.liftweb" % "lift-mapper_2.9.0-1" % liftVersion % "compile->default",
"net.liftweb" % "lift-openid_2.9.0-1" % liftVersion % "compile->default",
"net.liftweb" % "lift-widgets_2.9.0-1" % liftVersion % "compile->default"
)
}

Expand All @@ -42,4 +40,6 @@ resolvers += ScalaToolsSnapshots

resolvers += "Jetty Repo" at "http://repo1.maven.org/maven2/org/mortbay/jetty"

resolvers += "Java.net Repo" at "http://download.java.net/maven/2/"

libraryDependencies += "org.mortbay.jetty" % "jetty" % "6.1.22" % "test->default"
2 changes: 1 addition & 1 deletion src/main/scala/scala/tools/colladoc/page/Index.scala
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import lib.js.JqUI._
*/
class Index(universe: Universe, index: DocIndex) extends PageIndex(universe, index) {

override def scriptElement = super.scriptElement \+
override def scriptElement =
<div id="user">
{ if (User.loggedIn_?)
loggedIn
Expand Down

0 comments on commit c1dc5ba

Please sign in to comment.