From: rjk@greenend.org.uk <>
Date: Fri, 28 Dec 2007 17:20:32 +0000 (+0000)
Subject: avoid choose links that you cannot use
X-Git-Tag: 3.0~152
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/a31780f61a0ed0916fca6bb88acb0edfc751c53a

avoid choose links that you cannot use
---

diff --git a/templates/new.html b/templates/new.html
index 78b47dd..e73164f 100644
--- a/templates/new.html
+++ b/templates/new.html
@@ -40,18 +40,24 @@ USA
     </tr>
     @new{
     <tr class=@parity@>
-     <td class=artist><a
+     <td class=artist>@right{play}{<a class=directory
        title="@part{artist}@"
-       class=directory
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@">@part{short}{artist}@</a></td>
-     <td class=album><a
+       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@"
+       >@part{short}{artist}@</a>}{<span class=directory
+       title="@part{artist}@"
+       >@part{short}{artist}@</span>}@</td>
+     <td class=album>@right{play}{<a class=directory
+       title="@part{album}@"
+       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@"
+       >@part{short}{album}@</a>}{<span class=directory
        title="@part{album}@"
-       class=directory
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@">@part{short}{album}@</a></td>
-     <td class=title><a
+       >@part{short}{album}@</span>}@</td>
+     <td class=title>@right{play}{<a class=file
+       title="@part{title}@"
+       href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@&#38;nonce=@nonce@"
+       >@part{short}{title}@</a>}{<span class=file
        title="@part{title}@"
-       class=file
-       href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@&#38;nonce=@nonce@">@part{short}{title}@</a></td>
+       >@part{short}{title}@</span>}@</td>
      <td class=length>@length@</td>
 @right{prefs}{
      <td class=imgbutton><a class=imgbutton
diff --git a/templates/playing.html b/templates/playing.html
index 30346ac..f49c7dd 100644
--- a/templates/playing.html
+++ b/templates/playing.html
@@ -138,12 +138,18 @@ USA
      <tr class=playing>
       <td class=when>@when@</td>
       <td class=who>@if{@eq{@who@}{}@}{@if{@eq{@state@}{random}@}{@label:playing.randomtrack@}{&nbsp;}@}{@who@}@</td>
-      <td class=artist><a class=directory
+      <td class=artist>@right{play}{<a class=directory
        href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@"
-       title="@label:playing.artistverbose@">@part{short}{artist}@</a></td>
-      <td class=album><a class=directory
+       title="@label:playing.artistverbose@"
+       >@part{short}{artist}@</a>}{<span class=directory
+       title="@part{artist}@"
+       >@part{short}{artist}@</span>}@</td>
+      <td class=album>@right{play}{<a class=directory
        href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@"
-       title="@label:playing.albumverbose@">@part{short}{album}@</a></td>
+       title="@label:playing.albumverbose@"
+       >@part{short}{album}@</a>}{<span class=directory
+       title="@part{album}@"
+       >@part{short}{album}@</span>}@</td>
       <td class=title><span
        title="@part{title}@">@part{short}{title}@</span></td>
       <td class=length>@length@</td>
@@ -171,14 +177,18 @@ USA
      <tr class=@parity@>
       <td class=when>@when@</td>
       <td class=who>@if{@eq{@who@}{}@}{@if{@eq{@state@}{random}@}{@label:queue.randomtrack@}{&nbsp;}@}{@who@}@</td>
-      <td class=artist><a 
+      <td class=artist>@right{play}{<a class=directory
+       title="@part{artist}@"
+       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@"
+       >@part{short}{artist}@</a>}{<span class=directory
        title="@part{artist}@"
-       class=directory
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@">@part{short}{artist}@</a></td>
-      <td class=album><a
+       >@part{short}{artist}@</span>}@</td>
+      <td class=album>@right{play}{<a class=directory
+       title="@part{album}@"
+       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@"
+       >@part{short}{album}@</a>}{<span class=directory
        title="@part{album}@"
-       class=directory 
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@">@part{short}{album}@</a></td>
+       >@part{short}{album}@}@</td>
       <td class=title><span
        title="@part{title}@">@part{short}{title}@</span></td>
       <td class=length>@length@</td>
diff --git a/templates/recent.html b/templates/recent.html
index 61fc962..2efb1f9 100644
--- a/templates/recent.html
+++ b/templates/recent.html
@@ -44,14 +44,18 @@ USA
     <tr class=@parity@>
      <td class=when>@when@</td>
      <td class=who>@who@</td>
-     <td class=artist><a 
+     <td class=artist>@right{play}{<a class=directory
        title="@part{artist}@"
-       class=directory
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@">@part{short}{artist}@</a></td>
-     <td class=album><a
+       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@"
+       >@part{short}{artist}@</a>}{<span class=directory
+       title="@part{artist}@"
+       >@part{short}{artist}@</span>}@</td>
+     <td class=album>@right{play}{<a class=directory
+       title="@part{album}@"
+       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@"
+       >@part{short}{album}@</a>}{<span class=directory
        title="@part{album}@"
-       class=directory
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@">@part{short}{album}@</a></td>
+       >@part{short}{album}@</span>}@</td>
      <td class=title><span
        title="@part{title}@">@part{short}{title}@</span></td>
      <td class=length>@length@</td>