From aa29f1c2b9150e45392c925e174af0471bf41b66 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Tue, 12 May 2020 20:08:43 +0100
Subject: [PATCH] Ensure search action button coalesced to adjacent input
 (#11385)

Fomantic-ui's action button syntax requires that the button is
the next sibling of the input it is attached to and that they
are both children of a div.action.

Fix #11375

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>
---
 templates/admin/emails/list.tmpl     | 4 ++--
 templates/explore/code.tmpl          | 2 +-
 templates/explore/repo_search.tmpl   | 4 ++--
 templates/explore/search.tmpl        | 2 +-
 templates/repo/issue/search.tmpl     | 2 +-
 templates/user/dashboard/issues.tmpl | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index e9bef3c3b..64b7603e2 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -24,8 +24,8 @@
 			</div>
 			<form class="ui form ignore-dirty"  style="max-width: 90%">
 				<div class="ui fluid action input">
-				<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
-				<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
+					<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
+					<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
 				</div>
 			</form>
 		</div>
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl
index 4a1b792b0..9fa725b74 100644
--- a/templates/explore/code.tmpl
+++ b/templates/explore/code.tmpl
@@ -3,9 +3,9 @@
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		<form class="ui form ignore-dirty" style="max-width: 100%">
+            <input type="hidden" name="tab" value="{{$.TabName}}">
             <div class="ui fluid action input">
                 <input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
-                <input type="hidden" name="tab" value="{{$.TabName}}">
                 <button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
             </div>
         </form>
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl
index 62bb5ea3c..0f3780177 100644
--- a/templates/explore/repo_search.tmpl
+++ b/templates/explore/repo_search.tmpl
@@ -20,10 +20,10 @@
     </div>
 </div>
 <form class="ui form ignore-dirty" style="max-width: 90%">
+    <input type="hidden" name="tab" value="{{$.TabName}}">
+    <input type="hidden" name="sort" value="{{$.SortType}}">
     <div class="ui fluid action input">
         <input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
-        <input type="hidden" name="tab" value="{{$.TabName}}">
-        <input type="hidden" name="sort" value="{{$.SortType}}">
         <button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
     </div>
 </form>
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl
index 906dd06ca..ccfdf971b 100644
--- a/templates/explore/search.tmpl
+++ b/templates/explore/search.tmpl
@@ -16,9 +16,9 @@
 	</div>
 </div>
 <form class="ui form ignore-dirty" style="max-width: 90%">
+	<input type="hidden" name="tab" value="{{$.TabName}}">
 	<div class="ui fluid action input">
 	  <input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
-	  <input type="hidden" name="tab" value="{{$.TabName}}">
 	  <button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
 	</div>
 </form>
diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl
index 522bced3c..632270da8 100644
--- a/templates/repo/issue/search.tmpl
+++ b/templates/repo/issue/search.tmpl
@@ -7,7 +7,7 @@
 		<input type="hidden" name="assignee" value="{{$.AssigneeID}}"/>
 		<div class="ui search action input">
 			<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
+			<button class="ui blue button" type="submit">{{.i18n.Tr "explore.search"}}</button>
 		</div>
-		<button class="ui blue button" type="submit">{{.i18n.Tr "explore.search"}}</button>
 	</div>
 </form>
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 82da91c81..f9bf2c157 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -74,8 +74,8 @@
 								<input type="hidden" name="state" value="{{$.State}}"/>
 								<div class="ui search action input">
 									<input name="q" value="{{$.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
+									<button class="ui blue button" type="submit">{{.i18n.Tr "explore.search"}}</button>
 								</div>
-								<button class="ui blue button" type="submit">{{.i18n.Tr "explore.search"}}</button>
 							</div>
 						</form>
 					</div>