From 89c0e52c1d899dcc03cc7bda46b45e095e10c90f Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 27 Jun 2013 21:19:41 +0900 Subject: [PATCH] Refactor for views. - Replace urls with helpers.url and helpers.assets - Move google-code-prettify to main.scala.html - Move some CSS styles to gitbucket.css --- src/main/scala/view/helpers.scala | 16 +++++ src/main/twirl/account/useredit.scala.html | 7 +- src/main/twirl/account/userinfo.scala.html | 12 ++-- src/main/twirl/admin/useredit.scala.html | 2 +- src/main/twirl/diff.scala.html | 67 ++++++++++--------- src/main/twirl/header.scala.html | 11 +-- src/main/twirl/index.scala.html | 8 +-- src/main/twirl/issues/issue.scala.html | 12 ++-- src/main/twirl/issues/issueedit.scala.html | 3 +- src/main/twirl/issues/issues.scala.html | 20 +++--- src/main/twirl/issues/issuestab.scala.html | 7 +- src/main/twirl/issues/labeledit.scala.html | 3 +- .../twirl/issues/labeleditlist.scala.html | 5 +- .../twirl/issues/milestoneedit.scala.html | 8 +-- src/main/twirl/issues/milestones.scala.html | 24 +++---- src/main/twirl/main.scala.html | 34 ++++++---- src/main/twirl/newrepo.scala.html | 2 +- src/main/twirl/preview.scala.html | 11 +-- src/main/twirl/repo/blob.scala.html | 38 +++-------- src/main/twirl/repo/commit.scala.html | 30 ++++----- src/main/twirl/repo/commits.scala.html | 27 ++++---- src/main/twirl/repo/files.scala.html | 32 ++++----- src/main/twirl/repo/navtab.scala.html | 9 +-- src/main/twirl/repo/tags.scala.html | 10 +-- .../twirl/settings/collaborators.scala.html | 9 +-- src/main/twirl/settings/delete.scala.html | 3 +- src/main/twirl/settings/menu.scala.html | 7 +- src/main/twirl/settings/options.scala.html | 8 +-- src/main/twirl/signin.scala.html | 2 +- src/main/twirl/wiki/wiki.scala.html | 14 ++-- src/main/twirl/wiki/wikicompare.scala.html | 8 +-- src/main/twirl/wiki/wikiedit.scala.html | 12 ++-- src/main/twirl/wiki/wikihistory.scala.html | 16 ++--- src/main/twirl/wiki/wikipages.scala.html | 6 +- src/main/twirl/wiki/wikitab.scala.html | 7 +- .../webapp/assets/common/css/gitbucket.css | 15 +++++ 36 files changed, 265 insertions(+), 240 deletions(-) diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala index 3013f760d..73d9c301c 100644 --- a/src/main/scala/view/helpers.scala +++ b/src/main/scala/view/helpers.scala @@ -26,6 +26,22 @@ object helpers { Html(Markdown.toHtml(value, repository, enableWikiLink, enableCommitLink, enableIssueLink)) } + /** + * Generates the url to the repository. + */ + def url(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): String = + "%s/%s/%s".format(context.path, repository.owner, repository.name) + + /** + * Generates the url to the account page. + */ + def url(userName: String)(implicit context: app.Context): String = "%s/%s".format(context.path, userName) + + /** + * Returns the url to the root of assets. + */ + def assets(implicit context: app.Context): String = "%s/assets".format(context.path) + /** * Converts issue id and commit id to link. */ diff --git a/src/main/twirl/account/useredit.scala.html b/src/main/twirl/account/useredit.scala.html index 7870c98f4..69459e3a9 100644 --- a/src/main/twirl/account/useredit.scala.html +++ b/src/main/twirl/account/useredit.scala.html @@ -1,7 +1,8 @@ @(account: model.Account)(implicit context: app.Context) @import context._ +@import view.helpers._ @html.main(account.userName){ -
+
@@ -13,8 +14,8 @@
- - Cancel + + Cancel
} diff --git a/src/main/twirl/account/userinfo.scala.html b/src/main/twirl/account/userinfo.scala.html index 5931d8d36..3905da232 100644 --- a/src/main/twirl/account/userinfo.scala.html +++ b/src/main/twirl/account/userinfo.scala.html @@ -1,6 +1,6 @@ @(account: model.Account, repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context) @import context._ -@import view.helpers +@import view.helpers._ @html.main(account.userName){
@@ -10,7 +10,7 @@
@account.url
-
Joined on @helpers.date(account.registeredDate)
+
Joined on @date(account.registeredDate)
@@ -22,7 +22,7 @@ @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
  • - Edit Your Profile + Edit Your Profile
    • } @@ -30,9 +30,9 @@ @repositories.map { repository =>
    - @repository.owner + @repository.owner / - @repository.name + @repository.name @if(repository.repository.isPrivate){ } @@ -40,7 +40,7 @@ @if(repository.repository.description.isDefined){
    @repository.repository.description
    } -
    Last updated: @helpers.datetime(repository.repository.lastActivityDate)
    +
    Last updated: @datetime(repository.repository.lastActivityDate)
    }
    diff --git a/src/main/twirl/admin/useredit.scala.html b/src/main/twirl/admin/useredit.scala.html index 514ec59c6..729cc9831 100644 --- a/src/main/twirl/admin/useredit.scala.html +++ b/src/main/twirl/admin/useredit.scala.html @@ -32,7 +32,7 @@
    - + Cancel
    diff --git a/src/main/twirl/diff.scala.html b/src/main/twirl/diff.scala.html index 65669b437..036023073 100644 --- a/src/main/twirl/diff.scala.html +++ b/src/main/twirl/diff.scala.html @@ -1,5 +1,6 @@ @(diffs: Seq[util.JGitUtil.DiffInfo], repository: service.RepositoryService.RepositoryInfo, commitId: Option[String])(implicit context: app.Context) @import context._ +@import view.helpers._ @import org.eclipse.jgit.diff.DiffEntry.ChangeType @diffs.zipWithIndex.map { case (diff, i) => @@ -17,7 +18,7 @@ } @if(commitId.isDefined){
    - View file @@ @commitId.get.substring(0, 10) + View file @@ @commitId.get.substring(0, 10)
    } @@ -35,9 +36,9 @@ } - - - + + + - - - - - + + + + + + + + + + +
    @@ -37,8 +40,8 @@
    + \ No newline at end of file diff --git a/src/main/twirl/newrepo.scala.html b/src/main/twirl/newrepo.scala.html index 13fbf14d4..ada471511 100644 --- a/src/main/twirl/newrepo.scala.html +++ b/src/main/twirl/newrepo.scala.html @@ -12,7 +12,7 @@
    - +
    } \ No newline at end of file diff --git a/src/main/twirl/preview.scala.html b/src/main/twirl/preview.scala.html index 40b6f1b2d..642c3bc57 100644 --- a/src/main/twirl/preview.scala.html +++ b/src/main/twirl/preview.scala.html @@ -1,13 +1,16 @@ @(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean, style: String = "", placeholder: String = "Leave a comment")(implicit context: app.Context) @import context._ +@import view.helpers._
    @@ -20,13 +23,13 @@
    - - + + - - } diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html index 3971711dc..f3ad9c7c6 100644 --- a/src/main/twirl/repo/commit.scala.html +++ b/src/main/twirl/repo/commit.scala.html @@ -1,6 +1,6 @@ @(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.helpers._ @import util.Implicits._ @import org.eclipse.jgit.diff.DiffEntry.ChangeType @html.main(commit.shortMessage){ @@ -10,26 +10,26 @@
    - Browse code + Browse code
    -
    @helpers.link(commit.summary, repository)
    +
    @link(commit.summary, repository)
    @if(commit.description.isDefined){ - 
    @helpers.link(commit.description.get, repository)
    + 
    @link(commit.description.get, repository)
    }
    @if(branches.nonEmpty){ - + @branches.zipWithIndex.map { case (branch, i) => - @branch + @branch } } @if(tags.nonEmpty){ - + @tags.zipWithIndex.map { case (tag, i) => - @tag + @tag } } @@ -38,7 +38,7 @@ - @commit.committer @helpers.datetime(commit.time) + @commit.committer @datetime(commit.time)
    @if(commit.parents.size == 0){ @@ -46,7 +46,7 @@ } @if(commit.parents.size == 1){ 1 parent - @commit.parents(0).substring(0, 7) + @commit.parents(0).substring(0, 7) } commit @commit.id
    @@ -54,7 +54,7 @@
    @commit.parents.size parents @commit.parents.map { parent => - @parent.substring(0, 7) + @parent.substring(0, 7) }.mkHtml(" + ")
    @@ -78,16 +78,16 @@ 0){ class="border"}> @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){ - @diff.oldPath -> @diff.newPath + @diff.oldPath -> @diff.newPath } @if(diff.changeType == ChangeType.ADD){ - @diff.newPath + @diff.newPath } @if(diff.changeType == ChangeType.MODIFY){ - @diff.newPath + @diff.newPath } @if(diff.changeType == ChangeType.DELETE){ - @diff.oldPath + @diff.oldPath } diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html index 5473efda4..cdaa439c2 100644 --- a/src/main/twirl/repo/commits.scala.html +++ b/src/main/twirl/repo/commits.scala.html @@ -1,51 +1,50 @@ @(pathList: List[String], branch: String, repository: service.RepositoryService.RepositoryInfo, commits: Seq[Seq[util.JGitUtil.CommitInfo]], page: Int, hasNext: Boolean)(implicit context: app.Context) @import context._ -@import view.helpers +@import view.helpers._ @html.main(repository.owner+"/"+repository.name) { @html.header("code", repository) @navtab(branch, repository, if(pathList.isEmpty) "commits" else "files")
    @if(pathList.isEmpty){ - @repository.name / Commit History + @repository.name / Commit History } @if(pathList.nonEmpty){ History for - @repository.name / + @repository.name / @pathList.zipWithIndex.map { case (section, i) => @if(i == pathList.length - 1){ @section } else { - @section / + @section / } } }
    - - @commits.map { date => + @commits.map { day => - + - @date.map { commit => + @day.map { commit => diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 2076bedaf..68769897f 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -1,35 +1,35 @@ @(branch: String, repository: service.RepositoryService.RepositoryInfo, pathList: List[String], latestCommit: util.JGitUtil.CommitInfo, files: List[util.JGitUtil.FileInfo], readme: Option[String])(implicit context: app.Context) @import context._ -@import view.helpers +@import view.helpers._ @html.main(repository.owner + "/" + repository.name) { @html.header("code", repository) @navtab(branch, repository, "files")
    - @repository.name / + @repository.name / @pathList.zipWithIndex.map { case (section, i) => - @section / + @section / }
    @helpers.date(date.head.time)@date(day.head.time)
    - @helpers.link(commit.summary, repository) + @link(commit.summary, repository) @if(commit.description.isDefined){ ... }
    @if(commit.description.isDefined){ - + }
    - @commit.committer - @helpers.datetime(commit.time) + @commit.committer + @datetime(commit.time)
    - @commit.id.substring(0, 10)
    - Browse code + @commit.id.substring(0, 10)
    + Browse code
    @@ -37,7 +37,7 @@ @if(pathList.size > 0){ - + @@ -46,20 +46,20 @@ - - + + }
    - @helpers.link(latestCommit.summary, repository) + @link(latestCommit.summary, repository) @if(latestCommit.description.isDefined){ ... } @if(latestCommit.description.isDefined){ - + }
    ....
    @if(file.isDirectory){ - + } else { - + } @if(file.isDirectory){ - @file.name + @file.name } else { - @file.name + @file.name } @helpers.datetime(file.time)@helpers.link(file.message, repository) [@file.committer]@datetime(file.time)@link(file.message, repository) [@file.committer]
    @@ -68,7 +68,7 @@ @readme.map { content =>
    README.md
    -
    @helpers.markdown(content, repository, false, false, false)
    +
    @markdown(content, repository, false, false, false)
    } } \ No newline at end of file diff --git a/src/main/twirl/repo/navtab.scala.html b/src/main/twirl/repo/navtab.scala.html index 2fb7d6b10..853a6f276 100644 --- a/src/main/twirl/repo/navtab.scala.html +++ b/src/main/twirl/repo/navtab.scala.html @@ -1,5 +1,6 @@ @(id: String, repository: service.RepositoryService.RepositoryInfo, active: String)(implicit context: app.Context) @import context._ +@import view.helpers._
    • @@ -13,14 +14,14 @@
      • - Files - Commits - Tags@if(repository.tags.length > 0){ @repository.tags.length} + Files + Commits + Tags@if(repository.tags.length > 0){ @repository.tags.length}
    • HTTP diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html index 86484a1aa..952e6b19e 100644 --- a/src/main/twirl/repo/tags.scala.html +++ b/src/main/twirl/repo/tags.scala.html @@ -1,6 +1,6 @@ @(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ -@import view.helpers +@import view.helpers._ @html.main(repository.owner + "/" + repository.name) { @html.header("code", repository) @navtab("master", repository, "tags") @* TODO DON'T display branch pulldown *@ @@ -14,10 +14,10 @@ @repository.tags.map { tag => - @tag.name - @helpers.datetime(tag.time) - @tag.id.substring(0, 10) - ZIP + @tag.name + @datetime(tag.time) + @tag.id.substring(0, 10) + ZIP } diff --git a/src/main/twirl/settings/collaborators.scala.html b/src/main/twirl/settings/collaborators.scala.html index c7aef83f9..4b7cf7c7b 100644 --- a/src/main/twirl/settings/collaborators.scala.html +++ b/src/main/twirl/settings/collaborators.scala.html @@ -1,5 +1,6 @@ @(collaborators: List[String], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ +@import view.helpers._ @html.main("Settings"){ @html.header("settings", repository) @menu("collaborators", repository){ @@ -7,12 +8,12 @@ -
      +
      @@ -24,7 +25,7 @@ diff --git a/src/main/twirl/wiki/wikicompare.scala.html b/src/main/twirl/wiki/wikicompare.scala.html index 7a3da8aa5..f6b29fba0 100644 --- a/src/main/twirl/wiki/wikicompare.scala.html +++ b/src/main/twirl/wiki/wikicompare.scala.html @@ -1,6 +1,6 @@ @(pageName: Option[String], diffs: Seq[util.JGitUtil.DiffInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) -@import view.helpers @import context._ +@import view.helpers._ @import org.eclipse.jgit.diff.DiffEntry.ChangeType @html.main("Compare Revisions - " + repository.owner + "/" + repository.name){ @html.header("wiki", repository) @@ -12,10 +12,10 @@
    • @if(pageName.isDefined){ - View Page - Back to Page History + View Page + Back to Page History } else { - Back to Wiki History + Back to Wiki History }
      • diff --git a/src/main/twirl/wiki/wikiedit.scala.html b/src/main/twirl/wiki/wikiedit.scala.html index 7a987b627..d6b657a07 100644 --- a/src/main/twirl/wiki/wikiedit.scala.html +++ b/src/main/twirl/wiki/wikiedit.scala.html @@ -1,6 +1,6 @@ @(pageName: String, page: Option[service.WikiService.WikiPageInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) -@import view.helpers @import context._ +@import view.helpers._ @html.main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){ @html.header("wiki", repository) @wikitab("", repository) @@ -11,20 +11,20 @@
    • @if(pageName != ""){ - View Page - Delete Page - Page History + View Page + Delete Page + Page History }
    - + @html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;", "") - + }