mirror of
https://github.com/go-gitea/gitea
synced 2024-12-23 11:17:57 +01:00
72e956b79a
Main changes: 1. Change html structure of protected branch page, use [`grouped fields`](https://fomantic-ui.com/collections/form.html#grouped-fields) instead of `fields` for better margin, and wrap `grouped fields` around related `field`s, remove unnecessary `<div id="protection_box" class="fields">` outer div 2. Changed some order of field to make them more categorized, used `ui dividing header` for categorization and fine tune css. Before: <img width="1907" alt="Screen Shot 2023-04-27 at 14 56 19" src="https://user-images.githubusercontent.com/17645053/234783731-bce8a7ce-dfc9-4d47-a3a8-b962ebea9467.png"> <img width="1849" alt="Screen Shot 2023-04-27 at 14 56 30" src="https://user-images.githubusercontent.com/17645053/234783740-c47d314e-5e2d-4854-98fd-c88f85ef3584.png"> <img width="1872" alt="Screen Shot 2023-04-27 at 14 56 36" src="https://user-images.githubusercontent.com/17645053/234783745-18e35a75-07e8-451d-b001-f9bcf16fcab5.png"> After: https://user-images.githubusercontent.com/17645053/235114568-da010aad-7654-4410-ab8c-5d0fce7edadb.mov 3. Changed "Enable Merge Whitelist" to radio checkbox, and added "Enable Merge" radio checkbox, which are exclusive Before: <img width="926" alt="Screen Shot 2023-04-28 at 13 08 29" src="https://user-images.githubusercontent.com/17645053/235059233-75790f7a-e5ea-4e1c-82c6-509fef8b84b3.png"> After: <img width="942" alt="Screen Shot 2023-04-28 at 13 09 28" src="https://user-images.githubusercontent.com/17645053/235059367-852d1f61-8407-4126-8c79-315b9c1ffada.png"> 4. Add a link to set default branch on branch list page (with reference to github) https://user-images.githubusercontent.com/17645053/234787404-61c1c7b6-aabf-429f-a109-5b690e4e0b5a.mov 5. Removed dead codes. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Giteabot <teabot@gitea.io>
100 lines
3.7 KiB
Handlebars
100 lines
3.7 KiB
Handlebars
{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
|
|
<div class="repo-setting-content">
|
|
{{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="gt-df" action="{{.Link}}" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<input type="hidden" name="action" value="default_branch">
|
|
{{if not .Repository.IsEmpty}}
|
|
<div class="ui dropdown selection gt-f1 gt-mr-3 gt-max-width-24rem">
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
<input type="hidden" name="branch" value="{{.Repository.DefaultBranch}}">
|
|
<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>
|
|
{{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 class="ui g-modal-confirm 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 "repo/settings/layout_footer" .}}
|