summaryrefslogtreecommitdiff
path: root/nop/templates
diff options
context:
space:
mode:
authorJohannes Raggam <raggam-nl@adm.at>2011-05-26 15:46:07 (GMT)
committerJohannes Raggam <raggam-nl@adm.at>2011-05-26 15:46:07 (GMT)
commitd04d0ad1f861a1038ae95868205878452e93ec10 (patch)
tree937453a59a2ee1d4c75f72a1ece6768601289522 /nop/templates
parent519df73c5cf45f61a82fb63eafeb028d13ad4c4a (diff)
show show title instead of tracks if show is not musikprogram
Diffstat (limited to 'nop/templates')
-rw-r--r--nop/templates/nop_form.html20
1 files changed, 15 insertions, 5 deletions
diff --git a/nop/templates/nop_form.html b/nop/templates/nop_form.html
index 1144692..b9be92f 100644
--- a/nop/templates/nop_form.html
+++ b/nop/templates/nop_form.html
@@ -36,11 +36,21 @@
<ul>
{% for track in nowplaying %}
<li>
- <small>{{track.datetime}}:</small>
- <strong>{{track.artist}}</strong> -
- {{track.title}} -
- {{track.album}}
- in der Sendung <em>{{track.showtitle}}</em>
+ {% if track.start or track.show %}
+ <small>
+ {% if track.start %}{{track.start}}{% endif %}
+ {% if track.start and track.show %},{% endif %}
+ {% if track.show %}Sendung {{track.show}}{% endif %}
+ {% if track.artist or track.title or track.album %}:{% endif %}
+ </small>
+ {% endif %}
+ {% if track.artist %}
+ <strong>{{track.artist}}</strong>
+ {% endif %}
+ {% if track.artist and track.title or track.artist and track.album %}|{% endif %}
+ {% if track.title %}{{track.title}}{% endif %}
+ {% if track.title and track.album %}|{% endif %}
+ {% if track.album %}{{track.album}}{% endif %}
</li>
{% endfor %}
</ul>