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

Still converting to bootstrap 5

Browse Source
This commit is contained in:
emeric
2022-04-04 21:38:15 +02:00
parent 9ac4157a1a
commit 80f28153bc
2 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/playqueue.xml
+20 -30
View File
@@ -2,54 +2,44 @@
<messages xmlns:if="Wt.WTemplate.conditions"> <messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks--> <!--FORMS message blocks-->
<message id="Lms.PlayQueue.template.clear-btn"><i class="fa fa-fw fa-times-circle"></i></message> <message id="Lms.PlayQueue.template.clear-btn"><i class="fa fa-2x fa-times-circle"></i></message>
<message id="Lms.PlayQueue.template.shuffle-btn"><i class="fa fa-fw fa-random"></i></message> <message id="Lms.PlayQueue.template.shuffle-btn"><i class="fa fa-2x fa-random"></i></message>
<message id="Lms.PlayQueue.template.repeat-btn"><i class="fa fa-fw fa-repeat"></i></message> <message id="Lms.PlayQueue.template.repeat-btn"><i class="fa fa-2x fa-repeat"></i></message>
<message id="Lms.PlayQueue.template.radio-btn"><i class="fa fa-fw fa-rss"></i></message> <message id="Lms.PlayQueue.template.radio-btn"><i class="fa fa-2x fa-rss"></i></message>
<message id="Lms.PlayQueue.template"> <message id="Lms.PlayQueue.template">
<div class="Lms-header"> <div class="mb-3">
${clear-btn class="Lms-playqueue-btn Lms-btn"}${shuffle-btn class="Lms-playqueue-btn Lms-btn"}${repeat-btn class="Lms-playqueue-btn Lms-btn"}${radio-btn class="Lms-playqueue-btn Lms-btn"} ${clear-btn class="me-2"}${shuffle-btn class="me-2"}${repeat-btn class="me-2"}${radio-btn class="me-2"}
<h4><small>${nb-tracks}</small></h4> ${nb-tracks}
</div>
<div class="row">
<div class="col-lg-8">
${entries}
</div>
</div> </div>
${entries}
</message> </message>
<message id="Lms.PlayQueue.template.play-btn"><i class="fa fa-fw fa-play-circle"></i></message> <message id="Lms.PlayQueue.template.play-btn"><i class="fa fa-2x fa-play-circle"></i></message>
<message id="Lms.PlayQueue.template.delete-btn"><i class="fa fa-fw fa-times-circle"></i></message> <message id="Lms.PlayQueue.template.delete-btn"><i class="fa fa-2x fa-times-circle"></i></message>
<message id="Lms.PlayQueue.template.more-btn"><i class="fa fa-fw fa-plus-circle"></i></message> <message id="Lms.PlayQueue.template.more-btn"><i class="fa fa-2x fa-plus-circle"></i></message>
<message id="Lms.PlayQueue.template.entry"> <message id="Lms.PlayQueue.template.entry">
<div class="row Lms-vertical-align Lms-explore-entry-list Lms-playqueue-entry ${is-selected}"> <div class="row Lms-vertical-align Lms-explore-entry-list Lms-playqueue-entry ${is-selected}">
<div class="col-xs-3 col-sm-2 col-md-2"> <div class="col-3 col-sm-2 col-md-2">
<div class="Lms-responsive-square Lms-cover-container"> ${cover}
${cover}
</div>
</div> </div>
<div class="col-xs-7 col-sm-8 col-md-8 Lms-explore-entry-list-text-container"> <div class="col-7 col-sm-8 col-md-8">
<div class="Lms-trackname text-primary"><h5>${name}</h5></div> ${name}
${<if-has-artists-or-release>} ${<if-has-artists-or-release>}
${<if-has-release>}<small>${release class="Lms-btn Lms-releasename text-primary"}</small>${</if-has-release>} ${<if-has-release>}${release}${</if-has-release>}
${<if-has-artists>}${artists}${</if-has-artists>} ${<if-has-artists>}${artists}${</if-has-artists>}
${</if-has-artists-or-release>} ${</if-has-artists-or-release>}
</div> </div>
<div class="col-xs-2 col-sm-2 col-md-2"> <div class="col-2 col-sm-2 col-md-2">
<div class="Lms-playqueue-entry-controls Lms-vertical-align"> ${duration}
${play-btn class="Lms-playqueue-btn Lms-btn"}${del-btn class="Lms-playqueue-btn Lms-btn"}<span class="hidden-xs Lms-playqueue-btn Lms-btn">${more-btn}</span> ${play-btn class="me-2"}${del-btn class="me-2"}${more-btn}
</div>
<div class="Lms-playqueue-entry-duration text-muted">
${duration}
</div>
</div> </div>
</div> </div>
</message> </message>
<message id="Lms.PlayQueue.template.entry-artist"> <message id="Lms.PlayQueue.template.entry-artist">
<small>${artist class="Lms-btn Lms-artistname text-muted"}</small> ${artist}
</message> </message>
</messages> </messages>
src/lms/ui/PlayQueue.cpp
+2 -2
View File
@@ -442,7 +442,7 @@ PlayQueue::addEntry(const Database::TrackListEntry::pointer& tracklistEntry)
Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false));
auto cover = std::make_unique<Wt::WImage>(); auto cover = std::make_unique<Wt::WImage>();
cover->setImageLink(LmsApp->getCoverResource()->getReleaseUrl(release->getId(), CoverResource::Size::Large)); cover->setImageLink(LmsApp->getCoverResource()->getReleaseUrl(release->getId(), CoverResource::Size::Large));
cover->setStyleClass("Lms-cover"); cover->setStyleClass("img-fluid");
cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)"); cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
anchor->setImage(std::move(cover)); anchor->setImage(std::move(cover));
} }
@@ -451,7 +451,7 @@ PlayQueue::addEntry(const Database::TrackListEntry::pointer& tracklistEntry)
{ {
auto cover = entry->bindNew<Wt::WImage>("cover"); auto cover = entry->bindNew<Wt::WImage>("cover");
cover->setImageLink(LmsApp->getCoverResource()->getTrackUrl(track->getId(), CoverResource::Size::Large)); cover->setImageLink(LmsApp->getCoverResource()->getTrackUrl(track->getId(), CoverResource::Size::Large));
cover->setStyleClass("Lms-cover"); cover->setStyleClass("img-fluid");
cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)"); cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
} }