X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/3effdc300f80c262546757e081448b0ba1e0cbed..651aec29c99abce0624594d5ca52916b57e5e0e1:/templates/choose.html

diff --git a/templates/choose.html b/templates/choose.html
index c203157..2df2e2d 100644
--- a/templates/choose.html
+++ b/templates/choose.html
@@ -117,8 +117,8 @@ USA
 
    @if{@ne{@arg:directory@}{}@}{
    <p class=directoryname>@navigate{@arg:directory@}{/<a
-   class=directory
-   href="@url@?action=choose&#38;directory=@urlquote{@fullname@}@&#38;nonce=@nonce@">@basename@</a>}@:</p>
+   class=thisdirectory
+   href="@url@?action=choose&#38;directory=@urlquote{@fullname@}@">@basename@</a>}@:</p>
    }@
 
    @if{@isdirectories@}{
@@ -128,7 +128,12 @@ USA
     </p>
     @choose{directories}{
     <p class=directory>
-     <a class=directory href="@url@?action=choose&#38;directory=@urlquote{@file@}@&#38;nonce=@nonce@">
+     <a class=directory
+     href="@url@?action=choose&#38;directory=@urlquote{@file@}@"
+     title="@label:choose.directory@">
+     <img class=button
+      src="@image:directory@"
+      alt="">
       @transform{@file@}{dir}{display}@
      </a>
     </p>
@@ -143,30 +148,30 @@ USA
     @choose{files}{
     <p class=file>
     @right{prefs}{<a class=imgprefs
-     href="@url@?action=prefs&#38;0_file=@urlquote{@resolve{@file@}@}@&#38;nonce=@nonce@"
+     href="@url@?action=prefs&#38;0_file=@urlquote{@resolve{@file@}@}@"
      ><img class=button
-      src="@@image:edit@"
+      src="@image:edit@"
       title="@label:choose.prefsverbose@"
       alt="@label:choose.prefs@"></a>}@
      <a class=file
-     href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@&#38;nonce=@nonce@"
+     href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@"
      title="@label:choose.play@">@transform{@file@}{track}{display}@</a>
      @if{@eq{@trackstate{@file@}@}{playing}@}{[<b>playing</b>]}@
      @if{@eq{@trackstate{@file@}@}{queued}@}{[<b>queued</b>]}@
     </p>
     }@
+    <p class=allfiles>
+     @right{prefs}{<a class=imgprefs
+     href="@url@?action=prefs&#38;directory=@urlquote{@arg:directory@}@&#38;back=@urlquote{@thisurl@}@"
+     ><img class=button 
+      src="@image:edit@"
+      title="@label:choose.allprefsverbose@"
+      alt="@label:choose.allprefs@"></a>}@
+     <a class=allfiles href="@url@?action=play&#38;directory=@urlquote{@arg:directory@}@&#38;back=@urlquote{@thisurl@}@">
+      @label:choose.playall@
+     </a>
+    </p>
    </div>
-   <p class=allfiles>
-    @right{prefs}{<a class=imgprefs
-    href="@url@?action=prefs&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@"
-    ><img class=button 
-     src="@@image:edit@"
-     title="@label:choose.allprefsverbose@"
-     alt="@label:choose.allprefs@"></a>}@
-    <a class=allfiles href="@url@?action=play&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@">
-     @label:choose.playall@
-    </a>
-   </p>
    }@
 
 @include{topbarend}@