Merge playlist branch against trunk to date.

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

index 383f281da9101caa36d424625da6a23047d8ef38..10fc031c034fc6139abfa2899045a90af9c9fba6 100644 (file)
--- a/templates/choose.tmpl
+++ b/templates/choose.tmpl
@@ -3,20 +3,18 @@
  This file is part of DisOrder.
  Copyright (C) 2004-2008 Richard Kettlewell
  
-This program is free software; you can redistribute it and/or modify
+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
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
  
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
  <html>
   <head>
@@ -87,23 +85,20 @@ USA
  }
  
  @# Always have a search form
-   <form class=search
-         action="@url"
-         method=POST
-         enctype="multipart/form-data" accept-charset=utf-8>
-     <p class=search>Enter search terms:
-       <input class=query name=query type=text value="@argq{query}"
-              size=50>
-       <button class=search name=submit type=submit>
-         @label{search.search}
-       </button>
-       <input name=action type=hidden value=choose>
-       <a class=button
-          href="@url?action=choose">
-         @label{search.clear}
-       </a>
-     </p>
-   </form>
+   <div class=search>
+    <form class=search
+          action="@url"
+         method=POST
+         enctype="multipart/form-data" accept-charset=utf-8>
+      <p class=search>Enter search terms:
+       <input class=query name=query type=text value="@argq{query}"
+              size=50>
+       @submit{@label{search.search}}
+       <input name=action type=hidden value=choose>
+      </p>
+    </form>
+@actbutton{@label{search.clear}}{}{choose}
+   </div>
  
     @if{@ne{@arg{query}}{}}
        {@# There's a search query
@@ -170,7 +165,7 @@ USA
        <p class=entry>
         <a href="@url?action=choose&#38;dir=@urlquote{@track}">
          <img class=button src="@image{directory}" alt="">
-        @display
+        @quote{@display}
         </a>
        </p>}
      </div>
@@ -194,7 +189,7 @@ USA
         }@#
         <a href="@url?action=play&#38;track=@urlquote{@track}&#38;back=@urlquote{@thisurl}"
            title="@label{choose.play}">
-        @display
+        @quote{@display}
         </a>
         @if{@eq{@trackstate{@track}}{playing}}
            {[<b>playing</b>]}
@@ -202,7 +197,7 @@ USA
            {[<b>queued</b>]}
        </p>}
        @sometracks{
-      <p class=all>
+      <div class=allfiles>
          @right{prefs}{
          <a class=imgprefs
             href="@url?action=prefs&#38;dir=@urlquote{@arg{dir}}">
@@ -211,10 +206,12 @@ USA
                title="@label{choose.allprefsverbose}"
                alt="@label{choose.allprefs}">
          </a>}
-        <a class=button
-           href="@url?action=play&#38;dir=@urlquote{@arg{dir}}&#38;back=@urlquote{@thisurl}">
-         @label{choose.playall}
-        </a>
+        <form method=POST class=button action="@url">
+         <input type=hidden name=action value=play>
+        <input type=hidden name=dir value="@argq{dir}">
+        <input type=hidden name=back value="@quote{@thisurl}">
+         <input type=submit name=submit value="@label{choose.playall}">
+        </form>
        </p>}
      </div>
     </div>