update help

[disorder] / templates / playing.html
diff --git a/templates/playing.html b/templates/playing.html

index 8aff7fbec1cb66d68d048af80972508af8e475df..30346acb57f194e25e12c3d43f717a8e0f28e680 100644 (file)
--- a/templates/playing.html
+++ b/templates/playing.html
@@ -24,7 +24,7 @@ USA
    <title>@if{@isplaying@}{@playing{@part:title@}@}{@label:playing.title@}@</title>
   </head>
   <body>
-@include{@label{menu}@}@
+@include{topbar}@
     <h1 class=title>@label:playing.title@</h1>
  
     @#{extra control buttons for the management page}@
@@ -140,11 +140,12 @@ USA
        <td class=who>@if{@eq{@who@}{}@}{@if{@eq{@state@}{random}@}{@label:playing.randomtrack@}{&nbsp;}@}{@who@}@</td>
        <td class=artist><a class=directory
         href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@"
-       title="@label:playing.artistverbose@">@part:artist@</a></td>
+       title="@label:playing.artistverbose@">@part{short}{artist}@</a></td>
        <td class=album><a class=directory
         href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@"
-       title="@label:playing.albumverbose@">@part:album@</a></td>
-      <td class=title>@part:title@</td>
+       title="@label:playing.albumverbose@">@part{short}{album}@</a></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
@@ -170,26 +171,41 @@ 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 class=directory href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@">@part:artist@</a></td>
-      <td class=album><a class=directory href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@">@part:album@</a></td>
-      <td class=title>@part:title@</td>
+      <td class=artist><a 
+       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
+       title="@part{album}@"
+       class=directory 
+       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@">@part{short}{album}@</a></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@"
         title="@label:playing.removeverbose@" 
-       alt="@label:playing.remove@"></a>}{&nbsp;}@</td>
+       alt="@label:playing.remove@"></a>}{<img
+       class=button src="@label:images.noscratch@"
+       title="@label:playing.removeverbose@"
+       alt="@label:playing.remove@">}@</td>
+
        @if{@arg:mgmt@}{
-      @if{@isfirst@}
-    {<td class=imgbutton>
+      @if{@or{@isfirst@}
+             {@not{@movable@}@}@}{
+     <!-- cannot move up -->
+     <td class=imgbutton>
        <img
         class=button src="@label:images.noupall@"
         title="@label:playing.upallverbose@" alt="">
       <td class=imgbutton>
        <img
         class=button src="@label:images.noup@"
-       title="@label:playing.upverbose@" alt="">}
-    {<td class=imgbutton>
+       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@"
@@ -199,33 +215,42 @@ USA
       <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@"
-       title="@label:playing.upverbose@" alt="@label:playing.up@"></a>}@
-      @if{@islast@}
-    {<td class=imgbutton>
+       title="@label:playing.upverbose@" alt="@label:playing.up@"></a>
+         }@
+
+      @if{@or{@islast@}
+             {@not{@movable@}@}@}{
+     <!-- cannot move down -->
+     <td class=imgbutton>
+      <img
+       class=button src="@label:images.nodownall@"
+       title="@label:playing.downallverbose@" alt="">
+     <td class=imgbutton>
        <img
         class=button src="@label:images.nodown@"
         title="@label:playing.downverbose@" alt="">
+         }{
+     <!-- can move down -->
       <td class=imgbutton>
-     <img
-       class=button src="@label:images.nodownall@"
-       title="@label:playing.downallverbose@" alt="">}
-    {<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@"
-       title="@label:playing.downverbose@"
-       alt="@label:playing.down@">
-     <td class=imgbutton>
-     <a class=imgbutton href="@url@?action=move&#38;nonce=@nonce@&#38;id=@id@&#38;delta=-2147483647&#38;mgmt=true"><img
+      <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@"
         title="@label:playing.downallverbose@"
-       alt="@label:playing.downall@">}@</a>
+       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@"
+       title="@label:playing.downverbose@" alt="@label:playing.down@"></a>
+         }@
+
        }@
       </tr>
       }@}@
     </table>
  }@
  
-@include{@label{menu}@end}@
+@include{topbarend}@
   </body>
  </html>
  @@