Refactored the search view. fixes #146

approot/artists.xml

@@ -12,7 +12,6 @@
 		</div>
 	</div>
 	${artists}
-	${loading-indicator class="Lms-horizontal-center Lms-loading-indicator"}
 </message>
 
 <message id="Lms.Explore.Artists.template.entry">

approot/releases.xml

@@ -7,10 +7,7 @@
 		${mode class="nav nav-pills Lms-explore-mode-container"}
 		${play-btn class="Lms-explore-btn Lms-btn"}${more-btn class="Lms-explore-btn Lms-btn"}
 	</div>
-	<div class="row">
-		${releases}
-	</div>
-	${loading-indicator class="Lms-horizontal-center Lms-loading-indicator"}
+	${releases}
 </message>
 
 <message id="Lms.Explore.Releases.template.entry-grid">
@@ -27,4 +24,12 @@
 	</div>
 </message>
 
+<message id="Lms.Explore.Releases.template.container">
+	<div class="row">
+		${elements}
+	</div>
+	${loading-indicator class="Lms-horizontal-center Lms-loading-indicator"}
+</message>
+
+
 </messages>

approot/search.xml

@@ -4,36 +4,9 @@
 
 <message id="Lms.Explore.Search.template">
 	<div class="Lms-header">
-		<h2>${tr:Lms.Explore.Search.search}</h2>
-	</div>
-	<div class="row">
-		${<if-artists>}
-		<div class="col-lg-8">
-			<div class="well well-sm">
-				<h3>${tr:Lms.Explore.artists}</h3>
-				${artists}
-			</div>
-		</div>
-		${</if-artists>}
-		${<if-releases>}
-		<div class="col-lg-8">
-			<div class="well well-sm">
-				<h3>${tr:Lms.Explore.releases}</h3>
-				<div class="row">
-					${releases}
-				</div>
-			</div>
-		</div>
-		${</if-releases>}
-		${<if-tracks>}
-		<div class="col-lg-8">
-			<div class="well well-sm">
-				<h3>${tr:Lms.Explore.tracks}</h3>
-				${tracks}
-			</div>
-		</div>
-		${</if-tracks>}
+		${mode class="nav nav-pills Lms-explore-mode-container"}
 	</div>
+	${stack}
 </message>
 
 </messages>

approot/templates.xml

@@ -18,8 +18,8 @@
 			</div>
 			<div class="collapse navbar-collapse">
 				<ul class="nav navbar-nav">
-					<li>${artists class="Lms-btn"}</li>
 					<li>${releases class="Lms-btn"}</li>
+					<li>${artists class="Lms-btn"}</li>
 					<li>${tracks class="Lms-btn"}</li>
 					<li>${playqueue class="Lms-btn"}</li>
 				</ul>
@@ -61,4 +61,9 @@
 	<span class="sr-only">${tr:Lms.loading}</span>
 </message>
 
+<message id="Lms.infinite-scrolling-container">
+	${elements}
+	${loading-indicator class="Lms-horizontal-center Lms-loading-indicator"}
+</message>
+
 </messages>

approot/tracks.xml

@@ -4,16 +4,11 @@
 <!--FORMS message blocks-->
 
 <message id="Lms.Explore.Tracks.template">
-	<div class="row">
-		<div class="col-lg-8">
-			<div class="Lms-header">
-				${mode class="nav nav-pills Lms-explore-mode-container"}
-				${play-btn class="Lms-explore-btn Lms-btn"}${more-btn class="Lms-explore-btn Lms-btn"}
-			</div>
-			${tracks}
-			${loading-indicator class="Lms-horizontal-center Lms-loading-indicator"}
-		</div>
+	<div class="Lms-header">
+		${mode class="nav nav-pills Lms-explore-mode-container"}
+		${play-btn class="Lms-explore-btn Lms-btn"}${more-btn class="Lms-explore-btn Lms-btn"}
 	</div>
+	${tracks}
 </message>
 
 <message id="Lms.Explore.Tracks.template.entry">
@@ -45,4 +40,13 @@
 	<small>${artist class="Lms-btn Lms-artistname text-muted"}</small>
 </message>
 
+<message id="Lms.Explore.Tracks.template.container">
+	<div class="row">
+		<div class="col-lg-8">
+			${elements}
+			${loading-indicator class="Lms-horizontal-center Lms-loading-indicator"}
+		</div>
+	</div>
+</message>
+
 </messages>