diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index d68dc53..5454f94 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -65,7 +65,7 @@ repo.html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository, logs.splitWith{ (commit1, commit2) => view.helpers.date(commit1.time) == view.helpers.date(commit2.time) - }, page, hasNext) + }, page, hasNext, loadSystemSettings()) case Left(_) => NotFound } } @@ -118,7 +118,7 @@ JGitUtil.ContentInfo(viewer, None) } - repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit)) + repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit), loadSystemSettings()) } } getOrElse NotFound } @@ -136,7 +136,7 @@ repo.html.commit(id, new JGitUtil.CommitInfo(revCommit), JGitUtil.getBranchesOfCommit(git, revCommit.getName), JGitUtil.getTagsOfCommit(git, revCommit.getName), - repository, diffs, oldCommitId) + repository, diffs, oldCommitId, loadSystemSettings()) } } } @@ -152,7 +152,8 @@ val revCommit = git.log.add(git.getRepository.resolve(branchName)).setMaxCount(1).call.iterator.next (branchName, revCommit.getCommitterIdent.getWhen) } - repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository) + repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount), + repository, loadSystemSettings()) } }) @@ -175,7 +176,7 @@ * Displays tags. */ get("/:owner/:repository/tags")(referrersOnly { - repo.html.tags(_) + repo.html.tags(_, loadSystemSettings()) }) /** @@ -284,7 +285,7 @@ repo.html.files(revision, repository, if(path == ".") Nil else path.split("/").toList, // current path new JGitUtil.CommitInfo(revCommit), // latest commit - files, readme) + files, readme, loadSystemSettings()) } } getOrElse NotFound } diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index d7591ba..39b1566 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -6,7 +6,7 @@
Fork - @repository.forkedCount + @repository.forkedCount
} diff --git a/src/main/twirl/helper/copy.scala.html b/src/main/twirl/helper/copy.scala.html index 1cba6e6..a4f8896 100644 --- a/src/main/twirl/helper/copy.scala.html +++ b/src/main/twirl/helper/copy.scala.html @@ -1,5 +1,5 @@ -@(id: String, value: String)(html: Html) -
+@(id: String, value: String, prepend: Boolean = false)(html: Html) +
@html
diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index 25a9910..09c1772 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -2,12 +2,13 @@ repository: service.RepositoryService.RepositoryInfo, pathList: List[String], content: util.JGitUtil.ContentInfo, - latestCommit: util.JGitUtil.CommitInfo)(implicit context: app.Context) + latestCommit: util.JGitUtil.CommitInfo, + settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.header("code", repository) - @tab(branch, repository, "files") + @tab(branch, repository, "files", settings)
@repository.name / @pathList.zipWithIndex.map { case (section, i) => diff --git a/src/main/twirl/repo/branches.scala.html b/src/main/twirl/repo/branches.scala.html index bc26459..ffbebae 100644 --- a/src/main/twirl/repo/branches.scala.html +++ b/src/main/twirl/repo/branches.scala.html @@ -1,11 +1,12 @@ @(branchInfo: Seq[(String, java.util.Date)], hasWritePermission: Boolean, - repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) + repository: service.RepositoryService.RepositoryInfo, + settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.header("code", repository) - @tab(repository.repository.defaultBranch, repository, "branches", true) + @tab(repository.repository.defaultBranch, repository, "branches", settings, true)

Branches

diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html index c3baedc..52d9e48 100644 --- a/src/main/twirl/repo/commit.scala.html +++ b/src/main/twirl/repo/commit.scala.html @@ -4,13 +4,14 @@ tags: List[String], repository: service.RepositoryService.RepositoryInfo, diffs: Seq[util.JGitUtil.DiffInfo], - oldCommitId: Option[String])(implicit context: app.Context) + oldCommitId: Option[String], + settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context) @import context._ @import view.helpers._ @import util.Implicits._ @html.main(commit.shortMessage, Some(repository)){ @html.header("code", repository) - @tab(commitId, repository, "commits") + @tab(commitId, repository, "commits", settings)
diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html index e1b22d1..d2e7d46 100644 --- a/src/main/twirl/repo/commits.scala.html +++ b/src/main/twirl/repo/commits.scala.html @@ -3,12 +3,13 @@ repository: service.RepositoryService.RepositoryInfo, commits: Seq[Seq[util.JGitUtil.CommitInfo]], page: Int, - hasNext: Boolean)(implicit context: app.Context) + hasNext: Boolean, + settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.header("code", repository) - @tab(branch, repository, if(pathList.isEmpty) "commits" else "files") + @tab(branch, repository, if(pathList.isEmpty) "commits" else "files", settings)
@if(pathList.isEmpty){ @repository.name / Commit History diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 6b4739c..9a6a717 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -3,12 +3,13 @@ pathList: List[String], latestCommit: util.JGitUtil.CommitInfo, files: List[util.JGitUtil.FileInfo], - readme: Option[(util.JGitUtil.FileInfo, String)])(implicit context: app.Context) + readme: Option[(util.JGitUtil.FileInfo, String)], + settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.header("code", repository) - @tab(branch, repository, "files") + @tab(branch, repository, "files", settings)
@defining(repository.commitCount){ commitCount => diff --git a/src/main/twirl/repo/tab.scala.html b/src/main/twirl/repo/tab.scala.html index c245780..df47e8d 100644 --- a/src/main/twirl/repo/tab.scala.html +++ b/src/main/twirl/repo/tab.scala.html @@ -1,4 +1,5 @@ @(id: String, repository: service.RepositoryService.RepositoryInfo, active: String, + settings: service.SystemSettingsService.SystemSettings, hideBranchPulldown: Boolean = false)(implicit context: app.Context) @import context._ @import view.helpers._ @@ -22,8 +23,15 @@ Branches@if(repository.branchList.length > 0){ @repository.branchList.length} Tags@if(repository.tags.length > 0){ @repository.tags.length}
  • - @helper.html.copy("repository-url-copy", repository.url){ - + @helper.html.copy("repository-url-copy", repository.url, true){ + @if(settings.ssh){ +
    + +
    + } else { + HTTP + } + }
  • @@ -32,3 +40,18 @@
  • +@if(settings.ssh){ + +} \ No newline at end of file diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html index 2574f3e..97df400 100644 --- a/src/main/twirl/repo/tags.scala.html +++ b/src/main/twirl/repo/tags.scala.html @@ -1,9 +1,10 @@ -@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) +@(repository: service.RepositoryService.RepositoryInfo, + settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.header("code", repository) - @tab(repository.repository.defaultBranch, repository, "tags", true) + @tab(repository.repository.defaultBranch, repository, "tags", settings, true)

    Tags

    diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 01c96b4..b19a382 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -80,19 +80,13 @@ text-decoration: none; } -div.input-prepend span.add-on { +div.input-prepend span.count { background-color: white; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -/* -div.input-prepend span.add-on a { - color: #333; -} -*/ - /* ======================================================================== */ /* General Styles */ /* ======================================================================== */