From 1563a15abde175022b50fa085c6b9b19a6021c31 Mon Sep 17 00:00:00 2001 From: Krateng Date: Fri, 21 Aug 2020 18:20:51 +0200 Subject: [PATCH] Improved jinja pages --- maloja/__pkginfo__.py | 2 +- maloja/web/jinja/charts_artists.jinja | 9 +- maloja/web/jinja/charts_tracks.jinja | 7 ++ maloja/web/pyhp/artist.pyhp | 151 -------------------------- maloja/web/pyhp/track.pyhp | 121 --------------------- 5 files changed, 16 insertions(+), 274 deletions(-) delete mode 100644 maloja/web/pyhp/artist.pyhp delete mode 100644 maloja/web/pyhp/track.pyhp diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py index feb174d..6d6c39d 100644 --- a/maloja/__pkginfo__.py +++ b/maloja/__pkginfo__.py @@ -5,7 +5,7 @@ author = { "email":"maloja@krateng.dev", "github": "krateng" } -version = 2,7,2 +version = 2,7,3 versionstr = ".".join(str(n) for n in version) links = { "pypi":"malojaserver", diff --git a/maloja/web/jinja/charts_artists.jinja b/maloja/web/jinja/charts_artists.jinja index 5648ab7..a03e078 100644 --- a/maloja/web/jinja/charts_artists.jinja +++ b/maloja/web/jinja/charts_artists.jinja @@ -1,11 +1,18 @@ {% extends "abstracts/base.jinja" %} -{% block title %}Maloja - {{ artist }}{% endblock %} +{% block title %}Maloja - Artist Charts{% endblock %} {% block scripts %} {% endblock %} {% set charts = dbp.get_charts_artists(filterkeys,limitkeys) %} +{% if charts[0] is defined %} + {% set topartist = charts[0].artist %} + {% set img = utilities.getArtistImage(artist=topartist,fast=True) %} +{% else %} + {% set img = "/favicon.png" %} +{% endif %} + {% block content %} diff --git a/maloja/web/jinja/charts_tracks.jinja b/maloja/web/jinja/charts_tracks.jinja index cb31f59..4d11d3a 100644 --- a/maloja/web/jinja/charts_tracks.jinja +++ b/maloja/web/jinja/charts_tracks.jinja @@ -6,6 +6,12 @@ {% endblock %} {% set charts = dbp.get_charts_tracks(filterkeys,limitkeys) %} +{% if charts[0] is defined %} + {% set toptrack = charts[0].track %} + {% set img = utilities.getTrackImage(artists=toptrack.artists,title=toptrack.title,fast=True) %} +{% else %} + {% set img = "/favicon.png" %} +{% endif %} {% block content %} @@ -17,6 +23,7 @@

Track Charts

View #1 Tracks
+ {% if filterkeys.get('artist') is not none %}by {{ htmlgenerators.artistLink(filterkeys.get('artist')) }}{% endif %} {{ limitkeys.timerange.desc(prefix=True) }}

{{ htmlmodules.module_filterselection(_urikeys) }} diff --git a/maloja/web/pyhp/artist.pyhp b/maloja/web/pyhp/artist.pyhp deleted file mode 100644 index cab590b..0000000 --- a/maloja/web/pyhp/artist.pyhp +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Maloja - <pyhp echo="artist" /> - - - - - - - - - - - - - - - -
-
-
- 		-

- -
- -

Scrobbles

- - - - - - - - - - - - - - - - - -
- -

Top Tracks

- - -
- - - - - - - - - - - - -
-

Pulse

- - - - - -

- - - - - - - - - - - - 		- -

Performance

- - - - - -

- - - - - - - - - -
- - -

Last Scrobbles

- - - - - - diff --git a/maloja/web/pyhp/track.pyhp b/maloja/web/pyhp/track.pyhp deleted file mode 100644 index 811f527..0000000 --- a/maloja/web/pyhp/track.pyhp +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - Maloja - <pyhp echo="track['title']" /> - - - - - - - - - - - - -
-
-
- 		-
-

- -

Scrobble now Scrobbles

- - - - - - - - - - - -
- - - - - - - - - - - - - -
-

Pulse

- - - - - -

- - - - - - - - - - - 		- -

Performance

- - - - - -

- - - - - - - - - -
- - -

Last Scrobbles

- - - - - - - - -