forked from Shiloh/githaven
e3afe4a248
Per the discussion on #22054, the flow for adding a new team member to an org is not intuitive for new Gitea users. The ideal solution would be to add a new button on the Org > Members index view (see the screenshot mockup in the issue description). However, this would require a refactor of the UX for the flow. The current flow has an implicit context of which team within the org the new member is being added to ('Owners' by default). From the Members index, there is no implicit context; the flow would have to add a picker for which team the new member should be added to. So, as a stopgap, this change simply adds a button to the Teams index page that performs the same action as clicking on the title of the team (a behavior that is currently too obscure as indicated in the comments on the issue). This should reduce support burden and serve as a decent temporary measure until the Add Member flow is refactored. --------- Co-authored-by: tomholford <tomholford@users.noreply.github.com>
57 lines
2.2 KiB
Handlebars
57 lines
2.2 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content organization teams">
|
|
{{template "org/header" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
{{if .IsOrganizationOwner}}
|
|
<div class="text right">
|
|
<a class="ui primary button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{ctx.Locale.Tr "org.create_new_team"}}</a>
|
|
</div>
|
|
<div class="divider"></div>
|
|
{{end}}
|
|
|
|
<div class="ui two column stackable grid">
|
|
{{range .Teams}}
|
|
<div class="column">
|
|
<div class="ui top attached header">
|
|
<a class="text black" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.Name}}</strong></a>
|
|
<div class="ui right">
|
|
<a class="ui primary tiny button" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{ctx.Locale.Tr "view"}}</a>
|
|
{{if .IsMember ctx $.SignedUser.ID}}
|
|
<form>
|
|
<button class="ui red tiny button delete-button" data-modal-id="leave-team"
|
|
data-url="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/leave" data-datauid="{{$.SignedUser.ID}}"
|
|
data-name="{{.Name}}">{{ctx.Locale.Tr "org.teams.leave"}}</button>
|
|
</form>
|
|
{{else if $.IsOrganizationOwner}}
|
|
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/join">
|
|
{{$.CsrfTokenHtml}}
|
|
<button type="submit" class="ui primary small button" name="uid" value="{{$.SignedUser.ID}}">{{ctx.Locale.Tr "org.teams.join"}}</button>
|
|
</form>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
<div class="ui attached segment members">
|
|
{{range .Members}}
|
|
{{template "shared/user/avatarlink" dict "user" .}}
|
|
{{end}}
|
|
</div>
|
|
<div class="ui bottom attached header">
|
|
<p class="team-meta">{{.NumMembers}} {{ctx.Locale.Tr "org.lower_members"}} · {{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}}</p>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui g-modal-confirm delete modal" id="leave-team">
|
|
<div class="header">
|
|
{{ctx.Locale.Tr "org.teams.leave"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{ctx.Locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
{{template "base/footer" .}}
|