Merge fixes up to 3.0.1

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

index abf97a6920f742f17615e2748ad596b0ddb9581e..73eea2d4e3f144f7a88d9eb0ead927f5b09923a3 100644 (file)
--- a/templates/new.html
+++ b/templates/new.html
@@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
  <!--
  This file is part of DisOrder.
-Copyright (C) 2004, 2005, 2007 Richard Kettlewell
+Copyright (C) 2004-2008 Richard Kettlewell
  
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@ USA
    <title>@label:new.title@</title>
   </head>
   <body>
-@include{@label{menu}@}@
-  <h1 class=title>@label:new.title@</h1>
+@include{topbar}@
+  <h1>@label:new.title@</h1>
  
  @#{only display the table if there is something to put in it}@
  @if{@isnew@}{
@@ -35,34 +35,42 @@ USA
       <th class=album>@label:heading.album@</th>
       <th class=title>@label:heading.title@</th>
       <th class=length>@label:heading.length@</th>
-      <th class=button>&nbsp;</th>
+@right{prefs}{
+     <th class=button>&nbsp;</th>}@
      </tr>
      @new{
      <tr class=@parity@>
-     <td class=artist><a
+     <td class=artist>@right{play}{<a class=directory
         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
+       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}@"
-       class=directory
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@">@part{short}{album}@</a></td>
-     <td class=title><a
+       >@part{short}{album}@</span>}@</td>
+     <td class=title>@right{play}{<a class=file
         title="@part{title}@"
-       class=file
-       href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@&#38;nonce=@nonce@">@part{short}{title}@</a></td>
+       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;nonce=@nonce@&#38;0_file=@urlquote{@file@}@"><img
-       class=button src="@label:images.edit@"
+      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>}@
      }@
    </table>
  }@
  
-@include{@label{menu}@end}@
+@include{topbarend}@
   </body>
  </html>
  @@