From 5c3d80c8cd9582a4f6f083f4b7eb50fd917c548d Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Tue, 31 Jul 2012 07:28:32 +0200
Subject: [PATCH] Use include to display artist.

---
 src/main/resources/templates/admin.edit-group     | 2 +-
 src/main/resources/templates/admin.edit-track     | 2 +-
 src/main/resources/templates/admin.list-artists   | 2 +-
 src/main/resources/templates/include/admin.artist | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/templates/include/admin.artist

diff --git a/src/main/resources/templates/admin.edit-group b/src/main/resources/templates/admin.edit-group
index af2d604..545526d 100644
--- a/src/main/resources/templates/admin.edit-group
+++ b/src/main/resources/templates/admin.edit-group
@@ -34,7 +34,7 @@
 	<%first>
 		<ul>
 	<%/first>
-	<li><%artist.name|html> <a href="admin.edit-artist?id=<%artist.id|html>">edit</a></li>
+	<li><%include include/admin.artist></li>
 	<%last>
 		</ul>
 	<%/last>
diff --git a/src/main/resources/templates/admin.edit-track b/src/main/resources/templates/admin.edit-track
index bfc3355..f9ee353 100644
--- a/src/main/resources/templates/admin.edit-track
+++ b/src/main/resources/templates/admin.edit-track
@@ -41,7 +41,7 @@
 
 <%foreach track.artists artist>
 
-	<div>Artist: <a href="admin.edit-artist?id=<%artist.id|html>"><%artist.name|html></a></div>
+	<div>Artist: <%include include/admin.artist></div>
 
 	<form action="admin.edit-track" method="post" accept-charset="utf-8">
 		<input type="hidden" name="id" value="<%track.id|html>"/>
diff --git a/src/main/resources/templates/admin.list-artists b/src/main/resources/templates/admin.list-artists
index a418166..6602e94 100644
--- a/src/main/resources/templates/admin.list-artists
+++ b/src/main/resources/templates/admin.list-artists
@@ -4,7 +4,7 @@
 
 <%foreach artists artist>
 	<%first><ul><%/first>
-	<li><% artist.name|html><%foreach artist.groups group><%first> / <%/first><%notfirst> ^ <%/notfirst><a href="group?id=<%group.id|html>"><%group.name|html></a><%/foreach> <a href="admin.edit-artist?id=<% artist.id|html>">edit</a></li>
+	<li><%include include/admin.artist></li>
 	<%last></ul><%/last>
 <%/foreach>
 
diff --git a/src/main/resources/templates/include/admin.artist b/src/main/resources/templates/include/admin.artist
new file mode 100644
index 0000000..65ed1eb
--- /dev/null
+++ b/src/main/resources/templates/include/admin.artist
@@ -0,0 +1 @@
+<a href="admin.edit-artist?id=<%artist.id|html>"><% artist.name|html></a><%foreach artist.groups group|sort><%first> / <%/first><%notfirst> ^ <%/notfirst><a href="admin.edit-group?id=<%group.id|html>"><%group.name|html></a><%/foreach>
\ No newline at end of file
-- 
2.7.4