From 2881f300c44b0a84dffe0b786d787193aaed9eda Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 1 Apr 2023 15:00:47 +0200 Subject: [PATCH] Updated some views --- approot/admin-users.xml | 2 +- approot/playqueue.xml | 7 ++++++- approot/release.xml | 26 +++++++++++++++++--------- approot/tracklist.xml | 5 +++++ approot/tracks.xml | 27 ++++++++++++++++----------- docroot/css/lms.css | 27 ++++++++++++++++++++++++++- src/lms/ui/PlayQueue.cpp | 2 +- src/lms/ui/explore/ReleaseView.cpp | 6 ++++++ src/lms/ui/explore/TrackListView.cpp | 2 +- src/lms/ui/explore/TracksView.cpp | 2 +- 10 files changed, 80 insertions(+), 26 deletions(-) diff --git a/approot/admin-users.xml b/approot/admin-users.xml index ec9417f6..7b43499c 100644 --- a/approot/admin-users.xml +++ b/approot/admin-users.xml @@ -3,7 +3,7 @@

${tr:Lms.Admin.Users.users}

- ${users class="d-grid gap-1 mb-3"} + ${users class="d-grid gap-1 mb-3 Lms-row-container"} ${} ${add-btn class="btn btn-primary"} ${} diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 00a802f5..b9249126 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -30,8 +30,13 @@ ${entries} + + ${elements class="Lms-row-container"} + ${loading-indicator} + + -
+
${cover}
diff --git a/approot/release.xml b/approot/release.xml index 79e3c0d1..91a38f6f 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -51,30 +51,38 @@

${disc-title}

- ${tracks class="d-grid gap-1"} + ${tracks class="d-grid gap-1 Lms-row-container"} - ${tracks class="d-grid gap-1"} + ${tracks class="d-grid gap-1 Lms-row-container"} -
-
+
+
${}${track-number}${}
-
- ${name} - ${}${artists}${} +
+
+
+ ${name} + ${}${artists class="d-block d-md-none"}${} +
+
+
+ ${}${artists-md class="d-none d-md-block"}${} +
-
+
${duration}
- ${play-btn class="btn btn-sm btn-outline-secondary border-0"} + ${play-btn class="d-none d-sm-block btn btn-sm btn-outline-secondary border-0"}
${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
    +
  • ${play class="dropdown-item"}
  • ${play-last class="dropdown-item"}
  • ${star class="dropdown-item"}
  • ${download class="dropdown-item"}
    • diff --git a/approot/tracklist.xml b/approot/tracklist.xml index bb1af88b..8748630a 100644 --- a/approot/tracklist.xml +++ b/approot/tracklist.xml @@ -21,6 +21,11 @@ ${tracks} + + ${elements class="Lms-row-container"} + ${loading-indicator} + +
    diff --git a/approot/tracks.xml b/approot/tracks.xml index 74cd2b77..6755bcc0 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -37,26 +37,31 @@ ${tracks} + + ${elements class="Lms-row-container"} + ${loading-indicator} + + -
    +
    ${cover}
    -
    -
    -
    +
    +
    +
    ${name}
    ${}${artists class="d-block d-md-none text-truncate"}${}
    -
    - ${}${artists-md class="d-none d-md-block text-truncate"}${} -
    -
    - ${}${release class="d-none d-lg-block text-truncate text-decoration-none link-success"}${} -
    +
    +
    + ${}${artists-md class="d-none d-md-block text-truncate"}${} +
    +
    + ${}${release class="d-none d-lg-inline text-truncate text-decoration-none link-success"}${}
    -
    +
    ${duration}
    diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 41839ce7..74115310 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -1,5 +1,9 @@ /* Generic rules */ +:root { + --lms-striped-bg: #022f3a; +} + .link-success { transition: color 0.15s ease; } @@ -16,6 +20,19 @@ background-color: var(--bs-dark); } +.Lms-row-container { + --lms-striped-bg: #022f3a; + --lms-hover-bg: var(--bs-dark); +} + +.Lms-row-container > :nth-child(odd) { + background-color: var(--lms-striped-bg); +} + +.Lms-row-container > *:hover { + background-color: var(--lms-hover-bg); +} + /* Specific rules */ body { padding-bottom: 78px; @@ -32,7 +49,7 @@ body { } .Lms-entry-playing { - background-color: var(--bs-dark); + background-color: #0d4655!important; } .Lms-cover { @@ -144,3 +161,11 @@ body { display: block; padding-bottom: 100%; } + +.Lms-tracks-entry-position{ + width: 2.1rem; +} + +.Lms-tracks-entry-duration { + width: 4rem; +} diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp index e04d7443..c4b6c0f7 100644 --- a/src/lms/ui/PlayQueue.cpp +++ b/src/lms/ui/PlayQueue.cpp @@ -136,7 +136,7 @@ PlayQueue::PlayQueue() saveAsTrackList(); }); - _entriesContainer = bindNew("entries"); + _entriesContainer = bindNew("entries", Wt::WString::tr("Lms.PlayQueue.template.entry-container")); _entriesContainer->onRequestElements.connect([this] { addSome(); diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index e9839b40..0a7c36ac 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -382,6 +382,7 @@ Release::refreshView() { entry->setCondition("if-has-artists", true); entry->bindWidget("artists", Utils::createArtistContainer(artists)); + entry->bindWidget("artists-md", Utils::createArtistContainer(artists)); } auto trackNumber {track->getTrackNumber()}; @@ -399,6 +400,11 @@ Release::refreshView() { entry->bindNew("more-btn", Wt::WString::tr("Lms.template.more-btn"), Wt::TextFormat::XHTML); + entry->bindNew("play", Wt::WString::tr("Lms.Explore.play")) + ->clicked().connect([=] + { + _playQueueController.playTrackInRelease(trackId); + }); entry->bindNew("play-last", Wt::WString::tr("Lms.Explore.play-last")) ->clicked().connect([=] { diff --git a/src/lms/ui/explore/TrackListView.cpp b/src/lms/ui/explore/TrackListView.cpp index 3039ef81..7bf42501 100644 --- a/src/lms/ui/explore/TrackListView.cpp +++ b/src/lms/ui/explore/TrackListView.cpp @@ -174,7 +174,7 @@ namespace UserInterface LmsApp->getModalManager().show(std::move(modal)); }); - _container = bindNew("tracks"); + _container = bindNew("tracks", Wt::WString::tr("Lms.Explore.TrackList.template.entry-container")); _container->onRequestElements.connect([this] { addSome(); diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp index b3488767..22cd1d8e 100644 --- a/src/lms/ui/explore/TracksView.cpp +++ b/src/lms/ui/explore/TracksView.cpp @@ -86,7 +86,7 @@ Tracks::Tracks(Filters& filters, PlayQueueController& playQueueController) _playQueueController.processCommand(PlayQueueController::Command::PlayOrAddLast, getAllTracks()); }); - _container = bindNew("tracks"); + _container = bindNew("tracks", Wt::WString::tr("Lms.Explore.Tracks.template.entry-container")); _container->onRequestElements.connect([this] { addSome();