update help

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

index 2f1f42f..30346ac 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}@
@@ -186,18 +186,26 @@ USA
         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@"
@@ -207,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>
  @@