sascha
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bcfd01dea7 into 01351cc6c7

silverwind 2025-12-11 01:55:01 +07:00 committed by GitHub
parent 01351cc6c7 bcfd01dea7
commit 0675d87761
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 76 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
templates/repo/commit_author.tmpl
Unescape Escape View File

@ -0,0 +1,56 @@
{{/* Template Attributes:
* User: The user associated with the commit, if any
* Commit: The commit
* Author: The author, currently only the commit page passes this
* AvatarSize: Avatar size in pixels
* AuthorBold: Whether to render the autor as bold text
* IsSigned: Whether the user is currently signed in
*/}}
<div class="flex-text-inline{{if .AuthorBold}} tw-font-semibold{{end}}">
{{if .User}}
{{ctx.AvatarUtils.Avatar .User .AvatarSize}}
{{$username := ""}}
{{if and .User.FullName DefaultShowFullName}}
{{$username = .User.FullName}}
{{else if .User.Name}}
{{$username = .User.Name}}
{{end}}
<a class="muted author-wrapper" href="{{.User.HomeLink}}" data-tooltip-content="{{$username}}">
{{$username}}
</a>
{{else if .Author}}
{{$username := ""}}
{{if and .Author.FullName DefaultShowFullName}}
{{$username = .Author.FullName}}
{{else if .Author.Name}}
{{$username = .Author.Name}}
{{else if .Commit.Author.Name}}
{{$username = .Commit.Author.Name}}
{{end}}
{{ctx.AvatarUtils.AvatarByEmail .Author.Email $username .AvatarSize}}
<span{{if .IsSigned}} title="{{.Author.Email}}"{{end}}>
{{if .Author.HomeLink}}
<a class="muted author-wrapper" href="{{.Author.HomeLink}}">
{{$username}}
</a>
{{else}}
{{$username}}
{{end}}
</span>
{{else}}
{{$username := ""}}
{{if .Commit.Author.Name}}
{{$username = .Commit.Author.Name}}
{{else}}
{{$username = .Author.Name}}
{{end}}
{{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email $username .AvatarSize}}
<span{{if .IsSigned}} title="{{.Commit.Author.Email}}"{{end}}>
{{if .Commit.Author.Name}}
{{.Commit.Author.Name}}
{{else}}
{{.Author.Name}}
{{end}}
</span>
{{end}}
</div>

20
templates/repo/commit_page.tmpl
Unescape Escape View File

@ -128,19 +128,13 @@
</div> </div>
<div class="ui bottom attached segment flex-text-block tw-flex-wrap"> <div class="ui bottom attached segment flex-text-block tw-flex-wrap">
<div class="flex-text-inline"> {{template "repo/commit_author" (dict
{{if .Author}} "Commit" .Commit
{{ctx.AvatarUtils.Avatar .Author 20}} "Author" .Author
{{if .Author.FullName}} "AvatarSize" 20
<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a> "AuthorBold" true
{{else}} "IsSigned" $.IsSigned
<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a> )}}
{{end}}
{{else}}
{{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 20}}
<strong>{{.Commit.Author.Name}}</strong>
{{end}}
</div>
<span class="text grey">{{DateUtils.TimeSince .Commit.Author.When}}</span> <span class="text grey">{{DateUtils.TimeSince .Commit.Author.When}}</span>

16
templates/repo/commits_list.tmpl
Unescape Escape View File

@ -15,16 +15,12 @@
<tr> <tr>
<td class="author"> <td class="author">
<div class="tw-flex"> <div class="tw-flex">
{{$userName := .Author.Name}} {{template "repo/commit_author" (dict
{{if .User}} "Commit" .
{{if and .User.FullName DefaultShowFullName}} "User" .User
{{$userName = .User.FullName}} "AvatarSize" 28
{{end}} "IsSigned" $.IsSigned
{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}<a class="muted author-wrapper" href="{{.User.HomeLink}}">{{$userName}}</a> )}}
{{else}}
{{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 28 "tw-mr-2"}}
<span class="author-wrapper">{{$userName}}</span>
{{end}}
</div> </div>
</td> </td>
<td class="sha"> <td class="sha">

21
templates/repo/latest_commit.tmpl
Unescape Escape View File

@ -2,20 +2,13 @@
{{if not .LatestCommit}} {{if not .LatestCommit}}
… …
{{else}} {{else}}
{{if .LatestCommitUser}} {{template "repo/commit_author" (dict
{{ctx.AvatarUtils.Avatar .LatestCommitUser 24}} "User" .LatestCommitUser
{{if and .LatestCommitUser.FullName DefaultShowFullName}} "Commit" .LatestCommit
<a class="muted author-wrapper" title="{{.LatestCommitUser.FullName}}" href="{{.LatestCommitUser.HomeLink}}"><strong>{{.LatestCommitUser.FullName}}</strong></a> "AvatarSize" 24
{{else}} "AuthorBold" true
<a class="muted author-wrapper" title="{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}" href="{{.LatestCommitUser.HomeLink}}"><strong>{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}</strong></a> "IsSigned" $.IsSigned
{{end}} )}}
{{else}}
{{if .LatestCommit.Author}}
{{ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24}}
<span class="author-wrapper" title="{{.LatestCommit.Author.Name}}"><strong>{{.LatestCommit.Author.Name}}</strong></span>
{{end}}
{{end}}
{{template "repo/commit_sign_badge" dict "Commit" .LatestCommit "CommitBaseLink" (print .RepoLink "/commit") "CommitSignVerification" .LatestCommitVerification}} {{template "repo/commit_sign_badge" dict "Commit" .LatestCommit "CommitBaseLink" (print .RepoLink "/commit") "CommitSignVerification" .LatestCommitVerification}}
{{template "repo/commit_statuses" dict "Status" .LatestCommitStatus "Statuses" .LatestCommitStatuses}} {{template "repo/commit_statuses" dict "Status" .LatestCommitStatus "Statuses" .LatestCommitStatuses}}