Remove the explicit “edit” link everywhere, just link the object.

diff --git a/src/main/resources/templates/admin.edit-artist b/src/main/resources/templates/admin.edit-artist
index d6fbe87..a1608f3 100644 (file)
--- a/src/main/resources/templates/admin.edit-artist
+++ b/src/main/resources/templates/admin.edit-artist
@@ -36,7 +36,7 @@
                <input type="hidden" name="group" value="<%group.id|html>"/>
 
                <div>
-                       <%group.name|html> <a href="admin.edit-group?id=<%group.id|html>">edit</a>
+                       <a href="admin.edit-group?id=<%group.id|html>"><%group.name|html></a>
                </div>
                <button type="submit" name="delete-group" value="true">Delete Group</button>
 
@@ -70,7 +70,7 @@
        <%first>
                <ul>
        <%/first>
-       <li><%track.name|html> <a href="admin.edit-track?id=<%track.id|html>">edit</a></li>
+       <li><a href="admin.edit-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/admin.artist artist=trackArtist><%last>)<%/last><%/foreach></li>
        <%last>
                </ul>
        <%/last>

diff --git a/src/main/resources/templates/admin.edit-party b/src/main/resources/templates/admin.edit-party
index 34e49c8..6da617d 100644 (file)
--- a/src/main/resources/templates/admin.edit-party
+++ b/src/main/resources/templates/admin.edit-party
@@ -32,7 +32,7 @@
        <%first>
                <ul>
        <%/first>
-       <li><%track.name|html> <a href="admin.edit-track?id=<%track.id|html>">edit</a></li>
+       <li><a href="admin.edit-track?id=<%track.id|html>"><%track.name|html></a><%foreach track.artists artist><%first> by <%/first><%notfirst> &amp; <%/notfirst><%include include/admin.artist><%/foreach></li>
        <%last>
                </ul>
        <%/last>

diff --git a/src/main/resources/templates/admin.list-groups b/src/main/resources/templates/admin.list-groups
index 90acf98..877ea14 100644 (file)
--- a/src/main/resources/templates/admin.list-groups
+++ b/src/main/resources/templates/admin.list-groups
@@ -4,7 +4,7 @@
 
 <%foreach groups group>
        <%first><ul><%/first>
-       <li><% group.name|html> <a href="admin.edit-group?id=<% group.id|html>">edit</a></li>
+       <li><a href="admin.edit-group?id=<% group.id|html>"><% group.name|html></a></li>
        <%last></ul><%/last>
 <%/foreach>
 

diff --git a/src/main/resources/templates/admin.list-parties b/src/main/resources/templates/admin.list-parties
index 91578fe..77bd914 100644 (file)
--- a/src/main/resources/templates/admin.list-parties
+++ b/src/main/resources/templates/admin.list-parties
@@ -4,7 +4,7 @@
 
 <%foreach parties party>
        <%first><ul><%/first>
-       <li><% party.name|html> <a href="admin.edit-party?id=<% party.id|html>">edit</a></li>
+       <li><a href="admin.edit-party?id=<%party.id|html>"><% party.name|html></a></li>
        <%last></ul><%/last>
 <%/foreach>