From cbeeaa1b117c074ff6c7e128fe0f3b0f7b64a124 Mon Sep 17 00:00:00 2001
From: Morlinest <Morlinest@users.noreply.github.com>
Date: Thu, 6 Apr 2017 17:33:57 +0200
Subject: [PATCH] Fix and simplify repo branches UI (#1435)

---
 templates/repo/settings/branches.tmpl | 44 ++++++++++++---------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index d9d19845a..7008e2e53 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -7,36 +7,32 @@
 		<h4 class="ui top attached header">
 			{{.i18n.Tr "repo.default_branch"}}
 		</h4>
-		<div class="ui attached table segment">
-			<form class="ui hook list form" action="{{.Link}}" method="post">
+		<div class="ui attached segment">
+			<p>
+				{{.i18n.Tr "repo.settings.default_branch_desc"}}
+			</p>
+			<form class="ui form" action="{{.Link}}" method="post">
 				{{.CsrfTokenHtml}}
 				<input type="hidden" name="action" value="default_branch">
-				<div class="item">
-					{{.i18n.Tr "repo.settings.default_branch_desc"}}
-				</div>
 				{{if not .Repository.IsBare}}
-				<div class="ui grid padded">
-					<div class="eight wide column">
-						<div class="ui fluid dropdown selection visible" tabindex="0">
-							<select name="branch">
-								<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
-								{{range .Branches}}
-									<option value="{{.}}">{{.}}</option>
-								{{end}}
-							</select><i class="dropdown icon"></i>
-							<div class="default text">{{.Repository.DefaultBranch}}</div>
-							<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
-								{{range .Branches}}
-									<div class="item" data-value="{{.}}">{{.}}</div>
-								{{end}}
-							</div>
+				<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><i class="dropdown icon"></i>
+						<div class="default text">{{.Repository.DefaultBranch}}</div>
+						<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
+							{{range .Branches}}
+								<div class="item" data-value="{{.}}">{{.}}</div>
+							{{end}}
 						</div>
 					</div>
-				</div>
-				{{end}}
-				<div class="item field">
 					<button class="ui green button">{{$.i18n.Tr "repo.settings.update_settings"}}</button>
 				</div>
+				{{end}}
 			</form>
 		</div>
 
@@ -46,7 +42,7 @@
 		<div class="ui attached table segment">
 			<div class="ui grid padded">
 				<div class="eight wide column">
-					<div class="ui fluid dropdown selection visible" tabindex="0">
+					<div class="ui fluid dropdown selection" tabindex="0">
 						<select id="protectedBranch" name="branch" data-url="{{.Repository.Link}}/settings/branches?action=protected_branch">
 							{{range .LeftBranches}}
 								<option value="">{{$.i18n.Tr "repo.settings.choose_branch"}}</option>