X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/e12da4d96c1310152b11abfe70c3f868282a0e8b..b30155e30c466ce8ca8668b909a5daca7acfbfd5:/templates/playing.html?ds=sidebyside

diff --git a/templates/playing.html b/templates/playing.html
index 30346ac..4242740 100644
--- a/templates/playing.html
+++ b/templates/playing.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!--
 This file is part of DisOrder.
-Copyright (C) 2004, 2005 Richard Kettlewell
+Copyright (C) 2004-2008 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -29,87 +29,89 @@ USA
 
    @#{extra control buttons for the management page}@
    @if{@arg:mgmt@}{
+   <div class=mgmt>
    <p class=mgmt>
     @if{@paused@}{
     <!-- paused -->
     <span class=button>
     <a class=button
-    href="@url@?action=resume&#38;nonce=@nonce@&#38;mgmt=true"
+    href="@url@?action=resume&#38;mgmt=true"
      title="@label:playing.resumeverbose@">@label:playing.pause@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.enabled@">
+    <img width=16 height=16 class=imgbutton src="@image:enabled@">
     }{
     <!-- not paused -->
     <span class=button>
     <a class=button
-    href="@url@?action=pause&#38;nonce=@nonce@&#38;mgmt=true"
+    href="@url@?action=pause&#38;mgmt=true"
      title="@label:playing.pauseverbose@">@label:playing.pause@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.disabled@">
+    <img width=16 height=16 class=imgbutton src="@image:disabled@">
     }@
     @if{@random-enabled@}{
     <!-- random played enabled -->
     <span class=button>
     <a class=button
-    href="@url@?action=random-disable&#38;nonce=@nonce@&#38;mgmt=true"
+    href="@url@?action=random-disable&#38;mgmt=true"
      title="@label:playing.randomdisableverbose@">@label:playing.random@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.enabled@">
+    <img width=16 height=16 class=imgbutton src="@image:enabled@">
     }{
     <!-- random played disabled -->
     <span class=button>
     <a class=button
-    href="@url@?action=random-enable&#38;nonce=@nonce@&#38;mgmt=true"
+    href="@url@?action=random-enable&#38;mgmt=true"
      title="@label:playing.randomenableverbose@">@label:playing.random@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.disabled@">
+    <img width=16 height=16 class=imgbutton src="@image:disabled@">
     }@
     @if{@enabled@}{
     <!-- playing enabled -->
     <span class=button>
     <a class=button
-    href="@url@?action=disable&#38;nonce=@nonce@&#38;mgmt=true"
+    href="@url@?action=disable&#38;mgmt=true"
      title="@label:playing.disableverbose@">@label:playing.playing@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.enabled@">
+    <img width=16 height=16 class=imgbutton src="@image:enabled@">
     }{
     <!-- playing disabled -->
     <span class=button>
     <a class=button
-    href="@url@?action=enable&#38;nonce=@nonce@&#38;mgmt=true"
+    href="@url@?action=enable&#38;mgmt=true"
      title="@label:playing.enableverbose@">@label:playing.playing@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.disabled@">
+    <img width=16 height=16 class=imgbutton src="@image:disabled@">
     }@
     <form class=volume action="@url@" method=POST
      enctype="multipart/form-data" accept-charset=utf-8>
     <span class=volume>
      @label:playing.volume@
-     <a class=imgbutton
+     @right{volume}{<a class=imgbutton
       href="@url@?action=volume&#38;delta=-@label:volume.resolution@&#38;back=@urlquote{@thisurl@?mgmt=true}@">
-      <img class=button src="@label:images.down@"
+      <img class=button src="@image:down@"
        alt="@label:volume.reduce@" title="@label:volume.reduceverbose@">
-     </a>
+     </a>}{<img class=button src="@image:nodown@">}@
      @label:volume.left@ <input size=3 name=left type=text value="@volume:left@">
      @label:volume.right@ <input size=3 name=right type=text value="@volume:right@">
-     <input name=nonce type=hidden value="@nonce@">
      <input name=back type=hidden value="@thisurl@?mgmt=true">
-     <button class=search name=action type=submit value=volume>
+     @right{volume}{<button class=search name=submit type=submit>
       @label:volume.set@
-     </button>
-     <a class=imgbutton
+     </button><input name=action type=hidden value=volume>}@
+     @right{volume}{<a class=imgbutton
       href="@url@?action=volume&#38;delta=@label:volume.resolution@&#38;back=@urlquote{@thisurl@?mgmt=true}@">
-      <img class=button src="@label:images.up@"
+      <img class=button src="@image:up@"
        alt="@label:volume.increase@" title="@label:volume.increaseverbose@">
-     </a>
+     </a>}{<img class=button src="@image:noup@">}@
     </form>
     </span>
+    </p>
+    </div>
    }@
 
 @#{only display the table if there is something to put in it}@
