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

[disorder] / templates / choose.tmpl

diff --git a/templates/choose.tmpl b/templates/choose.tmpl
index 4300852218917d580bee136bab2c33a5b2012e30..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>
 
@@ -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>