X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/49e57291d78de2b583d6f2197ae6f9d9ff05e456..8042af4ab3d704dcc3077815e005f0448755eb3d:/templates/choose.tmpl?ds=sidebyside

diff --git a/templates/choose.tmpl b/templates/choose.tmpl
index 16cb985..11d0e95 100644
--- a/templates/choose.tmpl
+++ b/templates/choose.tmpl
@@ -87,25 +87,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>
-       <span class=button>
-        <button class=search name=submit type=submit>
-          @label{search.search}
-        </button>
-       </span>
-       <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
@@ -172,7 +167,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>
@@ -196,7 +191,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>]}
@@ -204,7 +199,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}}">
@@ -213,10 +208,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>