From 863c002724203135d00cd227595f812ef77908fd Mon Sep 17 00:00:00 2001
From: emeric <emeric.poupon@laposte.net>
Date: Thu, 12 May 2022 20:24:23 +0200
Subject: [PATCH] Still converting to bootstrap 5. Fixed regression on releases

---
 approot/admin-users.xml                   |  2 +-
 approot/artist.xml                        | 14 +++++---------
 approot/release.xml                       |  2 +-
 src/lms/ui/explore/ReleaseListHelpers.cpp |  6 +++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/approot/admin-users.xml b/approot/admin-users.xml
index 29c4551c..ac326d97 100644
--- a/approot/admin-users.xml
+++ b/approot/admin-users.xml
@@ -3,7 +3,7 @@
 
 <message id="Lms.Admin.Users.template">
 	<h3>${tr:Lms.Admin.Users.users}</h3>
-	${users class="d-grid gap-1"}
+	${users class="d-grid gap-1 mb-3"}
 	${<if-can-create-user>}
 	${add-btn class="btn btn-primary"}
 	${</if-can-create-user>}
diff --git a/approot/artist.xml b/approot/artist.xml
index ada0f662..e0f2f17c 100644
--- a/approot/artist.xml
+++ b/approot/artist.xml
@@ -23,19 +23,15 @@
 		</div>
 	</div>
 	${<if-has-release>}
-	${releases}
+	${releases class="mb-3"}
 	${</if-has-release>}
 	${<if-has-non-release-track>}
-	${tracks}
+	${tracks class="mb-3"}
 	${</if-has-non-release-track>}
 	${<if-has-similar-artists>}
-	<div class="row">
-		<div class="col-md-4">
-			<div class="well well-sm">
-				<h3>${tr:Lms.Explore.Artist.similar-artists}</h3>
-				${similar-artists}
-			</div>
-		</div>
+	<div>
+		<h3>${tr:Lms.Explore.Artist.similar-artists}</h3>
+		${similar-artists class="d-grid gap-3"}
 	</div>
 	${</if-has-similar-artists>}
 </message>
diff --git a/approot/release.xml b/approot/release.xml
index b26ab715..a59fcd88 100644
--- a/approot/release.xml
+++ b/approot/release.xml
@@ -7,7 +7,7 @@
 </message>
 
 <message id="Lms.Explore.Release.template">
-	<div class="row mb-5 gy-3">
+	<div class="row mb-3 gy-3">
 		<div class="col-lg-3 col-md-4">
 			${cover class="Lms-explore-release-cover"}
 		</div>
diff --git a/src/lms/ui/explore/ReleaseListHelpers.cpp b/src/lms/ui/explore/ReleaseListHelpers.cpp
index cc5d2f41..5daeaec9 100644
--- a/src/lms/ui/explore/ReleaseListHelpers.cpp
+++ b/src/lms/ui/explore/ReleaseListHelpers.cpp
@@ -42,14 +42,14 @@ namespace UserInterface::ReleaseListHelpers
 		entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release));
 		entry->addFunction("tr", &Wt::WTemplate::Functions::tr);
 
-		Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false));
-		auto cover = std::make_unique<Wt::WImage>();
+		Wt::WAnchor* anchor {entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false))};
+		auto cover {std::make_unique<Wt::WImage>()};
 		cover->setImageLink(LmsApp->getCoverResource()->getReleaseUrl(release->getId(), CoverResource::Size::Large));
 		cover->setStyleClass("Lms-cover rounded");
 		cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
 		anchor->setImage(std::move(cover));
 
-		auto artists = release->getReleaseArtists();
+		auto artists {release->getReleaseArtists()};
 		if (artists.empty())
 			artists = release->getArtists();