owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New layout test

Browse Source
This commit is contained in:
emeric
2023-03-27 20:59:21 +02:00
parent a62810e47a
commit faf6aca874
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/playqueue.xml
+1 -1
View File
@@ -32,7 +32,7 @@
<message id="Lms.PlayQueue.template.entry"> <message id="Lms.PlayQueue.template.entry">
<div class="d-flex align-items-center rounded Lms-bg-dark-hover mb-2"> <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} ${cover}
</div> </div>
<div class="p-2 flex-fill text-truncate"> <div class="p-2 flex-fill text-truncate">
approot/tracks.xml
+14 -6
View File
@@ -39,24 +39,32 @@
<message id="Lms.Explore.Tracks.template.entry"> <message id="Lms.Explore.Tracks.template.entry">
<div class="d-flex align-items-center rounded Lms-bg-dark-hover mb-2"> <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} ${cover}
</div> </div>
<div class="p-2 flex-fill text-truncate"> <div class="p-2 flex-fill text-truncate">
<div class="d-block text-truncate">${name}</div> <div class="row">
<div class="text-truncate"> <div class="col-12 col-md-6 col-lg-4">
${<if-has-artists>}${artists class="d-none d-sm-inline"}${</if-has-artists>} <div class="d-block text-truncate">${name}</div>
${<if-has-release>}${release class="d-inline text-decoration-none link-success"}${</if-has-release>} ${<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> </div>
<div class="p-2 d-none d-sm-block text-muted"> <div class="p-2 d-none d-sm-block text-muted">
${duration} ${duration}
</div> </div>
<div class="p-2 d-flex"> <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"> <div class="dropdown d-inline-block">
${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"} ${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}"> <ul class="dropdown-menu" aria-labelledby="${id:more-btn}">
<li>${play class="dropdown-item"}</li>
<li>${play-last class="dropdown-item"}</li> <li>${play-last class="dropdown-item"}</li>
<li>${star class="dropdown-item"}</li> <li>${star class="dropdown-item"}</li>
<li>${download class="dropdown-item"}</li> <li>${download class="dropdown-item"}</li>
src/lms/ui/explore/TrackListHelpers.cpp
+7 -3
View File
@@ -166,9 +166,8 @@ namespace UserInterface::TrackListHelpers
if (!artists.empty()) if (!artists.empty())
{ {
entry->setCondition("if-has-artists", true); entry->setCondition("if-has-artists", true);
Wt::WContainerWidget* artistsContainer {entry->bindWidget("artists", Utils::createArtistContainer(artists))}; entry->bindWidget("artists", Utils::createArtistContainer(artists));
if (track->getRelease()) entry->bindWidget("artists-md", Utils::createArtistContainer(artists));
artistsContainer->addNew<Wt::WText>(" — ");
} }
if (track->getRelease()) 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>("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")) entry->bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last"))
->clicked().connect([=, &playQueueController] ->clicked().connect([=, &playQueueController]
{ {