From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 6 Aug 2008 23:31:56 +0000 (-0400)
Subject: Added a small icon to the search input box.
X-Git-Tag: 2.60~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6cfb5c5b5905a5815f35b026b1c589358c2c16e9;p=ikiwiki.git

Added a small icon to the search input box.
---

diff --git a/debian/changelog b/debian/changelog
index e901354eb..d20435626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ ikiwiki (2.60) UNRELEASED; urgency=low
   * Options set in the setup file are now immediatly loaded by ikiwiki -setup.
     This allows later switches to override them. Previously, setup file
     options overrode most command line options.
+  * Added a small icon to the search input box.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 
diff --git a/doc/style.css b/doc/style.css
index c7dc070cd..30f7ee3f3 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -256,6 +256,14 @@ input#openid_url {
 	padding-left: 18px;
 }
 
+input#searchbox {
+	background: url(wikiicons/search-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 0 50%;
+	color: #000;
+	padding-left: 16px;
+}
+
 /* Things to hide in printouts. */
 @media print {
 	.actions { display: none; }
diff --git a/doc/todo/Add_label_to_search_form_input_field.mdwn b/doc/todo/Add_label_to_search_form_input_field.mdwn
index 43810460f..ad6718f09 100644
--- a/doc/todo/Add_label_to_search_form_input_field.mdwn
+++ b/doc/todo/Add_label_to_search_form_input_field.mdwn
@@ -47,4 +47,4 @@ The patch below adds a label for the field to improve usability:
 > to get it to appear higher up is to put it first, or to use Evil absolute
 > positioning. (CSS sucks.) --[[Joey]]
 
-[[wishlist]]
+[[done wishlist]]
diff --git a/doc/wikiicons/search-bg.gif b/doc/wikiicons/search-bg.gif
new file mode 100644
index 000000000..02f9da4a7
Binary files /dev/null and b/doc/wikiicons/search-bg.gif differ
diff --git a/templates/searchform.tmpl b/templates/searchform.tmpl
index d49cf22d3..afae2ebf5 100644
--- a/templates/searchform.tmpl
+++ b/templates/searchform.tmpl
@@ -1,5 +1,5 @@
 <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
 <div>
-<input type="text" name="P" value="" size="16" />
+<input type="text" id="searchbox" name="P" value="" size="16" />
 </div>
 </form>