From faf6aca874a38d14f0d1c26f54c1c2db859e6391 Mon Sep 17 00:00:00 2001
From: emeric <emeric.poupon@laposte.net>
Date: Mon, 27 Mar 2023 20:59:21 +0200
Subject: [PATCH] New layout test

---
 approot/playqueue.xml                   |  2 +-
 approot/tracks.xml                      | 20 ++++++++++++++------
 src/lms/ui/explore/TrackListHelpers.cpp | 10 +++++++---
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/approot/playqueue.xml b/approot/playqueue.xml
index c10a3c15..00a802f5 100644
--- a/approot/playqueue.xml
+++ b/approot/playqueue.xml
@@ -32,7 +32,7 @@
 
 <message id="Lms.PlayQueue.template.entry">
 	<div class="d-flex align-items-center rounded Lms-bg-dark-hover mb-2">
-		<div class="p-1 Lms-cover-small">
+		<div class="p-1">
 			${cover}
 		</div>
 		<div class="p-2 flex-fill text-truncate">
diff --git a/approot/tracks.xml b/approot/tracks.xml
index 2779b3bc..74cd2b77 100644
--- a/approot/tracks.xml
+++ b/approot/tracks.xml
@@ -39,24 +39,32 @@
 
 <message id="Lms.Explore.Tracks.template.entry">
 	<div class="d-flex align-items-center rounded Lms-bg-dark-hover mb-2">
-		<div class="p-1 Lms-cover-small">
+		<div class="p-1">
 			${cover}
 		</div>
 		<div class="p-2 flex-fill text-truncate">
-			<div class="d-block text-truncate">${name}</div>
-			<div class="text-truncate">
-				${<if-has-artists>}${artists class="d-none d-sm-inline"}${</if-has-artists>}
-				${<if-has-release>}${release class="d-inline text-decoration-none link-success"}${</if-has-release>}
+			<div class="row">
+				<div class="col-12 col-md-6 col-lg-4">
+					<div class="d-block text-truncate">${name}</div>
+					${<if-has-artists>}${artists class="d-block d-md-none text-truncate"}${</if-has-artists>}
+				</div>
+				<div class="col-md-6 col-lg-4">
+					${<if-has-artists>}${artists-md class="d-none d-md-block text-truncate"}${</if-has-artists>}
+				</div>
+				<div class="col-lg-4">
+					${<if-has-release>}${release class="d-none d-lg-block text-truncate text-decoration-none link-success"}${</if-has-release>}
+				</div>
 			</div>
 		</div>
 		<div class="p-2 d-none d-sm-block text-muted">
 			${duration}
 		</div>
 		<div class="p-2 d-flex">
-			${play-btn class="btn btn-sm btn-outline-secondary border-0"}
+			${play-btn class="d-none d-sm-block btn btn-sm btn-outline-secondary border-0"}
 			<div class="dropdown d-inline-block">
 				${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
 				<ul class="dropdown-menu" aria-labelledby="${id:more-btn}">
+					<li>${play class="dropdown-item"}</li>
 					<li>${play-last class="dropdown-item"}</li>
 					<li>${star class="dropdown-item"}</li>
 					<li>${download class="dropdown-item"}</li>
diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp
index 2be43477..039ca242 100644
--- a/src/lms/ui/explore/TrackListHelpers.cpp
+++ b/src/lms/ui/explore/TrackListHelpers.cpp
@@ -166,9 +166,8 @@ namespace UserInterface::TrackListHelpers
 		if (!artists.empty())
 		{
 			entry->setCondition("if-has-artists", true);
-			Wt::WContainerWidget* artistsContainer {entry->bindWidget("artists", Utils::createArtistContainer(artists))};
-			if (track->getRelease())
-				artistsContainer->addNew<Wt::WText>(" — ");
+			entry->bindWidget("artists", Utils::createArtistContainer(artists));
+			entry->bindWidget("artists-md", Utils::createArtistContainer(artists));
 		}
 
 		if (track->getRelease())
@@ -196,6 +195,11 @@ namespace UserInterface::TrackListHelpers
 		});
 
 		entry->bindNew<Wt::WPushButton>("more-btn", Wt::WString::tr("Lms.template.more-btn"), Wt::TextFormat::XHTML);
+		entry->bindNew<Wt::WPushButton>("play", Wt::WString::tr("Lms.Explore.play"))
+			->clicked().connect([trackId, &playQueueController]
+		{
+			playQueueController.processCommand(PlayQueueController::Command::Play, {trackId});
+		});
 		entry->bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last"))
 			->clicked().connect([=, &playQueueController]
 			{