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>
125 lines
5.7 KiB
Handlebars
125 lines
5.7 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content repository settings collaboration">
|
|
{{template "repo/header" .}}
|
|
{{template "repo/settings/navbar" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "repo.settings.collaboration"}}
|
|
</h4>
|
|
{{if .Collaborators}}
|
|
<div class="ui attached segment collaborator list">
|
|
{{range .Collaborators}}
|
|
<div class="item ui grid">
|
|
<div class="ui five wide column">
|
|
<a href="{{.HomeLink}}">
|
|
{{avatar $.Context .}}
|
|
{{.DisplayName}}
|
|
</a>
|
|
</div>
|
|
<div class="ui eight wide column">
|
|
{{svg "octicon-shield-lock"}}
|
|
<div class="ui inline dropdown access-mode" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}" data-last-value="{{printf "%d" .Collaboration.Mode}}">
|
|
<div class="text">{{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
<div class="menu">
|
|
<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.locale.Tr "repo.settings.collaboration.admin"}}</div>
|
|
<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.locale.Tr "repo.settings.collaboration.write"}}</div>
|
|
<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.read"}}" data-value="1">{{$.locale.Tr "repo.settings.collaboration.read"}}</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui two wide column">
|
|
<button class="ui red tiny button inline text-thin delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
|
|
{{$.locale.Tr "repo.settings.delete_collaborator"}}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
<div class="ui bottom attached segment">
|
|
<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<div class="inline field ui left">
|
|
<div id="search-user-box" class="ui search">
|
|
<div class="ui input">
|
|
<input class="prompt" name="collaborator" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" autofocus required>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<button class="ui green button">{{.locale.Tr "repo.settings.add_collaborator"}}</button>
|
|
</form>
|
|
</div>
|
|
|
|
{{if .RepoOwnerIsOrganization}}
|
|
<h4 class="ui top attached header">
|
|
{{$.locale.Tr "repo.settings.teams"}}
|
|
</h4>
|
|
{{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
|
|
{{if .Teams}}
|
|
<div class="ui attached segment collaborator list">
|
|
{{range $t, $team := .Teams}}
|
|
<div class="item ui grid">
|
|
<div class="ui five wide column">
|
|
<a href="{{AppSubUrl}}/org/{{$.OrgName|PathEscape}}/teams/{{.LowerName|PathEscape}}">
|
|
{{.Name}}
|
|
</a>
|
|
</div>
|
|
<div class="ui eight wide column" data-tooltip-content="{{$.locale.Tr "repo.settings.change_team_permission_tip"}}">
|
|
{{svg "octicon-shield-lock"}}
|
|
<div class="ui inline dropdown">
|
|
<div class="text">{{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
|
|
</div>
|
|
{{if or (eq .AccessMode 1) (eq .AccessMode 2)}}
|
|
{{$first := true}}
|
|
<div class="description">
|
|
Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $.Context $unit.Type) ($team.UnitEnabled $.Context $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{if $allowedToChangeTeams}}
|
|
<div class="ui two wide column" {{if .IncludesAllRepositories}} data-tooltip-content="{{$.locale.Tr "repo.settings.delete_team_tip"}}"{{end}}>
|
|
<button class="ui red tiny button inline text-thin delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
|
|
{{$.locale.Tr "repo.settings.delete_collaborator"}}
|
|
</button>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
<div class="ui bottom attached segment">
|
|
{{if $allowedToChangeTeams}}
|
|
<form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<div class="inline field ui left">
|
|
<div id="search-team-box" class="ui search" data-org="{{.OrgName}}">
|
|
<div class="ui input">
|
|
<input class="prompt" name="team" placeholder="{{$.locale.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<button class="ui green button">{{$.locale.Tr "repo.settings.add_team"}}</button>
|
|
</form>
|
|
{{else}}
|
|
<div class="item">
|
|
{{$.locale.Tr "repo.settings.change_team_access_not_allowed"}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui gitea-confirm-modal delete modal">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "repo.settings.collaborator_deletion"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "repo.settings.collaborator_deletion_desc"}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
{{template "base/footer" .}}
|