Added a small icon to the search input box.

diff --git a/debian/changelog b/debian/changelog
index e901354eb80c94faef4a63583b290a0a472de860..d20435626d22e5568149efdbb1720d85b02b4621 100644 (file)
--- 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.
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 

diff --git a/doc/style.css b/doc/style.css
index c7dc070cdc4046622ffe24862396165deb7e1a96..30f7ee3f3a1d169a023b849e38e416f37357d838 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -256,6 +256,14 @@ input#openid_url {
        padding-left: 18px;
 }
 
        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; }
 /* 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 43810460f6707c3d44ca1ddcc20005817584beee..ad6718f0994af7ed3a6a2ca7c3fcdaf111d47201 100644 (file)
--- 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]]
 
 > 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 (file)
index 0000000..02f9da4
Binary files /dev/null and b/doc/wikiicons/search-bg.gif differ

diff --git a/templates/searchform.tmpl b/templates/searchform.tmpl
index d49cf22d33340cb7c2603149179bf2bad6e78001..afae2ebf5d711b60fb87dbb9020cdcd98de4f98c 100644 (file)
--- a/templates/searchform.tmpl
+++ b/templates/searchform.tmpl
@@ -1,5 +1,5 @@
 <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
 <div>
 <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>
 </div>
 </form>