From 422a973eff8b78195041ce7553bb1bf5e8de4d91 Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Sat, 21 Oct 2023 12:13:58 +0200
Subject: [PATCH] Made entity info pages use subtemplates
---
maloja/web/jinja/album.jinja | 37 +-----------------
maloja/web/jinja/artist.jinja | 42 +--------------------
maloja/web/jinja/partials/info_album.jinja | 3 +-
maloja/web/jinja/partials/info_artist.jinja | 2 +-
maloja/web/jinja/partials/info_track.jinja | 1 -
maloja/web/jinja/track.jinja | 40 +-------------------
6 files changed, 5 insertions(+), 120 deletions(-)
diff --git a/maloja/web/jinja/album.jinja b/maloja/web/jinja/album.jinja
index 64bfe60..13d9133 100644
--- a/maloja/web/jinja/album.jinja
+++ b/maloja/web/jinja/album.jinja
@@ -55,42 +55,7 @@
{% import 'partials/awards_album.jinja' as awards %}
-<table class="top_info">
- <tr>
- <td class="image">
- {% if adminmode %}
- <div
- class="changeable-image" data-uploader="b64=>upload('{{ encodedalbum }}',b64)"
- style="background-image:url('{{ images.get_album_image(info.album) }}');"
- title="Drag & Drop to upload new image"
- ></div>
- {% else %}
- <div style="background-image:url('{{ images.get_album_image(info.album) }}');">
- </div>
- {% endif %}
- </td>
- <td class="text">
- <span>{{ links.links(album.artists) }}</span><br/>
- <h1 id="main_entity_name" class="headerwithextra">{{ info.album.albumtitle | e }}</h1>
- <span class="rank"><a href="/charts_albums?max=100">#{{ info.position }}</a></span>
- <br/>
-
- <p class="stats">
- <a href="{{ mlj_uri.create_uri("/scrobbles",filterkeys) }}">{{ info['scrobbles'] }} Scrobbles</a>
- </p>
-
-
-
-
-
- {{ awards.medals(info) }}
- {{ awards.topweeks(info) }}
- {{ awards.subcerts(info) }}
-
-
- </td>
- </tr>
-</table>
+{% include 'partials/info_album.jinja' %}
<h2><a href='{{ mlj_uri.create_uri("/charts_tracks",filterkeys) }}'>Top Tracks</a></h2>
diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja
index 25347bb..5cf2d02 100644
--- a/maloja/web/jinja/artist.jinja
+++ b/maloja/web/jinja/artist.jinja
@@ -56,47 +56,7 @@
-<table class="top_info">
- <tr>
- <td class="image">
- {% if adminmode %}
- <div
- class="changeable-image" data-uploader="b64=>upload('{{ encodedartist }}',b64)"
- style="background-image:url('{{ images.get_artist_image(info.artist) }}');"
- title="Drag & Drop to upload new image"
- ></div>
- {% else %}
- <div style="background-image:url('{{ images.get_artist_image(info.artist) }}');">
- </div>
- {% endif %}
- </td>
- <td class="text">
- <h1 id="main_entity_name" class="headerwithextra">{{ info.artist | e }}</h1>
- {% if competes and info['scrobbles']>0 %}<span class="rank"><a href="/charts_artists?max=100">#{{ info.position }}</a></span>{% endif %}
- <br/>
- {% if competes and included %}
- <span>associated: {{ links.links(included) }}</span>
- {% elif not competes %}
- <span>Competing under {{ links.link(credited) }} (#{{ info.position }})</span>
- {% endif %}
-
- <p class="stats">
- <a href="{{ mlj_uri.create_uri("/scrobbles",filterkeys) }}">{{ info['scrobbles'] }} Scrobbles</a>
- </p>
-
-
-
-
- {% if competes %}
- {{ awards.medals(info) }}
- {{ awards.topweeks(info) }}
- {% endif %}
- {{ awards.subcerts(artist) }}
-
-
- </td>
- </tr>
-</table>
+{% include 'partials/info_artist.jinja' %}
{% set albums_info = dbc.get_albums_artist_appears_on(filterkeys,limitkeys) %}
diff --git a/maloja/web/jinja/partials/info_album.jinja b/maloja/web/jinja/partials/info_album.jinja
index 8a42325..ccf680f 100644
--- a/maloja/web/jinja/partials/info_album.jinja
+++ b/maloja/web/jinja/partials/info_album.jinja
@@ -25,7 +25,6 @@
{% if condensed %}<a href="/album?{{ encodedalbum }}">{% endif %}
<h1 id="main_entity_name" class="headerwithextra">{{ info.album.albumtitle | e }}</h1>
{%- if condensed -%}</a>{% endif %}
- {# awards.certs(album) #}
<span class="rank"><a href="/charts_albums?max=100">#{{ info.position }}</a></span>
<br/>
@@ -39,7 +38,7 @@
{{ awards.medals(info) }}
{{ awards.topweeks(info) }}
-
+ {{ awards.subcerts(info) }}
</td>
</tr>
diff --git a/maloja/web/jinja/partials/info_artist.jinja b/maloja/web/jinja/partials/info_artist.jinja
index b338f54..cf2db9c 100644
--- a/maloja/web/jinja/partials/info_artist.jinja
+++ b/maloja/web/jinja/partials/info_artist.jinja
@@ -54,7 +54,7 @@
{{ awards.medals(info) }}
{{ awards.topweeks(info) }}
{% endif %}
- {{ awards.certs(artist) }}
+ {{ awards.subcerts(artist) }}
</td>
diff --git a/maloja/web/jinja/partials/info_track.jinja b/maloja/web/jinja/partials/info_track.jinja
index 4852eeb..5c753bf 100644
--- a/maloja/web/jinja/partials/info_track.jinja
+++ b/maloja/web/jinja/partials/info_track.jinja
@@ -26,7 +26,6 @@
{% if condensed %}<a href="/track?{{ encodedtrack }}">{% endif %}
<h1 id="main_entity_name" class="headerwithextra">{{ info.track.title | e }}</h1>
{%- if condensed -%}</a>{% endif %}
- {%- if not condensed -%}{{ awards.certs(track) }}{% endif %}
<span class="rank"><a href="/charts_tracks?max=100">#{{ info.position }}</a></span>
<br/>
{% if info.track.album %}
diff --git a/maloja/web/jinja/track.jinja b/maloja/web/jinja/track.jinja
index 4aaf990..3e77814 100644
--- a/maloja/web/jinja/track.jinja
+++ b/maloja/web/jinja/track.jinja
@@ -55,45 +55,7 @@
{% import 'partials/awards_track.jinja' as awards %}
-<table class="top_info">
- <tr>
- <td class="image">
- {% if adminmode %}
- <div
- class="changeable-image" data-uploader="b64=>upload('{{ encodedtrack }}',b64)"
- style="background-image:url('{{ images.get_track_image(info.track) }}');"
- title="Drag & Drop to upload new image"
- ></div>
- {% else %}
- <div style="background-image:url('{{ images.get_track_image(info.track) }}');">
- </div>
- {% endif %}
- </td>
- <td class="text">
- <span>{{ links.links(track.artists) }}</span><br/>
- <h1 id="main_entity_name" class="headerwithextra">{{ info.track.title | e }}</h1>
- <span class="rank"><a href="/charts_tracks?max=100">#{{ info.position }}</a></span>
- <br/>
- {% if info.track.album %}
- from {{ links.link(info.track.album) }}<br/>
- {% endif %}
-
- <p class="stats">
- {% if adminmode %}<button type="button" onclick="scrobble('{{ encodedtrack }}')">Scrobble now</button>{% endif %}
- <a href="{{ mlj_uri.create_uri("/scrobbles",filterkeys) }}">{{ info['scrobbles'] }} Scrobbles</a>
- </p>
-
-
-
-
-
- {{ awards.medals(info) }}
- {{ awards.topweeks(info) }}
-
-
- </td>
- </tr>
-</table>
+{% include 'partials/info_track.jinja' %}
<table class="twopart">