Skip to content

Commit 4adee80

Browse files
authored
Fix team member avatar size and add tooltip (#37253)
1. Make team member avatar size=32 2. Add tooltip to the avatar
1 parent 4de12ba commit 4adee80

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

templates/org/home.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
{{$isMember := .IsOrganizationMember}}
6464
{{range .Members}}
6565
{{if or $isMember (call $.IsPublicMember .ID)}}
66-
<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">{{ctx.AvatarUtils.Avatar . 48}}</a>
66+
{{template "shared/user/avatarlink" dict "user" . "size" 32 "tooltip" true}}
6767
{{end}}
6868
{{end}}
6969
</div>

templates/org/team/sidebar.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<div class="ui right">
55
{{if .Team.IsMember ctx $.SignedUser.ID}}
66
<form>
7-
<button class="ui red tiny button delete-button" data-modal-id="leave-team-sidebar"
7+
<button class="ui red mini compact button delete-button" data-modal-id="leave-team-sidebar"
88
data-url="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/action/leave" data-datauid="{{$.SignedUser.ID}}"
99
data-name="{{.Team.Name}}">{{ctx.Locale.Tr "org.teams.leave"}}</button>
1010
</form>
1111
{{else if .IsOrganizationOwner}}
1212
<form method="post" action="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/action/join">
1313
<input type="hidden" name="page" value="team">
14-
<button type="submit" class="ui primary tiny button" name="uid" value="{{$.SignedUser.ID}}">{{ctx.Locale.Tr "org.teams.join"}}</button>
14+
<button type="submit" class="ui primary mini compact button" name="uid" value="{{$.SignedUser.ID}}">{{ctx.Locale.Tr "org.teams.join"}}</button>
1515
</form>
1616
{{end}}
1717
</div>

templates/org/team/teams.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
<div class="ui top attached header">
1818
<a class="tw-text-text" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.Name}}</strong></a>
1919
<div class="ui right">
20-
<a class="ui primary tiny button" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{ctx.Locale.Tr "view"}}</a>
20+
<a class="ui primary mini compact button" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{ctx.Locale.Tr "view"}}</a>
2121
{{if .IsMember ctx $.SignedUser.ID}}
2222
<form>
23-
<button class="ui red tiny button delete-button" data-modal-id="leave-team"
23+
<button class="ui red mini compact button delete-button" data-modal-id="leave-team"
2424
data-url="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/leave" data-datauid="{{$.SignedUser.ID}}"
2525
data-name="{{.Name}}">{{ctx.Locale.Tr "org.teams.leave"}}</button>
2626
</form>
2727
{{else if $.IsOrganizationOwner}}
2828
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/join">
29-
<button type="submit" class="ui primary tiny button" name="uid" value="{{$.SignedUser.ID}}">{{ctx.Locale.Tr "org.teams.join"}}</button>
29+
<button type="submit" class="ui primary mini compact button" name="uid" value="{{$.SignedUser.ID}}">{{ctx.Locale.Tr "org.teams.join"}}</button>
3030
</form>
3131
{{end}}
3232
</div>
3333
</div>
3434
<div class="ui attached segment members">
3535
{{range .Members}}
36-
{{template "shared/user/avatarlink" dict "user" .}}
36+
{{template "shared/user/avatarlink" dict "user" . "size" 32 "tooltip" true}}
3737
{{end}}
3838
</div>
3939
<div class="ui bottom attached header">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<a class="avatar-with-link" {{if gt .user.ID 0}}href="{{.user.HomeLink}}"{{end}}>{{ctx.AvatarUtils.Avatar .user (or .size 20)}}</a>
1+
<a class="avatar-with-link" {{if .tooltip}}data-tooltip-content="{{.user.Name}}{{if .user.FullName}} ({{.user.FullName}}){{end}}"{{end}} {{if gt .user.ID 0}}href="{{.user.HomeLink}}"{{end}}>{{ctx.AvatarUtils.Avatar .user (or .size 20)}}</a>

0 commit comments

Comments
 (0)