From 65269904dfa532f3bda21facdeca9f5eade81435 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 31 Aug 2018 14:17:39 +0200 Subject: [PATCH] Simplified the artists view --- approot/artists.xml | 7 ++++--- docroot/css/lms.css | 16 +++------------- src/ui/explore/ArtistsView.cpp | 21 --------------------- 3 files changed, 7 insertions(+), 37 deletions(-) diff --git a/approot/artists.xml b/approot/artists.xml index 19470876..8119f94b 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -17,9 +17,10 @@ -
-

${name}

- ${nb-release} +
+
+

${name}

+
diff --git a/docroot/css/lms.css b/docroot/css/lms.css index c965dc27..1bfeb730 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -99,21 +99,15 @@ a:hover { box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); } -.Lms-explore-release-entry { - height: 28px; +.Lms-explore-release-entry-name { + margin-top: 4px; + margin-bottom: 4px; } .Lms-explore-release-entry:hover { background-color: lightgrey; } -.Lms-explore-release-entry-name { - line-height: 28px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; -} - .Lms-explore-release-entry-controls { text-align: center; } @@ -126,10 +120,6 @@ a:hover { background-color: lightgrey; } -.Lms-explore-artists-entry-nb-releases { - margin: 8px; -} - .Lms-explore-btn { font-size: 22px !important; cursor: pointer; diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 78d202aa..aa2ba77c 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -87,28 +87,7 @@ Artists::addSome() { Wt::WTemplate* entry = _container->addNew(Wt::WString::tr("Lms.Explore.Artists.template.entry")); - entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); - - - Wt::WContainerWidget* clusterContainers = entry->bindNew("clusters"); - { - auto clusterTypes = ScanSettings::get(LmsApp->getDboSession())->getClusterTypes(); - auto clusterGroups = artist->getClusterGroups(clusterTypes, 1); - - for (auto clusters : clusterGroups) - { - for (auto cluster : clusters) - { - auto clusterId = cluster.id(); - auto entry = clusterContainers->addWidget(LmsApp->createCluster(cluster)); - entry->clicked().connect([=] - { - _filters->add(clusterId); - }); - } - } - } } _showMore->setHidden(!moreResults);