Tidy up search form; remove cruft

diff --git a/templates/choose.tmpl b/templates/choose.tmpl
index 06e04f6b33470a4e2e25ca3a1dcdf8b459320d5c..599cdf5f0c7512fe419fff7d0e41dd3cde9db21f 100644 (file)
--- a/templates/choose.tmpl
+++ b/templates/choose.tmpl
@@ -87,18 +87,20 @@ USA
 }
 
 @# Always have a search form
 }
 
 @# 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
 
    @if{@ne{@arg{query}}{}}
       {@# There's a search query

diff --git a/templates/disorder.css b/templates/disorder.css
index 3bc312d18f24a681869bd854115ebf9534689503..91394f89de7317d74757dd97fc2d368060a7a7d2 100644 (file)
--- a/templates/disorder.css
+++ b/templates/disorder.css
@@ -244,12 +244,12 @@ div.search_title a:active {
   color: red
 }
 
   color: red
 }
 

-form.search {
+div.search {

   border: 1px solid black;     /* Give the search box a border */
   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
 }
 
   display: inline
 }
 

diff --git a/templates/macros.tmpl b/templates/macros.tmpl
index 3132e570eaf9167051768e9c6b4be46e26dbf520..d0bfe152748f01d2aa48b737b8df46aad50db05a 100644 (file)
--- 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}
 @# 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
 
 @# Expand to an action button
 @#  @text is the text to put inside the button