From d5f73dd4973036af12a41fa2f53bc76d7c4d0cf0 Mon Sep 17 00:00:00 2001 From: Eduardo Date: Tue, 31 Oct 2023 11:54:06 +0100 Subject: [PATCH 1/2] added play number to each type of tile --- maloja/web/jinja/partials/charts_albums_tiles.jinja | 2 ++ maloja/web/jinja/partials/charts_artists_tiles.jinja | 4 +++- maloja/web/jinja/partials/charts_tracks_tiles.jinja | 2 ++ maloja/web/static/css/maloja.css | 6 ++++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/maloja/web/jinja/partials/charts_albums_tiles.jinja b/maloja/web/jinja/partials/charts_albums_tiles.jinja index 538d5b2..20cb2b7 100644 --- a/maloja/web/jinja/partials/charts_albums_tiles.jinja +++ b/maloja/web/jinja/partials/charts_albums_tiles.jinja @@ -16,10 +16,12 @@ {% if entry is not none %} {% set album = entry.album %} {% set rank = entry.rank %} + {% set scrobbles = entry.scrobbles %}
#{{ rank }} {{ album.albumtitle }} +

{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}

diff --git a/maloja/web/jinja/partials/charts_artists_tiles.jinja b/maloja/web/jinja/partials/charts_artists_tiles.jinja index ef97ede..11dcc34 100644 --- a/maloja/web/jinja/partials/charts_artists_tiles.jinja +++ b/maloja/web/jinja/partials/charts_artists_tiles.jinja @@ -16,10 +16,12 @@ {% if entry is not none %} {% set artist = entry.artist %} {% set rank = entry.rank %} + {% set scrobbles = entry.scrobbles %}
- #{{ rank }} {{ artist }} + #{{ rank }} {{ artist }} +

{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}

diff --git a/maloja/web/jinja/partials/charts_tracks_tiles.jinja b/maloja/web/jinja/partials/charts_tracks_tiles.jinja index 6b238a6..426b041 100644 --- a/maloja/web/jinja/partials/charts_tracks_tiles.jinja +++ b/maloja/web/jinja/partials/charts_tracks_tiles.jinja @@ -16,10 +16,12 @@ {% if entry is not none %} {% set track = entry.track %} {% set rank = entry.rank %} + {% set scrobbles = entry.scrobbles %}
#{{ rank }} {{ track.title }} +

{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}

diff --git a/maloja/web/static/css/maloja.css b/maloja/web/static/css/maloja.css index 0d6378f..41f321f 100644 --- a/maloja/web/static/css/maloja.css +++ b/maloja/web/static/css/maloja.css @@ -1069,6 +1069,12 @@ div.tiles span { overflow-wrap: anywhere; } +div.tiles p.scrobbles { + margin: 0; + top:100%; + position: sticky; +} + div.tiles a:hover { text-decoration: none; } From 2a32ab38e1f7b97470462aa41414418c5e507d88 Mon Sep 17 00:00:00 2001 From: Eduardo Date: Tue, 31 Oct 2023 12:27:20 +0100 Subject: [PATCH 2/2] added settings to show/hide the option --- maloja/pkg_global/conf.py | 1 + maloja/web/jinja/partials/charts_albums_tiles.jinja | 4 +++- maloja/web/jinja/partials/charts_artists_tiles.jinja | 4 +++- maloja/web/jinja/partials/charts_tracks_tiles.jinja | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/maloja/pkg_global/conf.py b/maloja/pkg_global/conf.py index 36a6566..a560d5d 100644 --- a/maloja/pkg_global/conf.py +++ b/maloja/pkg_global/conf.py @@ -201,6 +201,7 @@ malojaconfig = Configuration( "default_album_artist":(tp.String(), "Default Albumartist", "Various Artists"), "use_album_artwork_for_tracks":(tp.Boolean(), "Use Album Artwork for tracks", True), "fancy_placeholder_art":(tp.Boolean(), "Use fancy placeholder artwork",True), + "show_play_number_on_tiles":(tp.Boolean(), "Show amount of plays on tails", True), "discourage_cpu_heavy_stats":(tp.Boolean(), "Discourage CPU-heavy stats", False, "Prevent visitors from mindlessly clicking on CPU-heavy options. Does not actually disable them for malicious actors!"), "use_local_images":(tp.Boolean(), "Use Local Images", True), #"local_image_rotate":(tp.Integer(), "Local Image Rotate", 3600), diff --git a/maloja/web/jinja/partials/charts_albums_tiles.jinja b/maloja/web/jinja/partials/charts_albums_tiles.jinja index 20cb2b7..a2c4380 100644 --- a/maloja/web/jinja/partials/charts_albums_tiles.jinja +++ b/maloja/web/jinja/partials/charts_albums_tiles.jinja @@ -21,7 +21,9 @@
#{{ rank }} {{ album.albumtitle }} -

{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}

+ {% if settings['SHOW_PLAY_NUMBER_ON_TILES'] %} +

{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}

+ {% endif %}
diff --git a/maloja/web/jinja/partials/charts_artists_tiles.jinja b/maloja/web/jinja/partials/charts_artists_tiles.jinja index 11dcc34..1adef2b 100644 --- a/maloja/web/jinja/partials/charts_artists_tiles.jinja +++ b/maloja/web/jinja/partials/charts_artists_tiles.jinja @@ -21,7 +21,9 @@
#{{ rank }} {{ artist }} -

{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}

+ {% if settings['SHOW_PLAY_NUMBER_ON_TILES'] %} +

{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}

+ {% endif %}
diff --git a/maloja/web/jinja/partials/charts_tracks_tiles.jinja b/maloja/web/jinja/partials/charts_tracks_tiles.jinja index 426b041..ae6dee8 100644 --- a/maloja/web/jinja/partials/charts_tracks_tiles.jinja +++ b/maloja/web/jinja/partials/charts_tracks_tiles.jinja @@ -21,7 +21,9 @@
#{{ rank }} {{ track.title }} -

{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}

+ {% if settings['SHOW_PLAY_NUMBER_ON_TILES'] %} +

{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}

+ {% endif %}