diff options
| author | Sorien <Sorien@users.noreply.github.com> | 2020-04-19 02:15:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 03:15:07 +0300 |
| commit | 0ef11ff2c909d1775642fa03b09f1342fcaaeb69 (patch) | |
| tree | 1db096db0dbc59b3b4f31b55420677b92a3d634d /templates/repo/issue/view_content.tmpl | |
| parent | b57a735e7739550ed4677af71c5eb0a8032a69f3 (diff) | |
| download | gitea-0ef11ff2c909d1775642fa03b09f1342fcaaeb69.tar.gz gitea-0ef11ff2c909d1775642fa03b09f1342fcaaeb69.zip | |
consolidate author name across timeline (#11053)
* consolidate author name across timeline
* Sync with master
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'templates/repo/issue/view_content.tmpl')
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index bf06a12d6f..5f0559c068 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -22,9 +22,21 @@ <div class="content"> <div class="ui top attached header"> {{if .Issue.OriginalAuthor }} - <span class="text black"><i class="fa {{MigrationIcon .Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .Issue.OriginalAuthor }}</span><span class="text grey"> {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}</span> <span class="text migrate">{{if .Repository.OriginalURL}} ({{$.i18n.Tr "repo.migrated_from" .Repository.OriginalURL .Repository.GetOriginalURLHostname | Safe }}){{end}}</span> + <span class="text black"> + <i class="fa {{MigrationIcon .Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> + {{ .Issue.OriginalAuthor }} + </span> + <span class="text grey"> + {{ .i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe }} + </span> + <span class="text migrate"> + {{if .Repository.OriginalURL}} ({{$.i18n.Tr "repo.migrated_from" .Repository.OriginalURL .Repository.GetOriginalURLHostname | Safe }}){{end}} + </span> {{else}} - <span class="text grey"><a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a> {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}</span> + <span class="text grey"> + <a class="author"{{if gt .Issue.Poster.ID 0}} href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a> + {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} + </span> {{end}} {{if not $.Repository.IsArchived}} <div class="ui right actions"> |