diff options
Diffstat (limited to 'templates/repo/commit_page.tmpl')
| -rw-r--r-- | templates/repo/commit_page.tmpl | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index f884bee7be..dde87c08d1 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -31,7 +31,7 @@ </div> <div class="ui attached info segment {{$class}}"> <div class="ui stackable grid"> - <div class="ten wide column"> + <div class="nine wide column"> {{if .Author}} <img class="ui avatar image" src="{{.Author.RelAvatarLink}}" /> {{if .Author.FullName}} @@ -43,19 +43,22 @@ <img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" /> <strong>{{.Commit.Author.Name}}</strong> {{end}} + <span class="text grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span> {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} - <span> </span> - {{if ne .Verification.CommittingUser.ID 0}} - <img class="ui avatar image" src="{{.Verification.CommittingUser.RelAvatarLink}}" /> - <a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong> <{{.Commit.Committer.Email}}></a> - {{else}} - <img class="ui avatar image" src="{{AvatarLink .Commit.Committer.Email}}" /> - <strong>{{.Commit.Committer.Name}}</strong> - {{end}} + <div class="committed-by"> + <span class="text grey">{{svg "octicon-git-commit" 16}}{{.i18n.Tr "repo.diff.committed_by"}}</span> + {{if ne .Verification.CommittingUser.ID 0}} + <img class="ui avatar image" src="{{.Verification.CommittingUser.RelAvatarLink}}" /> + <a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong> <{{.Commit.Committer.Email}}></a> + {{else}} + <img class="ui avatar image" src="{{AvatarLink .Commit.Committer.Email}}" /> + <strong>{{.Commit.Committer.Name}}</strong> + {{end}} + </div> {{end}} - <span class="text grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span> + </div> - <div class="six wide right aligned column"> + <div class="seven wide right aligned column"> <div class="ui horizontal list"> {{if .Parents}} <div class="item"> |