Removed the dedicated search view, as it is actually too limiting. Added a search field in the album/artists/tracks views. This makes search now work together with sort mode

approot/artists.xml

@@ -4,8 +4,11 @@
 
 <message id="Lms.Explore.Artists.template">
 	<div class="d-flex justify-content-between align-items-center mb-3">
-		${link-type}
-		${sort-mode}
+		${link-type class="me-1"}
+		<div class="d-flex">
+			${search class="form-control me-1" type="search"}
+			${sort-mode}
+		</div>
 	</div>
 	${artists}
 </message>

approot/main.xml

@@ -14,9 +14,6 @@
 <message id="Lms.main.template.navbar">
 	<nav class="navbar navbar-expand-md navbar-dark bg-dark mb-3">
 		<div class="container">
-			<div class="d-flex">
-				${search class="form-control" type="search"}
-			</div>
 		    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 				<span class="navbar-toggler-icon"></span>
 			</button>

approot/releases.xml

@@ -4,7 +4,7 @@
 
 <message id="Lms.Explore.Releases.template">
 	<div class="d-flex justify-content-between align-items-center mb-3">
-		<div class="btn-group">
+		<div class="btn-group me-1">
 			${play-btn class="btn btn-primary"}
 			<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"/>
 			<ul class="dropdown-menu">
@@ -13,7 +13,10 @@
 				<li>${play-shuffled class="dropdown-item"}</li>
 			</ul>
 		</div>
-		${sort-mode}
+		<div class="d-flex">
+			${search class="form-control me-1" type="search"}
+			${sort-mode}
+		</div>
 	</div>
 	${releases}
 </message>

approot/search.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<messages xmlns:if="Wt.WTemplate.conditions">
-<!--FORMS message blocks-->
-
-<message id="Lms.Explore.Search.template">
-	<div class="mb-3">
-		<ul class="nav nav-pills mb-3">
-			<li class="nav-item">
-				${releases class="nav-link"}
-			</li>
-			<li class="nav-item">
-				${artists class="nav-link"}
-			</li>
-			<li class="nav-item">
-				${tracks class="nav-link"}
-			</li>
-		</ul>
-	</div>
-	${results}
-</message>
-
-<message id="Lms.Explore.Search.template.artists">
-	<div class="mb-3">
-		${link-type}
-	</div>
-	${artists}
-</message>
-
-</messages>

approot/tracks.xml

@@ -5,7 +5,7 @@
 
 <message id="Lms.Explore.Tracks.template">
 	<div class="d-flex justify-content-between align-items-center mb-3">
-		<div class="btn-group">
+		<div class="btn-group me-1">
 			${play-btn class="btn btn-primary"}
 			<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"/>
 			<ul class="dropdown-menu">
@@ -14,7 +14,10 @@
 				<li>${play-shuffled class="dropdown-item"}</li>
 			</ul>
 		</div>
-		${sort-mode}
+		<div class="d-flex">
+			${search class="form-control me-1" type="search"}
+			${sort-mode}
+		</div>
 	</div>
 	${tracks}
 </message>