Added rounded class on images + sort other versions by release date + only display release year

This commit is contained in:
emeric
2025-02-23 09:25:51 +01:00
parent 7c6516f88a
commit ddb679d86c
6 changed files with 17 additions and 7 deletions
+1 -1
View File
@@ -9,7 +9,7 @@
<message id="Lms.Explore.Release.template"> <message id="Lms.Explore.Release.template">
<div class="row mb-3 gy-3"> <div class="row mb-3 gy-3">
<div class="col-lg-3 col-md-4"> <div class="col-lg-3 col-md-4">
${cover class="Lms-cursor-pointer"} ${cover class="Lms-cursor-pointer rounded"}
</div> </div>
<div class="col"> <div class="col">
<h2>${name}${<if-has-release-comment>}<span class="ms-1 text-muted">[${comment}]</span>${</if-has-release-comment>}</h2> <h2>${name}${<if-has-release-comment>}<span class="ms-1 text-muted">[${comment}]</span>${</if-has-release-comment>}</h2>
+1 -1
View File
@@ -491,7 +491,7 @@ namespace lms::ui
} }
auto image{ utils::createTrackImage(track->getId(), ArtworkResource::Size::Small) }; auto image{ utils::createTrackImage(track->getId(), ArtworkResource::Size::Small) };
image->addStyleClass("Lms-cover-track"); image->addStyleClass("Lms-cover-track rounded");
if (const auto release{ track->getRelease() }) if (const auto release{ track->getRelease() })
{ {
entry->setCondition("if-has-release", true); entry->setCondition("if-has-release", true);
+1 -1
View File
@@ -34,7 +34,7 @@ namespace lms::ui::ArtistListHelpers
Wt::WAnchor* anchor{ entry->bindWidget("image", utils::createArtistAnchor(artist, false)) }; Wt::WAnchor* anchor{ entry->bindWidget("image", utils::createArtistAnchor(artist, false)) };
auto image{ utils::createArtistImage(artist->getId(), ArtworkResource::Size::Large) }; auto image{ utils::createArtistImage(artist->getId(), ArtworkResource::Size::Large) };
image->addStyleClass("Lms-cover-release Lms-cover-anchor"); image->addStyleClass("Lms-cover-release Lms-cover-anchor rounded"); // hack
anchor->setImage(std::move(image)); anchor->setImage(std::move(image));
return entry; return entry;
+12 -3
View File
@@ -38,6 +38,7 @@ namespace lms::ui::releaseListHelpers
enum class ReleaseOptions enum class ReleaseOptions
{ {
ShowArtist, ShowArtist,
ShowYearAndOriginalYear,
ShowYear, ShowYear,
}; };
@@ -51,7 +52,7 @@ namespace lms::ui::releaseListHelpers
{ {
Wt::WAnchor* anchor{ entry->bindWidget("cover", utils::createReleaseAnchor(release, false)) }; Wt::WAnchor* anchor{ entry->bindWidget("cover", utils::createReleaseAnchor(release, false)) };
auto image{ utils::createReleaseCover(release->getId(), ArtworkResource::Size::Large) }; auto image{ utils::createReleaseCover(release->getId(), ArtworkResource::Size::Large) };
image->addStyleClass("Lms-cover-release Lms-cover-anchor"); // hack image->addStyleClass("Lms-cover-release Lms-cover-anchor rounded"); // hack
anchor->setImage(std::move(image)); anchor->setImage(std::move(image));
} }
@@ -65,7 +66,7 @@ namespace lms::ui::releaseListHelpers
} }
} }
if (options.contains(ReleaseOptions::ShowYear)) if (options.contains(ReleaseOptions::ShowYearAndOriginalYear))
{ {
Wt::WString year{ releaseHelpers::buildReleaseYearString(release->getYear(), release->getOriginalYear()) }; Wt::WString year{ releaseHelpers::buildReleaseYearString(release->getYear(), release->getOriginalYear()) };
if (!year.empty()) if (!year.empty())
@@ -74,6 +75,14 @@ namespace lms::ui::releaseListHelpers
entry->bindString("year", year, Wt::TextFormat::Plain); entry->bindString("year", year, Wt::TextFormat::Plain);
} }
} }
else if (options.contains(ReleaseOptions::ShowYear))
{
if (release->getYear())
{
entry->setCondition("if-has-year", true);
entry->bindInt("year", *release->getYear());
}
}
return entry; return entry;
} }
@@ -86,7 +95,7 @@ namespace lms::ui::releaseListHelpers
std::unique_ptr<Wt::WTemplate> createEntryForArtist(const db::Release::pointer& release, const db::Artist::pointer& artist) std::unique_ptr<Wt::WTemplate> createEntryForArtist(const db::Release::pointer& release, const db::Artist::pointer& artist)
{ {
return createEntryInternal(release, artist, core::EnumSet<ReleaseOptions>{ ReleaseOptions::ShowArtist, ReleaseOptions::ShowYear }); return createEntryInternal(release, artist, core::EnumSet<ReleaseOptions>{ ReleaseOptions::ShowArtist, ReleaseOptions::ShowYearAndOriginalYear });
} }
std::unique_ptr<Wt::WTemplate> createEntryForOtherVersions(const db::ObjectPtr<db::Release>& release) std::unique_ptr<Wt::WTemplate> createEntryForOtherVersions(const db::ObjectPtr<db::Release>& release)
+1
View File
@@ -569,6 +569,7 @@ namespace lms::ui
db::Release::FindParameters params; db::Release::FindParameters params;
params.setReleaseGroupMBID(groupMBID); params.setReleaseGroupMBID(groupMBID);
params.setSortMethod(db::ReleaseSortMethod::DateAsc);
const auto releaseIds{ db::Release::findIds(LmsApp->getDbSession(), params) }; const auto releaseIds{ db::Release::findIds(LmsApp->getDbSession(), params) };
if (releaseIds.results.size() <= 1) if (releaseIds.results.size() <= 1)
+1 -1
View File
@@ -220,7 +220,7 @@ namespace lms::ui::TrackListHelpers
} }
auto image{ utils::createTrackImage(trackId, ArtworkResource::Size::Small) }; auto image{ utils::createTrackImage(trackId, ArtworkResource::Size::Small) };
image->addStyleClass("Lms-cover-track"); image->addStyleClass("Lms-cover-track rounded");
if (track->getRelease()) if (track->getRelease())
{ {
entry->setCondition("if-has-release", true); entry->setCondition("if-has-release", true);