Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

highlight user details link #26998

Merged
merged 12 commits into from
Oct 1, 2023
Merged

highlight user details link #26998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
89dd948
add tooltip to user details link
denyskon Sep 10, 2023
cc7bf1b
Merge branch 'main' into fix/user-details-link
denyskon Sep 21, 2023
fbc0e1a
switch to icons
denyskon Sep 21, 2023
b83082c
fix template
denyskon Sep 21, 2023
f539099
Merge branch 'main' into fix/user-details-link
denyskon Sep 21, 2023
a71fde0
Merge branch 'main' into fix/user-details-link
denyskon Sep 22, 2023
a8c9b63
Merge branch 'main' into fix/user-details-link
denyskon Sep 29, 2023
e90ee51
Remove home icon, add edit link and column label
silverwind Sep 29, 2023
a107e65
change actions to operations
denyskon Sep 29, 2023
59683b9
remove header title
denyskon Sep 30, 2023
dafb239
Merge remote-tracking branch 'upstream/main' into fix/user-details-link
denyskon Sep 30, 2023
266ccfd
Merge branch 'main' into fix/user-details-link
GiteaBot Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/admin/org/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
9 changes: 8 additions & 1 deletion templates/admin/user/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,15 @@
{{ctx.Locale.Tr "admin.users.last_login"}}
{{SortArrow "lastlogin" "reverselastlogin" $.SortType false}}
</th>
<th></th>
</tr>
</thead>
<tbody>
{{range .Users}}
<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 */}}
Expand All @@ -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>
lunny marked this conversation as resolved.
Show resolved Hide resolved
<a href="{{$.Link}}/{{.ID}}/edit" data-tooltip-content="{{ctx.Locale.Tr "edit"}}">{{svg "octicon-pencil"}}</a>
lunny marked this conversation as resolved.
Show resolved Hide resolved
</div>
</td>
</tr>
{{end}}
</tbody>
Expand Down