@@ -138,21 +140,27 @@ 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>
       <td class=imgbutton>@if{@scratchable@}{<a class=imgbutton
-       href="@url@?action=scratch&#38;nonce=@nonce@&#38;id=@id@&#38;mgmt=@arg:mgmt@"><img
-       class=button src="@label:images.scratch@"
+       href="@url@?action=scratch&#38;id=@id@&#38;mgmt=@arg:mgmt@"><img
+       class=button src="@image:scratch@"
        title="@label:playing.scratchverbose@"
        alt="@label:playing.scratch@"></a>}{<img
-       class=button src="@label:images.noscratch@"
+       class=button src="@image:noscratch@"
        title="@label:playing.scratchverbose@"
        alt="@label:playing.scratch@">}@</td>
       @if{@arg:mgmt@}{
@@ -171,23 +179,27 @@ 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}@"
-       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}@}@</td>
       <td class=title><span
        title="@part{title}@">@part{short}{title}@</span></td>
       <td class=length>@length@</td>
       <td class=imgbutton>@if{@removable@}{<a class=imgbutton
-       href="@url@?action=remove&#38;nonce=@nonce@&#38;id=@id@&#38;mgmt=@arg:mgmt@"><img
-       class=button src="@label:images.scratch@"
+       href="@url@?action=remove&#38;id=@id@&#38;mgmt=@arg:mgmt@"><img
+       class=button src="@image:scratch@"
        title="@label:playing.removeverbose@" 
        alt="@label:playing.remove@"></a>}{<img
-       class=button src="@label:images.noscratch@"
+       class=button src="@image:noscratch@"
        title="@label:playing.removeverbose@"
        alt="@label:playing.remove@">}@</td>
 
@@ -197,24 +209,24 @@ USA
      <!-- cannot move up -->
      <td class=imgbutton>
       <img
-       class=button src="@label:images.noupall@"
+       class=button src="@image:noupall@"
        title="@label:playing.upallverbose@" alt="">
      <td class=imgbutton>
       <img
-       class=button src="@label:images.noup@"
+       class=button src="@image:noup@"
        title="@label:playing.upverbose@" alt="">
          }{
      <!-- can move up -->
      <td class=imgbutton>
       <a class=imgbutton
-        href="@url@?action=move&#38;nonce=@nonce@&#38;id=@id@&#38;delta=2147483647&#38;mgmt=true"><img
-       class=button src="@label:images.upall@"
+        href="@url@?action=move&#38;id=@id@&#38;delta=2147483647&#38;mgmt=true"><img
+       class=button src="@image:upall@"
        title="@label:playing.upallverbose@"
        alt="@label:playing.upall@"></a>
      <td class=imgbutton>
      <a class=imgbutton
-        href="@url@?action=move&#38;nonce=@nonce@&#38;id=@id@&#38;delta=1&#38;mgmt=true"><img
-       class=button src="@label:images.up@"
+        href="@url@?action=move&#38;id=@id@&#38;delta=1&#38;mgmt=true"><img
+       class=button src="@image:up@"
        title="@label:playing.upverbose@" alt="@label:playing.up@"></a>
          }@
 
@@ -223,24 +235,24 @@ USA
      <!-- cannot move down -->
      <td class=imgbutton>
       <img
-       class=button src="@label:images.nodownall@"
+       class=button src="@image:nodownall@"
        title="@label:playing.downallverbose@" alt="">
      <td class=imgbutton>
       <img
-       class=button src="@label:images.nodown@"
+       class=button src="@image:nodown@"
        title="@label:playing.downverbose@" alt="">
          }{
      <!-- can move down -->
      <td class=imgbutton>
       <a class=imgbutton
-        href="@url@?action=move&#38;nonce=@nonce@&#38;id=@id@&#38;delta=-2147483647&#38;mgmt=true"><img
-       class=button src="@label:images.downall@"
+        href="@url@?action=move&#38;id=@id@&#38;delta=-2147483647&#38;mgmt=true"><img
+       class=button src="@image:downall@"
        title="@label:playing.downallverbose@"
        alt="@label:playing.downall@"></a>
      <td class=imgbutton>
      <a class=imgbutton
-        href="@url@?action=move&#38;nonce=@nonce@&#38;id=@id@&#38;delta=-1&#38;mgmt=true"><img
-       class=button src="@label:images.down@"
+        href="@url@?action=move&#38;id=@id@&#38;delta=-1&#38;mgmt=true"><img
+       class=button src="@image:down@"
        title="@label:playing.downverbose@" alt="@label:playing.down@"></a>
          }@
 
