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

Better play/add buttons

Browse Source
This commit is contained in:
emeric
2018-08-30 14:47:49 +02:00
parent b0956925bd
commit 5532c017cb
10 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/artist.xml
-8
View File
@@ -2,14 +2,6 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="Lms.Explore.Artist.play">
<i class="fa fa-play"></i>
</message>
<message id="Lms.Explore.Artist.add">
<i class="fa fa-plus"></i>
</message>
<message id="Lms.Explore.Artist.template">
<div class="page-header">
<h2>${name}</h2>
approot/explore.xml
+8
View File
@@ -13,6 +13,14 @@
</div>
</message>
<message id="Lms.Explore.template.add-btn">
<i class="fa fa-plus-circle Lms-explore-btn"></i>
</message>
<message id="Lms.Explore.template.play-btn">
<i class="fa fa-play-circle Lms-explore-btn"></i>
</message>
<message id="Lms.Explore.template.show-more">
${tr:Lms.Explore.show-more}
</message>
approot/release.xml
+11 -12
View File
@@ -2,14 +2,6 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="Lms.Explore.Release.play">
<i class="fa fa-play"></i>
</message>
<message id="Lms.Explore.Release.add">
<i class="fa fa-plus"></i>
</message>
<message id="Lms.Explore.Release.template">
<div class="row">
<div class="col-md-12">
@@ -27,10 +19,17 @@
</message>
<message id="Lms.Explore.Release.template.entry">
${<if-has-disc-number>}${disc-number}-${</if-has-disc-number>}${<if-has-track-number>}${track-number}. ${</if-has-track-number>}
${<if-has-artist>}${artist-name} - ${</if-has-artist>}
${name}
${play-btn}${add-btn}
<div class="row">
<div class="col-xs-9">
${<if-has-disc-number>}${disc-number}-${</if-has-disc-number>}${<if-has-track-number>}${track-number}. ${</if-has-track-number>}
${<if-has-artist>}${artist-name} - ${</if-has-artist>}
${name}
</div>
<div class="col-xs-3">
${play-btn}${add-btn}
</div>
</div>
</message>
approot/releases.xml
-8
View File
@@ -16,14 +16,6 @@
${show-more}
</message>
<message id="Lms.Explore.Releases.play">
<i class="fa fa-play"></i>
</message>
<message id="Lms.Explore.Releases.add">
<i class="fa fa-plus"></i>
</message>
<message id="Lms.Explore.Releases.template.entry">
<div class="media list-group-item">
<div class="pull-left media-middle">
approot/tracks.xml
-8
View File
@@ -18,14 +18,6 @@
${show-more}
</message>
<message id="Lms.Explore.Tracks.play">
<i class="fa fa-play"></i>
</message>
<message id="Lms.Explore.Tracks.add">
<i class="fa fa-plus"></i>
</message>
<message id="Lms.Explore.Tracks.template.entry">
<div class="media list-group-item">
<div class="pull-left media-middle">
docroot/css/lms.css
+19
View File
@@ -1,49 +1,64 @@
body {
margin-bottom: 16px;
}
.Lms-vertical-align {
display: flex;
align-items: center;
}
.Lms-cluster {
display: inline;
}
.Lms-cluster-type-0 {
background-color: darkslategrey;
margin-bottom: 4px;
}
.Lms-cluster-type-1 {
background-color: darkblue;
margin-bottom: 4px;
}
.Lms-cluster-type-2 {
background-color: darkgrey;
margin-bottom: 4px;
}
.Lms-cluster-type-3 {
background-color: darkorchid;
margin-bottom: 4px;
}
.Lms-cluster-type-4 {
background-color: darkgoldenrod;
margin-bottom: 4px;
}
.Lms-cluster-type-5 {
background-color: darkkhaki;
margin-bottom: 4px;
}
.Lms-cluster-type-6 {
background-color: darkolivegreen;
margin-bottom: 4px;
}
.Lms-cluster-type-7 {
background-color: darkred;
margin-bottom: 4px;
}
.Lms-cluster-type-8 {
background-color: darkviolet;
margin-bottom: 4px;
}
.Lms-cluster-type-9 {
background-color: darkturquoise;
margin-bottom: 4px;
}
.Lms-playqueue-selected {
@@ -71,6 +86,10 @@
max-width: 100%;
}
.Lms-explore-btn {
font-size: 22px !important;
}
.Lms-player {
position: fixed;
bottom: 0;
src/ui/explore/ArtistView.cpp
+4 -4
View File
@@ -99,7 +99,7 @@ Artist::refresh()
t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::TextFormat::Plain);
{
Wt::WText* playBtn = t->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.Artist.play"), Wt::TextFormat::XHTML);
Wt::WText* playBtn = t->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
playBtn->clicked().connect(std::bind([=]
{
@@ -108,7 +108,7 @@ Artist::refresh()
}
{
Wt::WText* addBtn = t->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.Artist.add"), Wt::TextFormat::XHTML);
Wt::WText* addBtn = t->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
addBtn->clicked().connect(std::bind([=]
{
@@ -155,13 +155,13 @@ Artist::refresh()
}
}
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.Artist.play"), Wt::TextFormat::XHTML);
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
playBtn->clicked().connect(std::bind([=]
{
releasePlay.emit(releaseId);
}));
Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.Artist.add"), Wt::TextFormat::XHTML);
Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
addBtn->clicked().connect(std::bind([=]
{
releaseAdd.emit(releaseId);
src/ui/explore/ReleaseView.cpp
+10 -10
View File
@@ -50,9 +50,9 @@ Release::Release(Filters* filters)
refresh();
filters->updated().connect(std::bind([=] {
filters->updated().connect([=] {
refresh();
}));
});
}
void
@@ -131,19 +131,19 @@ Release::refresh()
}
{
Wt::WText* playBtn = t->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.Release.play"), Wt::TextFormat::XHTML);
playBtn->clicked().connect(std::bind([=]
Wt::WText* playBtn = t->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
playBtn->clicked().connect([=]
{
releasePlay.emit(*releaseId);
}));
});
}
{
Wt::WText* addBtn = t->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.Release.add"), Wt::TextFormat::XHTML);
addBtn->clicked().connect(std::bind([=]
Wt::WText* addBtn = t->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
addBtn->clicked().connect([=]
{
releaseAdd.emit(*releaseId);
}));
});
}
Wt::WContainerWidget* tracksContainer = t->bindNew<Wt::WContainerWidget>("tracks");
@@ -181,13 +181,13 @@ Release::refresh()
entry->bindInt("disc-number", *discNumber);
}
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.Release.play"), Wt::TextFormat::XHTML);
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
playBtn->clicked().connect(std::bind([=]
{
trackPlay.emit(trackId);
}));
Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.Release.add"), Wt::TextFormat::XHTML);
Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
addBtn->clicked().connect(std::bind([=]
{
trackAdd.emit(trackId);
src/ui/explore/ReleasesView.cpp
+8 -8
View File
@@ -52,10 +52,10 @@ _filters(filters)
_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
_showMore->clicked().connect(std::bind([=]
_showMore->clicked().connect([=]
{
addSome();
}));
});
refresh();
@@ -126,17 +126,17 @@ Releases::addSome()
}
}
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.Releases.play"), Wt::TextFormat::XHTML);
playBtn->clicked().connect(std::bind([=]
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
playBtn->clicked().connect([=]
{
releasePlay.emit(releaseId);
}));
});
Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.Releases.add"), Wt::TextFormat::XHTML);
addBtn->clicked().connect(std::bind([=]
Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
addBtn->clicked().connect([=]
{
releaseAdd.emit(releaseId);
}));
});
}
_showMore->setHidden(!moreResults);
src/ui/explore/TracksView.cpp
+4 -4
View File
@@ -50,14 +50,14 @@ _filters(filters)
_search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder"));
_search->textInput().connect(this, &Tracks::refresh);
Wt::WText* playBtn = bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::TextFormat::XHTML);
Wt::WText* playBtn = bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
playBtn->clicked().connect(std::bind([=]
{
Wt::Dbo::Transaction transaction(LmsApp->getDboSession());
tracksPlay.emit(getTracks());
}));
Wt::WText* addBtn = bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::TextFormat::XHTML);
Wt::WText* addBtn = bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
addBtn->clicked().connect(std::bind([=]
{
Wt::Dbo::Transaction transaction(LmsApp->getDboSession());
@@ -153,13 +153,13 @@ Tracks::addSome()
}
}
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::TextFormat::XHTML);
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
playBtn->clicked().connect(std::bind([=]
{
trackPlay.emit(trackId);
}));
Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::TextFormat::XHTML);
Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
addBtn->clicked().connect(std::bind([=]
{
trackAdd.emit(trackId);