update README.upgrades

[disorder] / templates / playing.html

diff --git a/templates/playing.html b/templates/playing.html
index 30346acb57f194e25e12c3d43f717a8e0f28e680..9c3532625dca4b2aa5dde1ba6ad440b3f5ad3b35 100644 (file)
--- a/templates/playing.html
+++ b/templates/playing.html
@@ -38,7 +38,7 @@ USA
      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="@label:images.tick@">
     }{
     <!-- not paused -->
     <span class=button>
@@ -47,7 +47,7 @@ USA
      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="@label:images.cross@">
     }@
     @if{@random-enabled@}{
     <!-- random played enabled -->
@@ -57,7 +57,7 @@ USA
      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="@label:images.tick@">
     }{
     <!-- random played disabled -->
     <span class=button>
@@ -66,7 +66,7 @@ USA
      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="@label:images.cross@">
     }@
     @if{@enabled@}{
     <!-- playing enabled -->
@@ -76,7 +76,7 @@ USA
      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="@label:images.tick@">
     }{
     <!-- playing disabled -->
     <span class=button>
@@ -85,29 +85,29 @@ USA
      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="@label:images.cross@">
     }@
     <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@"
        alt="@label:volume.reduce@" title="@label:volume.reduceverbose@">
-     </a>
+     </a>}{<img class=button src="@label:images.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=action type=submit value=volume>
       @label:volume.set@
-     </button>
-     <a class=imgbutton
+     </button>}@
+     @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@"
        alt="@label:volume.increase@" title="@label:volume.increaseverbose@">
-     </a>
+     </a>}{<img class=button src="@label:images.noup@">}@
     </form>
     </span>
    }@
@@ -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}@"
-       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>
@@ -197,7 +207,7 @@ USA
      <!-- cannot move up -->
      <td class=imgbutton>
       <img
-       class=button src="@label:images.noupall@"
+       class=button src="@label:images.noupup@"
        title="@label:playing.upallverbose@" alt="">
      <td class=imgbutton>
       <img
@@ -208,7 +218,7 @@ USA
      <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@"
+       class=button src="@label:images.upup@"
        title="@label:playing.upallverbose@"
        alt="@label:playing.upall@"></a>
      <td class=imgbutton>
@@ -223,7 +233,7 @@ USA
      <!-- cannot move down -->
      <td class=imgbutton>
       <img
-       class=button src="@label:images.nodownall@"
+       class=button src="@label:images.nodowndown@"
        title="@label:playing.downallverbose@" alt="">
      <td class=imgbutton>
       <img
@@ -234,7 +244,7 @@ USA
      <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@"
+       class=button src="@label:images.downdown@"
        title="@label:playing.downallverbose@"
        alt="@label:playing.downall@"></a>
      <td class=imgbutton>