Move HTML templates for the repository viewer to repo.html package.

src/main/scala/app/RepositoryViewerController.scala

@@ -117,7 +117,7 @@ class RepositoryViewerController extends ControllerBase {
     
     val (logs, hasNext) = JGitUtil.getCommitLog(Git.open(getRepositoryDir(owner, repository)), branchName, page, 30)
     
-    html.commits(Nil, branchName, JGitUtil.getRepositoryInfo(owner, repository, servletContext), 
+    repo.html.commits(Nil, branchName, JGitUtil.getRepositoryInfo(owner, repository, servletContext), 
       logs.splitWith{ (commit1, commit2) =>
         view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
       }, page, hasNext)
@@ -135,7 +135,7 @@ class RepositoryViewerController extends ControllerBase {
     
     val (logs, hasNext) = JGitUtil.getCommitLog(Git.open(getRepositoryDir(owner, repository)), branchName, page, 30, path)
     
-    html.commits(path.split("/").toList, branchName, JGitUtil.getRepositoryInfo(owner, repository, servletContext), 
+    repo.html.commits(path.split("/").toList, branchName, JGitUtil.getRepositoryInfo(owner, repository, servletContext), 
       logs.splitWith{ (commit1, commit2) =>
         view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
       }, page, hasNext)
@@ -183,7 +183,7 @@ class RepositoryViewerController extends ControllerBase {
       val viewer  = if(FileTypeUtil.isImage(path)) "image" else if(large) "large" else "text"
       val content = ContentInfo(viewer, if(viewer == "text") JGitUtil.getContent(git, objectId, false).map(new String(_, "UTF-8")) else None)
         
-      html.blob(id, repositoryInfo, path.split("/").toList, content, new CommitInfo(revCommit))
+      repo.html.blob(id, repositoryInfo, path.split("/").toList, content, new CommitInfo(revCommit))
     }
   }
   
@@ -202,7 +202,7 @@ class RepositoryViewerController extends ControllerBase {
     val revCommit = revWalk.parseCommit(objectId)
     revWalk.dispose
     
-    html.commit(id, new CommitInfo(revCommit), JGitUtil.getRepositoryInfo(owner, repository, servletContext), JGitUtil.getDiffs(git, id))
+    repo.html.commit(id, new CommitInfo(revCommit), JGitUtil.getRepositoryInfo(owner, repository, servletContext), JGitUtil.getDiffs(git, id))
   }
   
   /**
@@ -236,7 +236,7 @@ class RepositoryViewerController extends ControllerBase {
       new String(JGitUtil.getContent(Git.open(getRepositoryDir(owner, repository)), file.id, true).get, "UTF-8")
     }
     
-    html.files(
+    repo.html.files(
       // current branch
       revision, 
       // repository

src/main/twirl/repo/blob.scala.html

@@ -1,8 +1,8 @@
 @(branch: String, repository: app.RepositoryInfo, pathList: List[String], content: app.ContentInfo, latestCommit: app.CommitInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers
-@main(repository.owner+"/"+repository.name) {
-  @header("code", repository)
+@html.main(repository.owner+"/"+repository.name) {
+  @html.header("code", repository)
   @navtab(branch, repository, "files")
   <div class="head">
     <a href="@path/@repository.owner/@repository.name/tree/@branch">@repository.name</a> /

src/main/twirl/repo/commit.scala.html

@@ -2,8 +2,8 @@
 @import context._
 @import view.helpers
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
-@main(helpers.cut(commit.message, 20)){
-  @header("code", repository)
+@html.main(helpers.cut(commit.message, 20)){
+  @html.header("code", repository)
   @navtab(branch, repository, "commits")
   <table class="table table-bordered">
     <tr>
@@ -21,5 +21,5 @@
       </td>
     </tr>
   </table>
-  @diff(diffs, repository, Some(commit.id))
+  @html.diff(diffs, repository, Some(commit.id))
 }

src/main/twirl/repo/commits.scala.html

@@ -1,8 +1,8 @@
 @(pathList: List[String], branch: String, repository: app.RepositoryInfo, commits: Seq[Seq[app.CommitInfo]], page: Int, hasNext: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers
-@main(repository.owner+"/"+repository.name) {
-  @header("code", repository)
+@html.main(repository.owner+"/"+repository.name) {
+  @html.header("code", repository)
   @navtab(branch, repository, if(pathList.isEmpty) "commits" else "files")
   <div class="head">
     @if(pathList.isEmpty){

src/main/twirl/repo/files.scala.html

@@ -1,8 +1,8 @@
 @(branch: String, repository: app.RepositoryInfo, pathList: List[String], latestCommit: app.CommitInfo, files: List[app.FileInfo], readme: Option[String])(implicit context: app.Context)
 @import context._
 @import view.helpers
-@main(repository.owner + "/" + repository.name) {
-  @header("code", repository)
+@html.main(repository.owner + "/" + repository.name) {
+  @html.header("code", repository)
   @navtab(branch, repository, "files")
   <div class="head">
     <a href="@path/@repository.owner/@repository.name/tree/@branch">@repository.name</a> /