more template fiddling

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

index 73eea2d4e3f144f7a88d9eb0ead927f5b09923a3..e017a740fe664720cb5bd6bacad53e693e98a7fc 100644 (file)
--- a/templates/new.tmpl
+++ b/templates/new.tmpl
@@ -20,65 +20,53 @@ USA
  -->
  <html>
   <head>
-@include:stdhead@
-  <title>@label:new.title@</title>
+@stdhead{new}
   </head>
   <body>
-@include{topbar}@
-  <h1>@label:new.title@</h1>
+@stdmenu{new}
+  <h1>@label{new.title}</h1>
  
-@#{only display the table if there is something to put in it}@
-@if{@isnew@}{
+@# Only display the table if there is something to put in it
+@if{@isnew}{
    <table class=new>
      <tr class=headings>
-     <th class=artist>@label:heading.artist@</th>
-     <th class=album>@label:heading.album@</th>
-     <th class=title>@label:heading.title@</th>
-     <th class=length>@label:heading.length@</th>
+     <th class=artist>@label{heading.artist}</th>
+     <th class=album>@label{heading.album}</th>
+     <th class=title>@label{heading.title}</th>
+     <th class=length>@label{heading.length}</th>
  @right{prefs}{
-     <th class=button>&nbsp;</th>}@
+     <th class=button>&nbsp;</th>}
      </tr>
      @new{
-    <tr class=@parity@>
-     <td class=artist>@right{play}{<a class=directory
-       title="@part{artist}@"
-       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}@"
-       >@part{short}{album}@</span>}@</td>
-     <td class=title>@right{play}{<a class=file
-       title="@part{title}@"
-       href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@"
-       >@part{short}{title}@</a>}{<span class=file
-       title="@part{title}@"
-       >@part{short}{title}@</span>}@</td>
-     <td class=length>@length@</td>
-@right{prefs}{
-     <td class=imgbutton><a class=imgbutton
-      href="@url@?action=prefs&#38;0_file=@urlquote{@file@}@"><img
-       class=button src="@image:edit@"
-       title="@label:choose.prefsverbose@"
-       alt="@label:choose.prefs@"></a></td>
-    </tr>}@
-    }@
+    <tr class=@parity>
+     <td class=artist>@martist{new}{@track}</td>
+     <td class=album>@malbum{new}{@track}</td>
+     <td class=title>@mtitle{new}{@track}</td>
+     <td class=length>@length{@id}</td>
+     @right{prefs}{
+     <td class=imgbutton>
+      <a class=imgbutton
+         href="@url?action=prefs&#38;0_file=@urlquote{@track}">
+       <img class=button src="@image{edit}"
+            title="@label{choose.prefsverbose}"
+            alt="@label{choose.prefs}">
+      </a>
+     </td>
+    </tr>}
+    }
    </table>
-}@
+}
  
-@include{topbarend}@
+@credits
   </body>
  </html>
-@@
-<!--
+@discard{
  Local variables:
  mode:sgml
  sgml-always-quote-attributes:nil
  sgml-indent-step:1
  sgml-indent-data:t
+indent-tabs-mode:nil
+fill-column:79
  End:
--->
+}@#