diff options
author | KN4CK3R <admin@oldschoolhack.me> | 2022-10-19 14:40:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-19 14:40:28 +0200 |
commit | c3b2e44392e7f6c9a77a46664788c0bb9a6f33cb (patch) | |
tree | 6fe65807cd30770951ede4396a149ce03fb56b96 /templates | |
parent | 7d1aed83f4d0cdf096ec8758ff8a85ddccf1328d (diff) | |
download | gitea-c3b2e44392e7f6c9a77a46664788c0bb9a6f33cb.tar.gz gitea-c3b2e44392e7f6c9a77a46664788c0bb9a6f33cb.zip |
Add team member invite by email (#20307)
Allows to add (not registered) team members by email.
related #5353
Invite by mail:
![grafik](https://user-images.githubusercontent.com/1666336/178154779-adcc547f-c0b7-4a2a-a131-4e41a3d9d3ad.png)
Pending invitations:
![grafik](https://user-images.githubusercontent.com/1666336/178154882-9d739bb8-2b04-46c1-a025-c1f4be26af98.png)
Email:
![grafik](https://user-images.githubusercontent.com/1666336/178164716-f2f90893-7ba6-4a5e-a3db-42538a660258.png)
Join form:
![grafik](https://user-images.githubusercontent.com/1666336/178154840-aaab983a-d922-4414-b01a-9b1a19c5cef7.png)
Co-authored-by: Jack Hay <jjphay@gmail.com>
Diffstat (limited to 'templates')
-rw-r--r-- | templates/mail/team_invite.tmpl | 16 | ||||
-rw-r--r-- | templates/org/team/invite.tmpl | 23 | ||||
-rw-r--r-- | templates/org/team/members.tmpl | 17 |
3 files changed, 55 insertions, 1 deletions
diff --git a/templates/mail/team_invite.tmpl b/templates/mail/team_invite.tmpl new file mode 100644 index 0000000000..163c950e94 --- /dev/null +++ b/templates/mail/team_invite.tmpl @@ -0,0 +1,16 @@ +<!DOCTYPE html> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no"/> +</head> +{{$invite_url := printf "%sorg/invite/%s" AppUrl (QueryEscape .Invite.Token)}} +<body> + <p>{{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName) | Str2html}}</p> + <p>{{.locale.Tr "mail.team_invite.text_2"}}</p><p><a href="{{$invite_url}}">{{$invite_url}}</a></p> + <p>{{.locale.Tr "mail.link_not_working_do_paste"}}</p> + <p>{{.locale.Tr "mail.team_invite.text_3" .Invite.Email}}</p> + + <p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p> +</body> +</html> diff --git a/templates/org/team/invite.tmpl b/templates/org/team/invite.tmpl new file mode 100644 index 0000000000..a696d99498 --- /dev/null +++ b/templates/org/team/invite.tmpl @@ -0,0 +1,23 @@ +{{template "base/head" .}} +<div class="page-content organization invite"> + <div class="ui container"> + {{template "base/alert" .}} + <div class="ui centered card"> + <div class="image"> + {{avatar .Organization 140}} + </div> + <div class="content"> + <div class="header">{{.locale.Tr "org.teams.invite.title" .Team.Name .Organization.Name | Str2html}}</div> + <div class="meta">{{.locale.Tr "org.teams.invite.by" .Inviter.Name}}</div> + <div class="description">{{.locale.Tr "org.teams.invite.description"}}</div> + </div> + <div class="extra content"> + <form class="ui form" action="" method="post"> + {{.CsrfTokenHtml}} + <button class="fluid ui green button">{{.locale.Tr "org.teams.join"}}</button> + </form> + </div> + </div> + </div> +</div> +{{template "base/footer" .}} diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index ecb7830f18..1a58dc5339 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -13,7 +13,7 @@ {{.CsrfTokenHtml}} <input type="hidden" name="uid" value="{{.SignedUser.ID}}"> <div class="inline field ui left"> - <div id="search-user-box" class="ui search"> + <div id="search-user-box" class="ui search"{{if .IsEmailInviteEnabled}} data-allow-email="true" data-allow-email-description="{{.locale.Tr "org.teams.invite_team_member" $.Team.Name}}"{{end}}> <div class="ui input"> <input class="prompt" name="uname" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" required> </div> @@ -45,6 +45,21 @@ </div> {{end}} </div> + {{if and .Invites $.IsOrganizationOwner}} + <h4 class="ui top attached header">{{$.locale.Tr "org.teams.invite_team_member.list"}}</h4> + <div class="ui bottom attached table segment members"> + {{range .Invites}} + <div class="item"> + <form action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/remove_invite" method="post"> + {{$.CsrfTokenHtml}} + <input type="hidden" name="iid" value="{{.ID}}" /> + <button class="ui red button right">{{$.locale.Tr "org.members.remove"}}</button> + </form> + {{.Email}} + </div> + {{end}} + </div> + {{end}} </div> </div> </div> |