diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 600f8d608636b..781a9a605e2c7 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -880,6 +880,7 @@ visibility.private = Private visibility.private_tooltip = Visible only to organization members [repo] +user_committed_date = %s committed %s new_repo_helper = A repository contains all project files, including revision history. Already have it elsewhere? Migrate repository. owner = Owner owner_helper = Some organizations may not show up in the dropdown due to a maximum repository count limit. diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 36333c554079c..0a17549d27c54 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -1,87 +1,74 @@ -
{{.locale.Tr "repo.commits.author"}} | -SHA1 | - -{{.locale.Tr "repo.commits.date"}} | -|
---|---|---|---|
- {{$userName := .Author.Name}}
- {{if .User}}
- {{if .User.FullName}}
- {{$userName = .User.FullName}}
- {{end}}
- {{avatar $.Context .User 28 "gt-mr-2"}}{{$userName}}
+
+ {{$commitRepoLink := $.RepoLink}}{{if $.CommitRepoLink}}{{$commitRepoLink = $.CommitRepoLink}}{{end}}
+ {{range .Commits}}
+
+
+
+
+
+
+ {{if IsMultilineCommitMessage .Message}}
+
+ {{end}}
+ {{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses "root" $}}
+ {{if IsMultilineCommitMessage .Message}}
+ {{RenderCommitBody $.Context .Message $commitRepoLink $.Repository.ComposeMetas}}+ {{end}} +
+ {{if .User}}
+ {{avatar $.Context .User 16 "gt-mr-2"}}
+ {{else}}
+ {{avatarByEmail $.Context .Author.Email .Author.Name 16 "gt-mr-2"}}
+ {{end}}
+
+
+ {{$.locale.Tr "repo.user_committed_date"
+ (printf "%s" (.User.HomeLink | Escape) (.Author.Name | Escape))
+ (TimeSince .Committer.When $.locale) | Safe}}
+
+
+
+
+ {{$class := "ui sha label"}}
+ {{if .Signature}}
+ {{$class = (printf "%s%s" $class " isSigned")}}
+ {{if .Verification.Verified}}
+ {{if eq .Verification.TrustStatus "trusted"}}
+ {{$class = (printf "%s%s" $class " isVerified")}}
+ {{else if eq .Verification.TrustStatus "untrusted"}}
+ {{$class = (printf "%s%s" $class " isVerifiedUntrusted")}}
{{else}}
- {{avatarByEmail $.Context .Author.Email .Author.Name 28 "gt-mr-2"}}
- {{$userName}}
+ {{$class = (printf "%s%s" $class " isVerifiedUnmatched")}}
{{end}}
- |
- - - {{$class := "ui sha label"}} - {{if .Signature}} - {{$class = (printf "%s%s" $class " isSigned")}} - {{if .Verification.Verified}} - {{if eq .Verification.TrustStatus "trusted"}} - {{$class = (printf "%s%s" $class " isVerified")}} - {{else if eq .Verification.TrustStatus "untrusted"}} - {{$class = (printf "%s%s" $class " isVerifiedUntrusted")}} - {{else}} - {{$class = (printf "%s%s" $class " isVerifiedUnmatched")}} - {{end}} - {{else if .Verification.Warning}} - {{$class = (printf "%s%s" $class " isWarning")}} - {{end}} - {{end}} - {{if $.PageIsWiki}} - - {{else if $.Reponame}} - - {{else}} - - {{end}} - {{ShortSha .ID.String}} - {{if .Signature}} - {{template "repo/shabox_badge" dict "root" $ "verification" .Verification}} - {{end}} - {{if $.Reponame}} - - {{else}} - - {{end}} - | - - {{if .Committer}} -{{TimeSince .Committer.When $.locale}} | - {{else}} -{{TimeSince .Author.When $.locale}} | + {{else if .Verification.Warning}} + {{$class = (printf "%s%s" $class " isWarning")}} + {{end}} + {{end}} + {{if $.PageIsWiki}} + + {{else if $.Reponame}} + + {{else}} + + {{end}} + {{ShortSha .ID.String}} + {{if .Signature}} + {{template "repo/shabox_badge" dict "root" $ "verification" .Verification}} {{end}} -