Macro-ize (most) <A>-based buttons

[disorder] / templates / choose.tmpl

diff --git a/templates/choose.tmpl b/templates/choose.tmpl
index fcba496bb921df23120b2f6914069a5341138e2a..06e04f6b33470a4e2e25ca3a1dcdf8b459320d5c 100644 (file)
--- a/templates/choose.tmpl
+++ b/templates/choose.tmpl
@@ -94,14 +94,9 @@ USA
      <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>
+       @submit{@label{search.search}}
        <input name=action type=hidden value=choose>
-       <a class=button
-          href="@url?action=choose">
-         @label{search.clear}
-       </a>
+       @actbutton{@label{search.clear}}{}{choose}
      </p>
    </form>
 
@@ -125,7 +120,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 +147,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 +180,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>