Further hacking. Some actual success at runtime now.

[disorder] / templates / playing.tmpl

diff --git a/templates/playing.tmpl b/templates/playing.tmpl
index 5d369c0eeffbc2f93322eb2da69b595c2d82ba04..5a767e454164e2dd3508cc8cc08ec7674a657952 100644 (file)
--- a/templates/playing.tmpl
+++ b/templates/playing.tmpl
@@ -26,7 +26,7 @@ USA
   @#  @state should be the current state
   @define {onoff} {class action state}
           {<a class=button
-              href="@url?action=@action@back"@class}@q{@state
+              href="@url?action=@action@back"
               title="@label{playing.@q{action}verbose}">
              @label{playing.@class}
            </a>
@@ -92,7 +92,7 @@ USA
           <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=back type=hidden value="@thisurl@?back=manage">
+          <input name=back type=hidden value="@thisurl?back=manage">
           @right{volume}{
             <button class=search name=submit type=submit>
                @label{volume.set}
@@ -146,28 +146,28 @@ USA
         }{}
        </tr>
      }
-     @if{@isqueue@}{
-       <tr class=next>
-        <td colspan=@ifmanage{11}{7}@>@label{playing.next}</td>
-       </tr>
+     @if{@isqueue}{
+      <tr class=next>
+       <td colspan=@ifmanage{11}{7}>@label{playing.next}</td>
+      </tr>
      }
      @queue{
-       <tr class=@parity@>
-        <td class=when>@mwhen{queue}{@id}</td>
-        <td class=who>@mwho{queue}{@id}</td>
-        <td class=artist>@martist{queue}{@track}</td>
-        <td class=album>@malbum{queue}{@track}</td>
-        <td class=title>@mtitle{queue}{@track}</td>
-        <td class=length>@length</td>
-        <td class=imgbutton>@mremove{queue}{@id}</td>
-        @ifmanage{
-          <td class=imgbutton>@mmove{@id}{upall}{2147483647}</td>
-          <td class=imgbutton>@mmove{@id}{up}{1}</td>
-          <td class=imgbutton>@mmove{@id}{down}{-1}</td>
-          <td class=imgbutton>@mmove{@id}{downall}{-2147483647}</td>
-        }
-       </tr>
-     }
+      <tr class=@parity>
+       <td class=when>@mwhen{queue}{@id}</td>
+       <td class=who>@mwho{queue}{@id}</td>
+       <td class=artist>@martist{queue}{@track}</td>
+       <td class=album>@malbum{queue}{@track}</td>
+       <td class=title>@mtitle{queue}{@track}</td>
+       <td class=length>@length{@id}</td>
+       <td class=imgbutton>@mremove{queue}{@id}</td>
+       @ifmanage{
+         <td class=imgbutton>@mmove{@id}{upall}{2147483647}</td>
+         <td class=imgbutton>@mmove{@id}{up}{1}</td>
+         <td class=imgbutton>@mmove{@id}{down}{-1}</td>
+         <td class=imgbutton>@mmove{@id}{downall}{-2147483647}</td>
+       }{}
+      </tr>
+    }
    </table>
 }