diff options
| author | Wim <wim@42.be> | 2019-05-08 10:41:35 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-05-08 11:41:35 +0300 |
| commit | 4508380cf7937aef0bf6f99fe3eefb6c530e38e3 (patch) | |
| tree | 28d832a36e5aced26dce671591c58a1b1a00f22e /templates/user/dashboard | |
| parent | a84f10ad1afb8b3dcfa75093891d85f6f163715e (diff) | |
| download | gitea-4508380cf7937aef0bf6f99fe3eefb6c530e38e3.tar.gz gitea-4508380cf7937aef0bf6f99fe3eefb6c530e38e3.zip | |
Show full name if DefaultShowFullName setting activated (#6710)
Adds a new key DEFAULT_SHOW_FULL_NAME (default false) to the [ui] section.
If enabled the full name will be shown (unless it's empty, then
the default username will be used)
Diffstat (limited to 'templates/user/dashboard')
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index ffc0db3317..9c404c9fde 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -8,7 +8,7 @@ <div class="{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}push news{{end}}"> <p> {{if gt .ActUser.ID 0}} - <a href="{{AppSubUrl}}/{{.GetActUserName}}" title="{{.GetActFullName}}">{{.ShortActUserName}}</a> + <a href="{{AppSubUrl}}/{{.GetActUserName}}" title="{{.GetDisplayNameTitle}}">{{.GetDisplayName}}</a> {{else}} {{.ShortActUserName}} {{end}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 3273319098..b69509d799 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -61,6 +61,7 @@ <div class="issue list"> {{range .Issues}} + {{ $timeStr:= TimeSinceUnix .CreatedUnix $.Lang }} <li class="item"> <div class="ui label">{{if not $.RepoID}}{{.Repo.FullName}}{{end}}#{{.Index}}</div> @@ -93,12 +94,12 @@ <p class="desc"> {{if gt .Poster.ID 0}} - {{$.i18n.Tr .GetLastEventLabel $timeStr .Poster.HomeLink .Poster.Name | Safe}} + {{$.i18n.Tr .GetLastEventLabel $timeStr .Poster.HomeLink (.Poster.GetDisplayName|Escape) | Safe}} {{else}} - {{$.i18n.Tr .GetLastEventLabelFake $timeStr .Poster.Name | Safe}} + {{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}} {{end}} {{if .Assignee}} - <a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center"> + <a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.GetDisplayName}}" data-variation="inverted" data-position="left center"> <img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}"> </a> {{end}} |