Skip to content

Commit cbeeaa1

Browse files
Morlinestappleboy
authored andcommitted
Fix and simplify repo branches UI (#1435)
1 parent 410af69 commit cbeeaa1

File tree

1 file changed

+20
-24
lines changed

1 file changed

+20
-24
lines changed

templates/repo/settings/branches.tmpl

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,32 @@
77
<h4 class="ui top attached header">
88
{{.i18n.Tr "repo.default_branch"}}
99
</h4>
10-
<div class="ui attached table segment">
11-
<form class="ui hook list form" action="{{.Link}}" method="post">
10+
<div class="ui attached segment">
11+
<p>
12+
{{.i18n.Tr "repo.settings.default_branch_desc"}}
13+
</p>
14+
<form class="ui form" action="{{.Link}}" method="post">
1215
{{.CsrfTokenHtml}}
1316
<input type="hidden" name="action" value="default_branch">
14-
<div class="item">
15-
{{.i18n.Tr "repo.settings.default_branch_desc"}}
16-
</div>
1717
{{if not .Repository.IsBare}}
18-
<div class="ui grid padded">
19-
<div class="eight wide column">
20-
<div class="ui fluid dropdown selection visible" tabindex="0">
21-
<select name="branch">
22-
<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
23-
{{range .Branches}}
24-
<option value="{{.}}">{{.}}</option>
25-
{{end}}
26-
</select><i class="dropdown icon"></i>
27-
<div class="default text">{{.Repository.DefaultBranch}}</div>
28-
<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
29-
{{range .Branches}}
30-
<div class="item" data-value="{{.}}">{{.}}</div>
31-
{{end}}
32-
</div>
18+
<div class="required inline field">
19+
<div class="ui dropdown selection" tabindex="0">
20+
<select name="branch">
21+
<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
22+
{{range .Branches}}
23+
<option value="{{.}}">{{.}}</option>
24+
{{end}}
25+
</select><i class="dropdown icon"></i>
26+
<div class="default text">{{.Repository.DefaultBranch}}</div>
27+
<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
28+
{{range .Branches}}
29+
<div class="item" data-value="{{.}}">{{.}}</div>
30+
{{end}}
3331
</div>
3432
</div>
35-
</div>
36-
{{end}}
37-
<div class="item field">
3833
<button class="ui green button">{{$.i18n.Tr "repo.settings.update_settings"}}</button>
3934
</div>
35+
{{end}}
4036
</form>
4137
</div>
4238

@@ -46,7 +42,7 @@
4642
<div class="ui attached table segment">
4743
<div class="ui grid padded">
4844
<div class="eight wide column">
49-
<div class="ui fluid dropdown selection visible" tabindex="0">
45+
<div class="ui fluid dropdown selection" tabindex="0">
5046
<select id="protectedBranch" name="branch" data-url="{{.Repository.Link}}/settings/branches?action=protected_branch">
5147
{{range .LeftBranches}}
5248
<option value="">{{$.i18n.Tr "repo.settings.choose_branch"}}</option>

0 commit comments

Comments
 (0)