diff options
author | Denys Konovalov <kontakt@denyskon.de> | 2023-08-31 11:21:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-31 11:21:18 +0200 |
commit | 5b5bb8d3546e6504b689b01d3ac4897dda3aee3d (patch) | |
tree | 5ab8490deabf779acbe4aadcd888b9cf0816c540 /templates/explore | |
parent | 3d109861ddf95846905143b4cf39129bf253161e (diff) | |
download | gitea-5b5bb8d3546e6504b689b01d3ac4897dda3aee3d.tar.gz gitea-5b5bb8d3546e6504b689b01d3ac4897dda3aee3d.zip |
User details page (#26713)
This PR implements a proposal to clean up the admin users table by
moving some information out to a separate user details page (which also
displays some additional information).
Other changes:
- move edit user page from `/admin/users/{id}` to
`/admin/users/{id}/edit` -> `/admin/users/{id}` now shows the user
details page
- show if user is instance administrator as a label instead of a
separate column
- separate explore users template into a page- and a shared one, to make
it possible to use it on the user details page
- fix issue where there was no margin between alert message and
following content on admin pages
<details>
<summary>Screenshots</summary>
![grafik](https://github.com/go-gitea/gitea/assets/47871822/1ad57ac9-f20a-45a4-8477-ffe572a41e9e)
![grafik](https://github.com/go-gitea/gitea/assets/47871822/25786ecd-cb9d-4c92-90f4-e7f4292c073b)
</details>
Partially resolves #25939
---------
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'templates/explore')
-rw-r--r-- | templates/explore/user_list.tmpl | 31 | ||||
-rw-r--r-- | templates/explore/users.tmpl | 32 |
2 files changed, 32 insertions, 31 deletions
diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl new file mode 100644 index 0000000000..cf6a2933b0 --- /dev/null +++ b/templates/explore/user_list.tmpl @@ -0,0 +1,31 @@ +<div class="flex-list"> + {{range .Users}} + <div class="flex-item flex-item-center"> + <div class="flex-item-leading"> + {{ctx.AvatarUtils.Avatar . 48}} + </div> + <div class="flex-item-main"> + <div class="flex-item-title"> + {{template "shared/user/name" .}} + {{if .Visibility.IsPrivate}} + <span class="ui basic tiny label">{{ctx.Locale.Tr "repo.desc.private"}}</span> + {{end}} + </div> + <div class="flex-item-body"> + {{if .Location}} + <span class="flex-text-inline">{{svg "octicon-location"}}{{.Location}}</span> + {{end}} + {{if and .Email (or (and $.ShowUserEmail $.IsSigned (not .KeepEmailPrivate)) $.PageIsAdminUsers)}} + <span class="flex-text-inline"> + {{svg "octicon-mail"}} + <a href="mailto:{{.Email}}">{{.Email}}</a> + </span> + {{end}} + <span class="flex-text-inline">{{svg "octicon-calendar"}}{{ctx.Locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}}</span> + </div> + </div> + </div> + {{else}} + <div class="flex-item">{{ctx.Locale.Tr "explore.user_no_results"}}</div> + {{end}} +</div> diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 1280f4add6..7e15ae3d47 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -4,37 +4,7 @@ <div class="ui container"> {{template "explore/search" .}} - <div class="flex-list"> - {{range .Users}} - <div class="flex-item flex-item-center"> - <div class="flex-item-leading"> - {{ctx.AvatarUtils.Avatar . 48}} - </div> - <div class="flex-item-main"> - <div class="flex-item-title"> - {{template "shared/user/name" .}} - {{if .Visibility.IsPrivate}} - <span class="ui basic tiny label">{{$.locale.Tr "repo.desc.private"}}</span> - {{end}} - </div> - <div class="flex-item-body"> - {{if .Location}} - <span class="flex-text-inline">{{svg "octicon-location"}}{{.Location}}</span> - {{end}} - {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} - <span class="flex-text-inline"> - {{svg "octicon-mail"}} - <a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a> - </span> - {{end}} - <span class="flex-text-inline">{{svg "octicon-calendar"}}{{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}}</span> - </div> - </div> - </div> - {{else}} - <div class="flex-item">{{$.locale.Tr "explore.user_no_results"}}</div> - {{end}} - </div> + {{template "explore/user_list" .}} {{template "base/paginate" .}} </div> |