X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/99955407d05eb81a81b410cd4b6d182f64e1ff57..3569ddb84a7cb691641022c20032c24f0a8dd89b:/templates/playing.tmpl

diff --git a/templates/playing.tmpl b/templates/playing.tmpl
index 5a767e4..147333c 100644
--- 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>
@@ -74,8 +73,8 @@ USA
    <div class=mgmt>
      <p class=mgmt>
        @if{@paused}
-	  {@onoff{class}{resume}{enabled}}
-	  {@onoff{class}{pause}{disabled}}
+	  {@onoff{pause}{resume}{enabled}}
+	  {@onoff{pause}{pause}{disabled}}
        @if{@random-enabled}
 	  {@onoff{random}{randomdisable}{enabled}}
 	  {@onoff{random}{randomenable}{disabled}}
@@ -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}{-}
