femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

highlight user details link (#26998) (#27376)

Browse source 
Backport #26998 by @denyskon

This PR adds a separated column in the users table for operations. The
username link now redirects back to user page.


![grafik](https://github.com/go-gitea/gitea/assets/47871822/df8c8b30-3da6-443c-ae0f-6e3cac7dd9bb)

Resolves
https://github.com/go-gitea/gitea/pull/26713#pullrequestreview-1603001285

Co-authored-by: silverwind <me@silverwind.io>

Co-authored-by: Denys Konovalov <kontakt@denyskon.de>
Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
Giteabot 2023-10-01 18:23:42 +08:00 committed by GitHub
parent e9340ce9bc
commit eea79ce586
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
templates/admin/org/list.tmpl
View file

@ -25,7 +25,7 @@
{{ctx.Locale.Tr "admin.users.created"}} {{ctx.Locale.Tr "admin.users.created"}}
{{SortArrow "recentupdate" "leastupdate" $.SortType false}} {{SortArrow "recentupdate" "leastupdate" $.SortType false}}
</th> </th>
<th>{{ctx.Locale.Tr "admin.users.edit"}}</th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -45,7 +45,7 @@
<td>{{.NumMembers}}</td> <td>{{.NumMembers}}</td>
<td>{{.NumRepos}}</td> <td>{{.NumRepos}}</td>
<td>{{DateTime "short" .CreatedUnix}}</td> <td>{{DateTime "short" .CreatedUnix}}</td>
<td><a href="{{.OrganisationLink}}/settings">{{svg "octicon-pencil"}}</a></td> <td><a href="{{.OrganisationLink}}/settings" data-tooltip-content="{{ctx.Locale.Tr "edit"}}">{{svg "octicon-pencil"}}</a></td>
</tr> </tr>
{{end}} {{end}}
</tbody> </tbody>

9
templates/admin/user/list.tmpl
View file

@ -77,6 +77,7 @@
{{ctx.Locale.Tr "admin.users.last_login"}} {{ctx.Locale.Tr "admin.users.last_login"}}
{{SortArrow "lastlogin" "reverselastlogin" $.SortType false}} {{SortArrow "lastlogin" "reverselastlogin" $.SortType false}}
</th> </th>
<th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -84,7 +85,7 @@
<tr> <tr>
<td>{{.ID}}</td> <td>{{.ID}}</td>
<td> <td>
<a href="{{$.Link}}/{{.ID}}">{{.Name}}</a> <a href="{{.HomeLink}}">{{.Name}}</a>
{{if .IsAdmin}} {{if .IsAdmin}}
<span class="ui mini label">{{ctx.Locale.Tr "admin.users.admin"}}</span> <span class="ui mini label">{{ctx.Locale.Tr "admin.users.admin"}}</span>
{{else if eq 2 .Type}}{{/* Reserved user */}} {{else if eq 2 .Type}}{{/* Reserved user */}}
@ -105,6 +106,12 @@
{{else}} {{else}}
<td><span>{{ctx.Locale.Tr "admin.users.never_login"}}</span></td> <td><span>{{ctx.Locale.Tr "admin.users.never_login"}}</span></td>
{{end}} {{end}}
<td>
<div class="gt-df gt-gap-3">
<a href="{{$.Link}}/{{.ID}}" data-tooltip-content="{{ctx.Locale.Tr "admin.users.details"}}">{{svg "octicon-person"}}</a>
<a href="{{$.Link}}/{{.ID}}/edit" data-tooltip-content="{{ctx.Locale.Tr "edit"}}">{{svg "octicon-pencil"}}</a>
</div>
</td>
</tr> </tr>
{{end}} {{end}}
</tbody> </tbody>