X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/3b95af9c3a2e21cc5e6567b8ca08376d1c289528..812b526d127c6657e571db8b33a58137af6709cd:/templates/macros.tmpl

diff --git a/templates/macros.tmpl b/templates/macros.tmpl
index 5d33446..320e688 100644
--- a/templates/macros.tmpl
+++ b/templates/macros.tmpl
@@ -1,20 +1,18 @@
 This file is part of DisOrder.
 Copyright (C) 2008 Richard Kettlewell
 
-This program is free software; you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 ------------------------------------------------------------------------
@@ -24,7 +22,7 @@ Standard macros
 This file is read before any other template.  Its output is discarded
 but side effects (definitions of macros) are retained.  To override it,
 create /etc/disorder/macros.tmpl that includes this file by absolute path
-and then redefines macros as desired.
+and then redefine macros as desired.
 ------------------------------------------------------------------------
 
 
@@ -280,20 +278,22 @@ and then redefines macros as desired.
 @# Expand to a submit button
 @#  @text is the text to put inside the button
 @define {submit} {text}
-        {<span class=buttonouter><button class=button name=submit type=submit><span class=buttoninner>@text</span></button></span>}
+        {<button class=button name=submit type=submit>@text</button>}
 
 @# Expand to an action button
 @#  @text is the text to put inside the button
 @#  @long is the text to put in the caption
 @#  @action is the target action
 @define {actbutton} {text long action}
-        {<a class=button
-              href="@url?action=@action@back"
-              title="@long">@text</a>}
+        {<form method=POST class=button action="@url">
+           <input type=hidden name=action value="@action">
+           <input type=submit name=submit value="@text" title="@long">
+@formback@#
+         </form>}
 
-@# Expands to &back=manage or to nothing depending on context;
-@# see playing.tmpl.
+@# Used for inserting back= elements
 @define {back} {} {}
+@define {formback} {} {}
 
 Local variables:
 mode:sgml