From 57f55a15626f0b4089f8659336831d2707ef811e Mon Sep 17 00:00:00 2001
Message-Id: <57f55a15626f0b4089f8659336831d2707ef811e.1715318415.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 5 Jun 2008 15:54:38 +0100
Subject: [PATCH] Tidy up search form; remove cruft
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 templates/choose.tmpl  | 26 ++++++++++++++------------
 templates/disorder.css |  6 +++---
 templates/macros.tmpl  |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/templates/choose.tmpl b/templates/choose.tmpl
index 06e04f6..599cdf5 100644
--- a/templates/choose.tmpl
+++ b/templates/choose.tmpl
@@ -87,18 +87,20 @@ USA
 }
 
 @# Always have a search form
-   <form class=search
-         action="@url"
-         method=POST
-         enctype="multipart/form-data" accept-charset=utf-8>
-     <p class=search>Enter search terms:
-       <input class=query name=query type=text value="@argq{query}"
-              size=50>
-       @submit{@label{search.search}}
-       <input name=action type=hidden value=choose>
-       @actbutton{@label{search.clear}}{}{choose}
-     </p>
-   </form>
+   <div class=search>
+    <form class=search
+          action="@url"
+	  method=POST
+	  enctype="multipart/form-data" accept-charset=utf-8>
+      <p class=search>Enter search terms:
+	<input class=query name=query type=text value="@argq{query}"
+	       size=50>
+	@submit{@label{search.search}}
+	<input name=action type=hidden value=choose>
+      </p>
+    </form>
+@actbutton{@label{search.clear}}{}{choose}
+   </div>
 
    @if{@ne{@arg{query}}{}}
       {@# There's a search query
diff --git a/templates/disorder.css b/templates/disorder.css
index 3bc312d..91394f8 100644
--- a/templates/disorder.css
+++ b/templates/disorder.css
@@ -244,12 +244,12 @@ div.search_title a:active {
   color: red
 }
 
-form.search {
+div.search {
   border: 1px solid black;	/* Give the search box a border */
-  padding: 0.2em
+  padding: 0.2em;
 }
 
-form.search p {
+form.search, form.search p {
   display: inline
 }
 
diff --git a/templates/macros.tmpl b/templates/macros.tmpl
index 3132e57..d0bfe15 100644
--- a/templates/macros.tmpl
+++ b/templates/macros.tmpl
@@ -280,7 +280,7 @@ 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
-- 
[mdw]