diff --git a/src/main/scala/util/Implicits.scala b/src/main/scala/util/Implicits.scala index 2d044e6..19045ad 100644 --- a/src/main/scala/util/Implicits.scala +++ b/src/main/scala/util/Implicits.scala @@ -1,5 +1,7 @@ package util +import twirl.api.Html + /** * Provides some usable implicit conversions. */ @@ -20,7 +22,11 @@ case Nil => result } } + } - } + implicit def extendsHtmlSeq(seq: Seq[Html]) = new { + def mkHtml(separator: String) = Html(seq.mkString(separator)) + def mkHtml(separator: scala.xml.Elem) = Html(seq.mkString(separator.toString)) + } } \ No newline at end of file diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala index eb655e1..cfafe8a 100644 --- a/src/main/scala/view/helpers.scala +++ b/src/main/scala/view/helpers.scala @@ -40,14 +40,14 @@ } -/** - * Provides implicit conversions for Twirl templates. - */ -object implicits { - - implicit def extendsHtmlSeq(seq: Seq[Html]) = new { - def mkHtml(separator: String) = Html(seq.mkString(separator)) - def mkHtml(separator: scala.xml.Elem) = Html(seq.mkString(separator.toString)) - } - -} \ No newline at end of file +///** +// * Provides implicit conversions for Twirl templates. +// */ +//object implicits { +// +// implicit def extendsHtmlSeq(seq: Seq[Html]) = new { +// def mkHtml(separator: String) = Html(seq.mkString(separator)) +// def mkHtml(separator: scala.xml.Elem) = Html(seq.mkString(separator.toString)) +// } +// +//} \ No newline at end of file diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html index 54dfa2a..f597991 100644 --- a/src/main/twirl/repo/commit.scala.html +++ b/src/main/twirl/repo/commit.scala.html @@ -1,7 +1,7 @@ @(commitId: String, commit: util.JGitUtil.CommitInfo, branches: List[String], tags: List[String], repository: service.RepositoryService.RepositoryInfo, diffs: Seq[util.JGitUtil.DiffInfo])(implicit context: app.Context) @import context._ @import view.helpers -@import view.implicits._ +@import util.Implicits._ @import org.eclipse.jgit.diff.DiffEntry.ChangeType @html.main(commit.shortMessage){ @html.header("code", repository)