Missed an action button in earlier changes

[disorder] / templates / choose.tmpl

diff --git a/templates/choose.tmpl b/templates/choose.tmpl
index fcba496bb921df23120b2f6914069a5341138e2a..4868143d8f0f14004755be23d4d28feb648d9f60 100644 (file)
--- a/templates/choose.tmpl
+++ b/templates/choose.tmpl
@@ -87,23 +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>
-       <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
@@ -125,7 +122,7 @@ USA
      @right{prefs}{
      <td class=imgbutton>
       <a class=imgbutton
-         href="@url?action=prefs&#38;0_file=@urlquote{@track}">
+         href="@url?action=prefs&#38;track=@urlquote{@track}">
        <img class=button src="@image{edit}"
             title="@label{choose.prefsverbose}"
             alt="@label{choose.prefs}">
@@ -152,7 +149,11 @@ USA
 @# NB we don't really bother distinguishing between re being empty or absent,
 @# and the server deliberately cooperates in this.
 
-@# TODO navigation...
+   @if{@ne{@arg{dir}}{}}{
+   <p class=directoryname>@#
+@breadcrumbs{@arg{dir}} 
+            {/<a href="@url?action=choose&#38;dir=@urlquote{@dir}">@#
+@basename{@dir}</a>}:</p>}
 
 @#  <p>dir=[@arg{dir}]<br>re=[@arg{re}]<br>which=@label{choose.which}</p>
 
@@ -181,14 +182,14 @@ USA
 @define{sometracks}{template}{@template}@#
        @right{prefs}{
         <a class=imgprefs
-           href="@url?action=prefs&#38;0_file=@urlquote{@resolve{@track}}">
+           href="@url?action=prefs&#38;track=@urlquote{@resolve{@track}}">
          <img class=button
               src="@image{edit}"
               title="@label{choose.prefsverbose}"
               alt="@label{choose.prefs}">
         </a>
        }@#
-       <a href="@url?action=play&#38;file=@urlquote{@track}&#38;back=@urlquote{@thisurl}"
+       <a href="@url?action=play&#38;track=@urlquote{@track}&#38;back=@urlquote{@thisurl}"
           title="@label{choose.play}">
         @display
        </a>
@@ -207,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=action 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>