From 4ab597f479265c3b66c94d40ad130ced5ae8b91f Mon Sep 17 00:00:00 2001
From: Denys Konovalov <kontakt@denyskon.de>
Date: Sun, 1 Oct 2023 05:58:24 +0200
Subject: [PATCH] highlight user details link (#26998)
This PR adds a separated column in the users table for operations. The
username link now redirects back to user page.
Resolves
https://github.com/go-gitea/gitea/pull/26713#pullrequestreview-1603001285
Co-authored-by: silverwind <me@silverwind.io>
---
templates/admin/org/list.tmpl | 4 ++--
templates/admin/user/list.tmpl | 9 ++++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 1c041ca347..0d79456b47 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -25,7 +25,7 @@
{{ctx.Locale.Tr "admin.users.created"}}
{{SortArrow "recentupdate" "leastupdate" $.SortType false}}
</th>
- <th>{{ctx.Locale.Tr "admin.users.edit"}}</th>
+ <th></th>
</tr>
</thead>
<tbody>
@@ -45,7 +45,7 @@
<td>{{.NumMembers}}</td>
<td>{{.NumRepos}}</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>
{{end}}
</tbody>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index fba67fac15..46fd376dae 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -77,6 +77,7 @@
{{ctx.Locale.Tr "admin.users.last_login"}}
{{SortArrow "lastlogin" "reverselastlogin" $.SortType false}}
</th>
+ <th></th>
</tr>
</thead>
<tbody>
@@ -84,7 +85,7 @@
<tr>
<td>{{.ID}}</td>
<td>
- <a href="{{$.Link}}/{{.ID}}">{{.Name}}</a>
+ <a href="{{.HomeLink}}">{{.Name}}</a>
{{if .IsAdmin}}
<span class="ui mini label">{{ctx.Locale.Tr "admin.users.admin"}}</span>
{{else if eq 2 .Type}}{{/* Reserved user */}}
@@ -105,6 +106,12 @@
{{else}}
<td><span>{{ctx.Locale.Tr "admin.users.never_login"}}</span></td>
{{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>
{{end}}
</tbody>