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>
111 lines
3.9 KiB
Handlebars
111 lines
3.9 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
|
|
{{template "repo/header" .}}
|
|
{{template "repo/settings/navbar" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
{{if .Repository.IsArchived}}
|
|
<div class="ui warning message">
|
|
{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
|
|
</div>
|
|
{{else}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "repo.default_branch"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<p>
|
|
{{.locale.Tr "repo.settings.default_branch_desc"}}
|
|
</p>
|
|
<form class="ui form" action="{{.Link}}" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<input type="hidden" name="action" value="default_branch">
|
|
{{if not .Repository.IsEmpty}}
|
|
<div class="required inline field">
|
|
<div class="ui dropdown selection" tabindex="0">
|
|
<select name="branch">
|
|
<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
|
|
{{range .Branches}}
|
|
<option value="{{.}}">{{.}}</option>
|
|
{{end}}
|
|
</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
<div class="default text">{{.Repository.DefaultBranch}}</div>
|
|
<div class="menu">
|
|
{{range .Branches}}
|
|
<div class="item" data-value="{{.}}">{{.}}</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
<button class="ui green button">{{$.locale.Tr "repo.settings.branches.update_default_branch"}}</button>
|
|
</div>
|
|
{{end}}
|
|
</form>
|
|
</div>
|
|
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "repo.settings.protected_branch"}}
|
|
<div class="ui right">
|
|
<a class="ui primary tiny button" href="{{$.Repository.Link}}/settings/branches/edit">{{$.locale.Tr "repo.settings.branches.add_new_rule"}}</a>
|
|
</div>
|
|
</h4>
|
|
|
|
<div class="ui attached table segment">
|
|
<div class="ui grid padded">
|
|
<div class="sixteen wide column">
|
|
<table class="ui single line table padded">
|
|
<tbody>
|
|
{{range .ProtectedBranches}}
|
|
<tr>
|
|
<td><div class="ui basic primary label">{{.RuleName}}</div></td>
|
|
<td class="right aligned">
|
|
<a class="rm ui button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{$.locale.Tr "repo.settings.edit_protected_branch"}}</a>
|
|
<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
|
|
{{$.locale.Tr "repo.settings.protected_branch.delete_rule"}}</button>
|
|
</td>
|
|
</tr>
|
|
{{else}}
|
|
<tr class="center aligned"><td>{{.locale.Tr "repo.settings.no_protected_branch"}}</td></tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{{if $.Repository.CanCreateBranch}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "repo.settings.rename_branch"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<div class="required field">
|
|
<label for="from">{{.locale.Tr "repo.settings.rename_branch_from"}}</label>
|
|
<input id="from" name="from" required>
|
|
</div>
|
|
<div class="required field {{if .Err_BranchName}}error{{end}}">
|
|
<label for="to">{{.locale.Tr "repo.settings.rename_branch_to"}}</label>
|
|
<input id="to" name="to" required>
|
|
</div>
|
|
<div class="field">
|
|
<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui gitea-confirm-modal delete modal">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "repo.settings.protected_branch_deletion"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
|
|
{{template "base/footer" .}}
|