forked from NYANDEV/forgejo
476a043a5f
Co-Author: @wxiaoguang
This PR is to fix
https://github.com/go-gitea/gitea/issues/23318#issuecomment-1506275446 .
The way to fix this in this PR is to use `delete_modal_actions.tmpl`
here both to fix this issue and keep ui consistency (as suggested by
[TODO
here](4299c3b7db/templates/projects/view.tmpl (L161)))
And this PR also refactors `delete_modal_actions.tmpl` and its related
styles, and use the template for more modal actions:
1. Added template attributes:
* locale
* ModalButtonStyle: "yes" (default) or "confirm"
* ModalButtonCancelText
* ModalButtonOkText
2. Rename `delete_modal_actions.tmpl` template to
`modal_actions_confirm.tmpl` because it is not only used for action
modals deletion now.
3. Refactored css related to modals into `web_src/css/modules/modal.css`
and improved the styles.
4. Also use the template for PR deletion modal and remove issue
dependency modal.
5. Some modals should also use the template, but not sure how to open
them, so mark these modal actions by `{{/* TODO: Convert to
base/modal_actions_confirm */}}`
After (Also tested on arc green):
Hovering on the left buttons
<img width="711" alt="Screen Shot 2023-04-23 at 15 17 12"
src="https://user-images.githubusercontent.com/17645053/233825650-76307e65-9255-44bb-80e8-7062f58ead1b.png">
<img width="786" alt="Screen Shot 2023-04-23 at 15 17 21"
src="https://user-images.githubusercontent.com/17645053/233825652-4dc6f7d1-a180-49fb-a468-d60950eaee0d.png">
Test for functionalities:
https://user-images.githubusercontent.com/17645053/233826857-76376fda-022c-42d0-b0f3-339c17ca4e59.mov
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
103 lines
3.9 KiB
Handlebars
103 lines
3.9 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content organization members">
|
|
{{template "org/header" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
|
|
<div class="list">
|
|
{{range .Members}}
|
|
<div class="item ui grid">
|
|
<div class="ui four wide column" style="display: flex;">
|
|
<a href="{{.HomeLink}}">{{avatar $.Context . 48}}</a>
|
|
<div>
|
|
<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
|
|
<div class="meta">{{.FullName}}</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui four wide column center">
|
|
<div class="meta">
|
|
{{$.locale.Tr "org.members.membership_visibility"}}
|
|
</div>
|
|
<div class="meta">
|
|
{{$isPublic := index $.MembersIsPublicMember .ID}}
|
|
{{if $isPublic}}
|
|
<strong>{{$.locale.Tr "org.members.public"}}</strong>
|
|
{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/private?uid={{.ID}}">{{$.locale.Tr "org.members.public_helper"}}</a>){{end}}
|
|
{{else}}
|
|
<strong>{{$.locale.Tr "org.members.private"}}</strong>
|
|
{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.locale.Tr "org.members.private_helper"}}</a>){{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{if not $.PublicOnly}}
|
|
<div class="ui three wide column center">
|
|
<div class="meta">
|
|
{{$.locale.Tr "org.members.member_role"}}
|
|
</div>
|
|
<div class="meta">
|
|
<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.locale.Tr "org.members.owner"}}{{else}}{{$.locale.Tr "org.members.member"}}{{end}}</strong>
|
|
</div>
|
|
</div>
|
|
<div class="ui two wide column center">
|
|
{{if $.IsOrganizationOwner}}
|
|
<div class="meta">
|
|
{{$.locale.Tr "admin.users.2fa"}}
|
|
</div>
|
|
<div class="meta">
|
|
<strong>
|
|
{{if index $.MembersTwoFaStatus .ID}}
|
|
<span class="text green">{{svg "octicon-check"}}</span>
|
|
{{else}}
|
|
{{svg "octicon-x"}}
|
|
{{end}}
|
|
</strong>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
<div class="ui three wide column gt-df gt-ac gt-je">
|
|
<div class="text right">
|
|
{{if eq $.SignedUser.ID .ID}}
|
|
<form>
|
|
<button class="ui red small button delete-button" data-modal-id="leave-organization"
|
|
data-url="{{$.OrgLink}}/members/action/leave" data-datauid="{{.ID}}"
|
|
data-name="{{.DisplayName}}"
|
|
data-data-organization-name="{{$.Org.DisplayName}}">{{$.locale.Tr "org.members.leave"}}</button>
|
|
</form>
|
|
{{else if $.IsOrganizationOwner}}
|
|
<form>
|
|
<button class="ui red small button delete-button" data-modal-id="remove-organization-member"
|
|
data-url="{{$.OrgLink}}/members/action/remove" data-datauid="{{.ID}}"
|
|
data-name="{{.DisplayName}}"
|
|
data-data-organization-name="{{$.Org.DisplayName}}">{{$.locale.Tr "org.members.remove"}}</button>
|
|
</form>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
|
|
{{template "base/paginate" .}}
|
|
</div>
|
|
</div>
|
|
<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
|
|
<div class="header">
|
|
{{$.locale.Tr "org.members.leave"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
<div class="ui gitea-confirm-modal delete modal" id="remove-organization-member">
|
|
<div class="header">
|
|
{{$.locale.Tr "org.members.remove"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataOrganizationName"></span>` | Safe}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
|
|
{{template "base/footer" .}}
|