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

Added a style to the show more option

Browse Source
This commit is contained in:
emeric
2018-08-31 16:58:39 +02:00
parent 46f550f7b9
commit 41f37a5a52
17 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/artists.xml
+5 -1
View File
@@ -13,7 +13,11 @@
</div> </div>
</div> </div>
${artists} ${artists}
${show-more} <div class="row">
<div class="col-xs-12 Lms-horizontal-center">
${show-more class="btn-primary"}
</div>
</div>
</message> </message>
<message id="Lms.Explore.Artists.template.entry"> <message id="Lms.Explore.Artists.template.entry">
approot/explore.xml
-4
View File
@@ -21,10 +21,6 @@
<i class="fa fa-play-circle Lms-explore-btn"></i> <i class="fa fa-play-circle Lms-explore-btn"></i>
</message> </message>
<message id="Lms.Explore.template.show-more">
${tr:Lms.Explore.show-more}
</message>
<message id="Lms.Explore.template.filters"> <message id="Lms.Explore.template.filters">
<h3>${tr:Lms.Explore.filters} ${add-filter class="btn-primary"}</h3> <h3>${tr:Lms.Explore.filters} ${add-filter class="btn-primary"}</h3>
${clusters} ${clusters}
approot/playhistory.xml
+5 -1
View File
@@ -7,7 +7,11 @@
<h2>${tr:Lms.PlayHistory.playhistory}</h2> <h2>${tr:Lms.PlayHistory.playhistory}</h2>
</div> </div>
${entries} ${entries}
${show-more} <div class="row">
<div class="col-xs-12 Lms-horizontal-center">
${show-more class="btn-primary"}
</div>
</div>
</message> </message>
<message id="Lms.PlayHistory.template.entry"> <message id="Lms.PlayHistory.template.entry">
approot/playqueue.xml
+7 -3
View File
@@ -19,15 +19,19 @@
${radio-mode} ${radio-mode}
</div> </div>
${entries} ${entries}
${show-more} <div class="row">
<div class="col-xs-12 Lms-horizontal-center">
${show-more class="btn-primary"}
</div>
</div>
</message> </message>
<message id="Lms.PlayQueue.play"> <message id="Lms.PlayQueue.play">
<i class="fa fa-play Lms-playqueue-btn"></i> <i class="fa fa-play-circle Lms-playqueue-btn"></i>
</message> </message>
<message id="Lms.PlayQueue.delete"> <message id="Lms.PlayQueue.delete">
<i class="fa fa-remove Lms-playqueue-btn"></i> <i class="fa fa-times-circle Lms-playqueue-btn"></i>
</message> </message>
<message id="Lms.PlayQueue.template.entry"> <message id="Lms.PlayQueue.template.entry">
approot/releases.xml
+5 -1
View File
@@ -13,7 +13,11 @@
</div> </div>
</div> </div>
${releases} ${releases}
${show-more} <div class="row">
<div class="col-xs-12 Lms-horizontal-center">
${show-more class="btn-primary"}
</div>
</div>
</message> </message>
<message id="Lms.Explore.Releases.template.entry"> <message id="Lms.Explore.Releases.template.entry">
approot/tracks.xml
+5 -1
View File
@@ -15,7 +15,11 @@
</div> </div>
</div> </div>
${tracks class="list-group"} ${tracks class="list-group"}
${show-more} <div class="row">
<div class="col-xs-12 Lms-horizontal-center">
${show-more class="btn-primary"}
</div>
</div>
</message> </message>
<message id="Lms.Explore.Tracks.template.entry"> <message id="Lms.Explore.Tracks.template.entry">
docroot/css/lms.css
+6
View File
@@ -17,6 +17,12 @@ a:hover {
align-items: center; align-items: center;
} }
.Lms-horizontal-center {
display: flex;
justify-content: center;
}
.Lms-cluster { .Lms-cluster {
display: inline; display: inline;
cursor: pointer; cursor: pointer;
src/ui/PlayHistoryView.cpp
+1 -3
View File
@@ -66,9 +66,7 @@ PlayHistory::PlayHistory()
_entriesContainer = bindNew<Wt::WContainerWidget>("entries"); _entriesContainer = bindNew<Wt::WContainerWidget>("entries");
// TODO move "Lms.Explore.show-more" _showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
_showMore->setHidden(true); _showMore->setHidden(true);
_showMore->clicked().connect([=] _showMore->clicked().connect([=]
src/ui/PlayHistoryView.hpp
+2 -1
View File
@@ -20,6 +20,7 @@
#pragma once #pragma once
#include <Wt/WContainerWidget.h> #include <Wt/WContainerWidget.h>
#include <Wt/WPushButton.h>
#include <Wt/WTemplate.h> #include <Wt/WTemplate.h>
#include "database/Types.hpp" #include "database/Types.hpp"
@@ -38,7 +39,7 @@ class PlayHistory : public Wt::WTemplate
void addSome(); void addSome();
Wt::WContainerWidget* _entriesContainer; Wt::WContainerWidget* _entriesContainer;
Wt::WTemplate* _showMore; Wt::WPushButton* _showMore;
}; };
} // namespace UserInterface } // namespace UserInterface
src/ui/PlayQueueView.cpp
+1 -2
View File
@@ -42,8 +42,7 @@ PlayQueue::PlayQueue()
_entriesContainer = bindNew<Wt::WContainerWidget>("entries"); _entriesContainer = bindNew<Wt::WContainerWidget>("entries");
_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.show-more")); _showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
_showMore->setHidden(true); _showMore->setHidden(true);
Wt::WText* shuffleBtn = bindNew<Wt::WText>("shuffle-btn", Wt::WString::tr("Lms.PlayQueue.shuffle"), Wt::TextFormat::XHTML); Wt::WText* shuffleBtn = bindNew<Wt::WText>("shuffle-btn", Wt::WString::tr("Lms.PlayQueue.shuffle"), Wt::TextFormat::XHTML);
src/ui/PlayQueueView.hpp
+2 -1
View File
@@ -21,6 +21,7 @@
#include <Wt/WCheckBox.h> #include <Wt/WCheckBox.h>
#include <Wt/WContainerWidget.h> #include <Wt/WContainerWidget.h>
#include <Wt/WPushButton.h>
#include <Wt/WSignal.h> #include <Wt/WSignal.h>
#include <Wt/WTemplate.h> #include <Wt/WTemplate.h>
#include <Wt/WText.h> #include <Wt/WText.h>
@@ -69,7 +70,7 @@ class PlayQueue : public Wt::WTemplate
boost::optional<Database::IdType> _tracklistId; boost::optional<Database::IdType> _tracklistId;
Wt::WCheckBox* _radioMode; Wt::WCheckBox* _radioMode;
Wt::WContainerWidget* _entriesContainer; Wt::WContainerWidget* _entriesContainer;
Wt::WTemplate* _showMore; Wt::WPushButton* _showMore;
Wt::WText* _nbTracks; Wt::WText* _nbTracks;
boost::optional<std::size_t> _trackPos; // current track position, if set boost::optional<std::size_t> _trackPos; // current track position, if set
}; };
src/ui/explore/ArtistsView.cpp
+1 -3
View File
@@ -48,9 +48,7 @@ Artists::Artists(Filters* filters)
_container = bindNew<Wt::WContainerWidget>("artists"); _container = bindNew<Wt::WContainerWidget>("artists");
_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.template.show-more")); _showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
_showMore->clicked().connect(std::bind([=] _showMore->clicked().connect(std::bind([=]
{ {
addSome(); addSome();
src/ui/explore/ArtistsView.hpp
+3 -2
View File
@@ -20,8 +20,9 @@
#pragma once #pragma once
#include <Wt/WContainerWidget.h> #include <Wt/WContainerWidget.h>
#include <Wt/WTemplate.h>
#include <Wt/WLineEdit.h> #include <Wt/WLineEdit.h>
#include <Wt/WPushButton.h>
#include <Wt/WTemplate.h>
#include <Wt/WSignal.h> #include <Wt/WSignal.h>
#include "database/Types.hpp" #include "database/Types.hpp"
@@ -43,7 +44,7 @@ class Artists : public Wt::WTemplate
void addSome(); void addSome();
Filters* _filters; Filters* _filters;
Wt::WTemplate* _showMore; Wt::WPushButton* _showMore;
Wt::WLineEdit* _search; Wt::WLineEdit* _search;
Wt::WContainerWidget* _container; Wt::WContainerWidget* _container;
}; };
src/ui/explore/ReleasesView.cpp
+1 -2
View File
@@ -50,8 +50,7 @@ _filters(filters)
_container = bindNew<Wt::WContainerWidget>("releases"); _container = bindNew<Wt::WContainerWidget>("releases");
_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.show-more")); _showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
_showMore->clicked().connect([=] _showMore->clicked().connect([=]
{ {
addSome(); addSome();
src/ui/explore/ReleasesView.hpp
+2 -1
View File
@@ -21,6 +21,7 @@
#include <Wt/WContainerWidget.h> #include <Wt/WContainerWidget.h>
#include <Wt/WLineEdit.h> #include <Wt/WLineEdit.h>
#include <Wt/WPushButton.h>
#include <Wt/WTemplate.h> #include <Wt/WTemplate.h>
#include "database/Types.hpp" #include "database/Types.hpp"
@@ -42,7 +43,7 @@ class Releases : public Wt::WTemplate
void addSome(); void addSome();
Filters* _filters; Filters* _filters;
Wt::WTemplate* _showMore; Wt::WPushButton* _showMore;
Wt::WLineEdit* _search; Wt::WLineEdit* _search;
Wt::WContainerWidget* _container; Wt::WContainerWidget* _container;
}; };
src/ui/explore/TracksView.cpp
+1 -2
View File
@@ -66,8 +66,7 @@ _filters(filters)
_tracksContainer = bindNew<Wt::WContainerWidget>("tracks"); _tracksContainer = bindNew<Wt::WContainerWidget>("tracks");
_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.template.show-more")); _showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
_showMore->clicked().connect(std::bind([=] _showMore->clicked().connect(std::bind([=]
{ {
addSome(); addSome();
src/ui/explore/TracksView.hpp
+2 -1
View File
@@ -21,6 +21,7 @@
#include <Wt/WContainerWidget.h> #include <Wt/WContainerWidget.h>
#include <Wt/WLineEdit.h> #include <Wt/WLineEdit.h>
#include <Wt/WPushButton.h>
#include <Wt/WTemplate.h> #include <Wt/WTemplate.h>
#include "database/Types.hpp" #include "database/Types.hpp"
@@ -48,7 +49,7 @@ class Tracks : public Wt::WTemplate
std::vector<Database::Track::pointer> getTracks(); std::vector<Database::Track::pointer> getTracks();
Wt::WContainerWidget* _tracksContainer; Wt::WContainerWidget* _tracksContainer;
Wt::WTemplate* _showMore; Wt::WPushButton* _showMore;
Wt::WLineEdit* _search; Wt::WLineEdit* _search;
Filters* _filters; Filters* _filters;
}; };