From eecca317b8dc18c7fe13fa3a86978621901be460 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Wed, 1 Aug 2012 07:03:16 +0200
Subject: [PATCH] Use includes for displaying track information in non-admin
 mode.

---
 src/main/resources/templates/artist             | 2 +-
 src/main/resources/templates/include/derivative | 1 +
 src/main/resources/templates/include/track      | 1 +
 src/main/resources/templates/party              | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/templates/include/derivative
 create mode 100644 src/main/resources/templates/include/track

diff --git a/src/main/resources/templates/artist b/src/main/resources/templates/artist
index e04ac03..9fc0a17 100644
--- a/src/main/resources/templates/artist
+++ b/src/main/resources/templates/artist
@@ -10,7 +10,7 @@
 
 <%foreach artist.tracks track|sort>
 <%first><ul><%/first>
-<li><a href="track?id=<%track.id|html>"><%track.name|html></a><%foreach track.artists trackArtist|remove value=artist><%first> (together with <%/first><%notfirst>,<%last> and<%/last> <%/notfirst><%include include/artist artist=trackArtist><%last>)<%/last><%/foreach><%foreach track.derivatives derivative><%first> (<%/first><%notfirst>, <%/notfirst><%derivative.properties.audio/codec.shortName|html><%last>)<%/last><%/foreach></li>
+<li><%include include/track></li>
 <%last></ul><%/last>
 <%foreachelse>
 <p>This artist does not have any tracks.</p>
diff --git a/src/main/resources/templates/include/derivative b/src/main/resources/templates/include/derivative
new file mode 100644
index 0000000..f2ebcf3
--- /dev/null
+++ b/src/main/resources/templates/include/derivative
@@ -0,0 +1 @@
+<a href="download?id=<%derivative.id|html>"><%ifnull derivative.properties.audio/codec><%derivative.properties.file/extension.toUpperCase><%else><%derivative.properties.audio/codec.shortName|html><%/if></a>
\ No newline at end of file
diff --git a/src/main/resources/templates/include/track b/src/main/resources/templates/include/track
new file mode 100644
index 0000000..edff155
--- /dev/null
+++ b/src/main/resources/templates/include/track
@@ -0,0 +1 @@
+<a href="track?id=<%track.id|html>"><%track.name|html></a><%ifnull !track.remix> (<%track.remix|html><%foreach track.remixArtists artist><%first> by <%/first><%notfirst> &amp; <%/notfirst><%include include/artist><%/foreach>)<%/if><%foreach track.artists artist><%first> by <%/first><%notfirst> &amp; <%/notfirst><%include include/artist><%/foreach><%foreach track.derivatives derivative><%first> (<%/first><%notfirst>, <%/notfirst><%include include/derivative><%last>)<%/last><%/foreach>
\ No newline at end of file
diff --git a/src/main/resources/templates/party b/src/main/resources/templates/party
index 196d992..35dcd43 100644
--- a/src/main/resources/templates/party
+++ b/src/main/resources/templates/party
@@ -12,7 +12,7 @@
 
 <%foreach party.releases track|sort>
 <%first><ul><%/first>
-<li><a href="track?id=<%track.id|html>"><%track.name|html></a><%foreach track.artists artist><%first> by <%/first><%notfirst> &amp; <%/notfirst><%include include/artist><%/foreach><%foreach track.derivatives derivative><%first> (<%/first><%notfirst>, <%/notfirst><%derivative.properties.audio/codec.shortName|html><%last>)<%/last><%/foreach></li>
+<li><%include include/track></li>
 <%last></ul><%/last>
 <%foreachelse>
 <p>This party does not have any releases.</p>
-- 
2.7.4