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

Remove header title from main views, and set them active in the navbar

Browse Source
This commit is contained in:
emeric
2020-09-03 10:54:15 +02:00
parent 4a101f4fb7
commit de67c5316d
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/artists.xml
-1
View File
@@ -4,7 +4,6 @@
<message id="Lms.Explore.Artists.template"> <message id="Lms.Explore.Artists.template">
<div class="Lms-header"> <div class="Lms-header">
<h2>${tr:Lms.Explore.artists}</h2>
${mode class="nav nav-pills Lms-explore-mode-container"} ${mode class="nav nav-pills Lms-explore-mode-container"}
<div class="row"> <div class="row">
<div class="col-sm-2"> <div class="col-sm-2">
approot/playqueue.xml
-1
View File
@@ -11,7 +11,6 @@
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-8">
<div class="Lms-header"> <div class="Lms-header">
<h2>${tr:Lms.PlayQueue.playqueue}</h2>
${clear-btn}${shuffle-btn}${repeat-btn}${radio-btn} ${clear-btn}${shuffle-btn}${repeat-btn}${radio-btn}
<h4><small>${nb-tracks}</small></h4> <h4><small>${nb-tracks}</small></h4>
</div> </div>
approot/releases.xml
-1
View File
@@ -4,7 +4,6 @@
<message id="Lms.Explore.Releases.template"> <message id="Lms.Explore.Releases.template">
<div class="Lms-header"> <div class="Lms-header">
<h2>${tr:Lms.Explore.releases}</h2>
${mode class="nav nav-pills Lms-explore-mode-container"} ${mode class="nav nav-pills Lms-explore-mode-container"}
${play-btn}${more-btn} ${play-btn}${more-btn}
</div> </div>
approot/templates.xml
+4 -4
View File
@@ -18,10 +18,10 @@
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li>${artists class="Lms-btn"}</li> <li class="${artists-active}">${artists class="Lms-btn"}</li>
<li>${releases class="Lms-btn"}</li> <li class="${releases-active}">${releases class="Lms-btn"}</li>
<li>${tracks class="Lms-btn"}</li> <li class="${tracks-active}">${tracks class="Lms-btn"}</li>
<li>${playqueue class="Lms-btn"}</li> <li class="${playqueue-active}">${playqueue class="Lms-btn"}</li>
</ul> </ul>
<div class="navbar-form navbar-left"> <div class="navbar-form navbar-left">
${filters class="form-group Lms-clusters-control"} ${filters class="form-group Lms-clusters-control"}
approot/tracks.xml
-1
View File
@@ -7,7 +7,6 @@
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-8">
<div class="Lms-header"> <div class="Lms-header">
<h2>${tr:Lms.Explore.tracks}</h2>
${mode class="nav nav-pills Lms-explore-mode-container"} ${mode class="nav nav-pills Lms-explore-mode-container"}
${play-btn}${more-btn} ${play-btn}${more-btn}
</div> </div>
src/lms/ui/LmsApplication.cpp
+11 -5
View File
@@ -347,8 +347,9 @@ enum IdxRoot
IdxAdminUser, IdxAdminUser,
}; };
static void static
handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) void
handlePathChange(Wt::WTemplate& main, Wt::WStackedWidget& stack, bool isAdmin)
{ {
static const struct static const struct
{ {
@@ -372,6 +373,11 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin)
LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'";
main.bindString("artists-active", wApp->internalPathMatches("/artists") ? "active" : "");
main.bindString("releases-active", wApp->internalPathMatches("/releases") ? "active" : "");
main.bindString("tracks-active", wApp->internalPathMatches("/tracks") ? "active" : "");
main.bindString("playqueue-active", wApp->internalPathMatches("/playqueue") ? "active" : "");
for (const auto& view : views) for (const auto& view : views)
{ {
if (wApp->internalPathMatches(view.path)) if (wApp->internalPathMatches(view.path))
@@ -379,7 +385,7 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin)
if (view.admin && !isAdmin) if (view.admin && !isAdmin)
break; break;
stack->setCurrentIndex(view.index); stack.setCurrentIndex(view.index);
return; return;
} }
} }
@@ -597,10 +603,10 @@ LmsApplication::createHome()
internalPathChanged().connect([=] internalPathChanged().connect([=]
{ {
handlePathChange(mainStack, isUserAdmin()); handlePathChange(*main, *mainStack, isUserAdmin());
}); });
handlePathChange(mainStack, isUserAdmin()); handlePathChange(*main, *mainStack, isUserAdmin());
} }
void void