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-03 20:10:02 +02:00
parent 682922bfe5
commit 9ac4157a1a
6 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/artist.xml
-17
View File
@@ -36,21 +36,4 @@
</div> </div>
</message> </message>
<message id="Lms.Explore.Artist.template.entry">
<div class="Lms-explore-entry-list">
<div class="row Lms-vertical-align">
<div class="col-xs-4 col-sm-3 col-md-2">
<div class="Lms-responsive-square Lms-cover-container">
${cover}
</div>
</div>
<div class="col-xs-8 col-sm-9 col-md-10 Lms-explore-list-entry-text-container">
<h5>${name class="Lms-releasename text-primary"}</h5>
${<if-has-artist>}<h6>${artist class="Lms-btn Lms-artistname text-muted"}</h6>${</if-has-artist>}
<h6><small><div class="text-muted">${<if-has-year>}${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</div></small></h6>
</div>
</div>
</div>
</message>
</messages> </messages>
approot/misc.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</message> </message>
<message id="Lms.infinite-scrolling-container"> <message id="Lms.infinite-scrolling-container">
${elements} ${elements class="d-grid gap-3"}
${loading-indicator} ${loading-indicator}
</message> </message>
approot/release.xml
+2 -2
View File
@@ -20,7 +20,7 @@
${clusters class="mb-2"} ${clusters class="mb-2"}
${play-btn class="me-2"}${more-btn} ${play-btn class="me-2"}${more-btn}
</div> </div>
${container} ${container class="d-grid gap-3"}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@@ -51,7 +51,7 @@
<message id="Lms.Explore.Release.template.entry-disc"> <message id="Lms.Explore.Release.template.entry-disc">
<h4>${disc-title}</h4> <h4>${disc-title}</h4>
${tracks} ${tracks class="d-grid gap-1"}
</message> </message>
<message id="Lms.Explore.Release.template.entry"> <message id="Lms.Explore.Release.template.entry">
approot/tracks.xml
+5 -9
View File
@@ -13,25 +13,21 @@
<message id="Lms.Explore.Tracks.template.entry"> <message id="Lms.Explore.Tracks.template.entry">
<div class="row Lms-vertical-align Lms-explore-entry-list Lms-explore-tracks-entry ${is-playing}"> <div class="row Lms-vertical-align Lms-explore-entry-list Lms-explore-tracks-entry ${is-playing}">
<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"> <div class="Lms-responsive-square Lms-cover-container">
${cover} ${cover}
</div> </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 Lms-explore-entry-list-text-container">
<div class="Lms-trackname text-primary"><h5>${name}</h5></div> <div class="Lms-trackname text-primary"><h5>${name}</h5></div>
${<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>}<small>${release class="Lms-btn Lms-releasename text-primary"}</small>${</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-explore-tracks-entry-controls"> ${duration}
${play-btn class="Lms-explore-btn Lms-btn"}${more-btn class="Lms-explore-btn Lms-btn"} ${play-btn class="me-2"}${more-btn}
</div>
<div class="Lms-explore-tracks-entry-duration text-muted">
${duration}
</div>
</div> </div>
</div> </div>
</message> </message>
src/lms/ui/explore/ReleaseView.cpp
+1 -1
View File
@@ -135,7 +135,7 @@ Release::refreshView()
{ {
Wt::WImage* cover {bindNew<Wt::WImage>("cover", Wt::WLink(LmsApp->getCoverResource()->getReleaseUrl(release->getId(), CoverResource::Size::Large)))}; Wt::WImage* cover {bindNew<Wt::WImage>("cover", Wt::WLink(LmsApp->getCoverResource()->getReleaseUrl(release->getId(), CoverResource::Size::Large)))};
cover->setStyleClass("Lms-cover-large"); cover->setStyleClass("img-fluid");
cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)"); cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
} }
src/lms/ui/explore/TrackListHelpers.cpp
+2 -2
View File
@@ -74,7 +74,7 @@ namespace UserInterface::TrackListHelpers
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));
} }
@@ -83,7 +83,7 @@ namespace UserInterface::TrackListHelpers
{ {
auto* cover {entry->bindNew<Wt::WImage>("cover")}; auto* cover {entry->bindNew<Wt::WImage>("cover")};
cover->setImageLink(LmsApp->getCoverResource()->getTrackUrl(trackId, CoverResource::Size::Large)); cover->setImageLink(LmsApp->getCoverResource()->getTrackUrl(trackId, 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)");
} }