Merge fixes up to 3.0.1

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

index b534591e6d001ddc38a65de8eacaf3364252db83..1b0fa1ce282bb979502cc150eb11b087b2fea22d 100644 (file)
--- a/templates/search.html
+++ b/templates/search.html
@@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
  <!--
  This file is part of DisOrder.
-Copyright (C) 2003, 2004, 2005 Richard Kettlewell
+Copyright (C) 2003, 2004, 2005, 2007, 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
@@ -25,7 +25,7 @@ USA
   </head>
   <body>
  @include{topbar}@
-   <h1 class=title>@label:search.title@</h1>
+   <h1>@label:search.title@</h1>
  
     <form class=search action="@url@" method=POST
           enctype="multipart/form-data" accept-charset=utf-8>
@@ -36,23 +36,22 @@ USA
        @label:search.search@
       </button>
       <input name=action type=hidden value=search>
-     <input name=nonce type=hidden value="@nonce@">
       </p>
     </form>
  
     <div class=searchresults>
      @search{artist}{display}{
      <div class="search_artist">
-     <p class="search_artist">Artist:
+     <p>Artist:
        <span class="search_artist">@part:artist@</span></p>
       @search{album}{display}{
       <div class="search_album">
-      <p class="search_album">Album:
+      <p>Album:
         <span class="search_album">@part:album@</span></p>
        @search{title}{
        <div class="search_title">
-       <p class="search_title">Title:
-       <a href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@&#38;nonce=@nonce@">@part:title@</a>
+       <p>Title:
+       <a href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@">@part:title@</a>
         @if{@eq{@trackstate{@file@}@}{playing}@}{[<b>playing</b>]}@
         @if{@eq{@trackstate{@file@}@}{queued}@}{[<b>queued</b>]}@
         </p>