mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-26 09:09:36 -05:00
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>
142 lines
5.7 KiB
Handlebars
142 lines
5.7 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content user settings repos">
|
|
{{template "user/settings/navbar" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "settings.repos"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
{{if or .allowAdopt .allowDelete}}
|
|
{{if .Dirs}}
|
|
<div class="ui middle aligned divided list">
|
|
{{range $dirI, $dir := .Dirs}}
|
|
{{$repo := index $.ReposMap $dir}}
|
|
<div class="item">
|
|
<div class="content">
|
|
{{if $repo}}
|
|
{{if $repo.IsPrivate}}
|
|
<span class="text gold icon">{{svg "octicon-lock"}}</span>
|
|
{{else if $repo.IsFork}}
|
|
<span class="icon">{{svg "octicon-repo-forked"}}</span>
|
|
{{else if $repo.IsMirror}}
|
|
<span class="icon">{{svg "octicon-mirror"}}</span>
|
|
{{else if $repo.IsTemplate}}
|
|
<span class="icon">{{svg "octicon-repo-template"}}</span>
|
|
{{else}}
|
|
<span class="icon">{{svg "octicon-repo"}}</span>
|
|
{{end}}
|
|
<a class="name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
|
|
<span>{{FileSize $repo.Size}}</span>
|
|
{{if $repo.IsFork}}
|
|
{{$.locale.Tr "repo.forked_from"}}
|
|
<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
|
|
{{end}}
|
|
{{else}}
|
|
<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
|
|
<span class="name">{{$.ContextUser.Name}}/{{$dir}}</span>
|
|
<div class="right floated content">
|
|
{{if $.allowAdopt}}
|
|
<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
|
|
<div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}">
|
|
<div class="header">
|
|
<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
|
|
</div>
|
|
<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
|
|
{{$.CsrfTokenHtml}}
|
|
<input type="hidden" name="id" value="{{$dir}}">
|
|
<input type="hidden" name="action" value="adopt">
|
|
<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
|
|
<button class="ui red basic inverted cancel button">
|
|
{{svg "octicon-x"}}
|
|
{{$.locale.Tr "modal.no"}}
|
|
</button>
|
|
<button class="ui green basic inverted ok button">
|
|
{{svg "octicon-check"}}
|
|
{{$.locale.Tr "modal.yes"}}
|
|
</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
{{end}}
|
|
{{if $.allowDelete}}
|
|
<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
|
|
<div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}">
|
|
<div class="header">
|
|
<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
|
|
</div>
|
|
<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
|
|
{{$.CsrfTokenHtml}}
|
|
<input type="hidden" name="id" value="{{$dir}}">
|
|
<input type="hidden" name="action" value="delete">
|
|
{{template "base/modal_actions_confirm" $}}
|
|
</form>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{template "base/paginate" .}}
|
|
{{else}}
|
|
<div class="item">
|
|
{{.locale.Tr "settings.repos_none"}}
|
|
</div>
|
|
{{end}}
|
|
{{else}}
|
|
{{if .Repos}}
|
|
<div class="ui middle aligned divided list">
|
|
{{range .Repos}}
|
|
<div class="item">
|
|
<div class="content">
|
|
{{if .IsPrivate}}
|
|
{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
|
|
{{else if .IsFork}}
|
|
{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
|
|
{{else if .IsMirror}}
|
|
{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
|
|
{{else if .IsTemplate}}
|
|
{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
|
|
{{else}}
|
|
{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
|
|
{{end}}
|
|
<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
|
|
<span>{{FileSize .Size}}</span>
|
|
{{if .IsFork}}
|
|
{{$.locale.Tr "repo.forked_from"}}
|
|
<span><a href="{{.BaseRepo.Link}}">{{.BaseRepo.OwnerName}}/{{.BaseRepo.Name}}</a></span>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{template "base/paginate" .}}
|
|
{{else}}
|
|
<div class="item">
|
|
{{.locale.Tr "settings.repos_none"}}
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui gitea-confirm-modal delete modal">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "settings.remove_account_link"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
{{template "base/footer" .}}
|