remove action; better findtrack; more template fiddling

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

index 084f5c3..d0e0000 100644 (file)
--- a/templates/playing.tmpl
+++ b/templates/playing.tmpl
@@ -19,12 +19,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  USA
  -->
  @discard{
-  @define {ifmanage} {yes no}
-         {@if {@eq {@arg{action}}{manage}}
-              {@yes}
-              {@no}}
-  @define {back} {}
-          {@ifmanage{&amp;back=manage}{}}
    @include{macros.tmpl}
  }@#
  <html>
@@ -154,39 +148,13 @@ USA
        <td colspan=@ifmanage{11}{7}>@label{playing.now}</td>
       </tr>
       <tr class=playing>
-      <td class=when>@when{@id}</td>
-      <td class=who>@if{@eq{@who{@id}}{}}
-                       {@if{@eq{@state{@id}}{random}}
-                           {@label{playing.randomtrack}}
-                           {&nbsp;}}
-                       {@who{@id}}
-      </td>
-      <td class=artist>@right{play}
-                             {<a class=directory
-                                 href="@url?action=choose&amp;directory=@urlquote{@dirname{@dirname{@track}}}"
-                                 title="@label{playing.artistverbose}">@part{@id}{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{@track}}"
-                                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{@id}{title}">@part{@id}{short}{title}</span></td>
+      <td class=when>@mwhen{playing}{@id}</td>
+      <td class=who>@mwho{playing}{@id}</td>
+      <td class=artist>@martist{playing}{@track}</td>
+      <td class=album>@malbum{playing}{@track}</td>
+      <td class=title>@mtitle{playing}{@track}</td>
        <td class=length>@length{@id}</td>
-      <td class=imgbutton>@if{@removabl{@id}}
-                             {<a class=imgbutton
-                                 href="@url?action=scratch&#38;id=@id@back">
-                              <img class=button src="@image{scratch}"
-                                   title="@label{playing.scratchverbose}"
-                                   alt="@label{playing.scratch}"></a>}
-                             {<img class=button src="@image{noscratch}"
-                                   title="@label{playing.scratchverbose}"
-                                   alt="@label{playing.scratch}">}
-      </td>
+      <td class=imgbutton>@mremove{playing}{@id}</td>
        @ifmanage{
        <td class=imgbutton>&nbsp;</td>
        <td class=imgbutton>&nbsp;</td>
@@ -202,31 +170,13 @@ USA
       }
       @queue{
       <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>@right{play}{<a class=directory
-       title="@part{@id}{artist}@"
-       href="@url?action=choose&amp;directory=@urlquote{@dirname{@dirname{@track}@}@}@"
-       >@part{@id}{short}{artist}</a>}{<span class=directory
-       title="@part{@id}{artist}@"
-       >@part{@id}{short}{artist}</span>}</td>
-      <td class=album>@right{play}{<a class=directory
-       title="@part{@id}{album}@"
-       href="@url?action=choose&amp;directory=@urlquote{@dirname{@track}@}@"
-       >@part{@id}{short}{album}</a>}{<span class=directory
-       title="@part{@id}{album}@"
-       >@part{@id}{short}{album}@}</td>
-      <td class=title><span
-       title="@part{@id}{title}@">@part{@id}{short}{title}</span></td>
+      <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>@if{@removable@}{<a class=imgbutton
-       href="@url?action=remove&#38;id=@id@@back"><img
-       class=button src="@image{scratch}"
-       title="@label{playing.removeverbose}" 
-       alt="@label{playing.remove}"></a>}{<img
-       class=button src="@image{noscratch}"
-       title="@label{playing.removeverbose}"
-       alt="@label{playing.remove}">}</td>
+      <td class=imgbutton>@mremove{queue}{@id}</td>
  
        @if{@eq{@arg{action}}{manage}}{
        @if{@or{@isfirst@}
@@ -286,7 +236,7 @@ USA
     </table>
  }
  
-@include{topbarend}@#
+@include{topbarend.tmpl}@#
   </body>
  </html>
  @discard{