Tidy up search form; remove cruft

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

index bc0200e878b3696fcc9b2d403178ff44c0da33df..147333cdf5f2b84919f3faeb683787f24a622ec5 100644 (file)
--- a/templates/playing.tmpl
+++ b/templates/playing.tmpl
@@ -25,11 +25,9 @@ USA
    @#  @action should be the action to switch to the opposite state
    @#  @state should be the current state
    @define {onoff} {class action state}
-          {<a class=button
-              href="@url?action=@action@back"
-              title="@label{playing.@q{action}verbose}">
-             @label{playing.@class}
-           </a>
+          {@actbutton{@label{playing.@class}}
+                     {@label{playing.@q{@action}verbose}}
+                     {@action}
             <img width=@width height=@height class=imgbutton
                  src="@image{@state}">}
  
@@ -54,9 +52,10 @@ USA
                  {@yes}
                  {@no}}
  
-  @# Expand to &back=manage or to nothing
-  @define {back} {}
-         {@ifmanage{&amp;back=manage}{}}
+  @ifmanage{
+    @define {back} {} {&amp;back=manage}
+    @define {formback} {} {<input type=hidden name=back value=manage>}
+  }{}
  }@#
  <html>
   <head>
@@ -92,11 +91,9 @@ USA
            <input size=3 name=left type=text value="@volume{left}">
            @label{volume.right}
            <input size=3 name=right type=text value="@volume{right}">
-          <input name=back type=hidden value="@thisurl?back=manage">
+          <input name=back type=hidden value="@quote{@thisurl}">
            @right{volume}{
-            <button class=search name=submit type=submit>
-               @label{volume.set}
-            </button>
+             @submit{@label{volume.set}}
              <input name=action type=hidden value=volume>
            }
            @vbutton{down}{-}