diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-03-31 22:50:23 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-03-31 22:50:23 +0000 |
| commit | b9419fbcd67a154a20c338914031132e0e14438f (patch) | |
| tree | 778457f1671b2716d7109c0d098ad5a80bcec790 | |
| parent | 8324bda48b1a22717b1d1ae7994887a4b2c2ad57 (diff) | |
| download | brdo-b9419fbcd67a154a20c338914031132e0e14438f.tar.gz brdo-b9419fbcd67a154a20c338914031132e0e14438f.tar.bz2 | |
- Partial patch 6680 by Brian: fixed invalid XHTML in search result page.
| -rw-r--r-- | includes/common.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/includes/common.inc b/includes/common.inc index 3cb2ba41f..24ed02e40 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -631,9 +631,8 @@ function search_item($item, $type) { $output = module_invoke($type, "search_item", $item); } else { - $output = " <strong><u><a href=\"". $item["link"] ."\">". $item["title"] ."</a></u></strong><br />"; - $output .= " <small>" . t($type) . ($item["user"] ? " - ". $item["user"] : "") ."". ($item["date"] ? " - ". format_date($item["date"], "small") : "") ."</small>"; - $output .= "<br /><br />"; + $output = " <dt class=\"title\"><a href=\"". $item["link"] ."\">". $item["title"] ."</a></dt>"; + $output .= " <dd class=\"small\">" . t($type) . ($item["user"] ? " - ". $item["user"] : "") ."". ($item["date"] ? " - ". format_date($item["date"], "small") : "") ."</dd>"; } return $output; @@ -659,7 +658,7 @@ function search_form($action = NULL, $keys = NULL, $options = NULL) { $action = url("search"); } - $output = " <br /><input type=\"text\" class=\"form-text\" size=\"50\" value=\"". check_form($keys) ."\" name=\"keys\" />"; + $output = " <div class=\"search-form\"><br /><input type=\"text\" class=\"form-text\" size=\"50\" value=\"". check_form($keys) ."\" name=\"keys\" />"; $output .= " <input type=\"submit\" class=\"form-submit\" value=\"". t("Search") ."\" />\n"; if ($options) { @@ -671,6 +670,7 @@ function search_form($action = NULL, $keys = NULL, $options = NULL) { $output .= " <input type=\"checkbox\" name=\"edit[type][$name]\" ". ($edit["type"][$name] ? " checked=\"checked\"" : "") ." /> ". t($name); } } + $output .= "</div>"; } $form .= "<br />"; @@ -690,9 +690,11 @@ function search_data($keys = NULL) { list($title, $results) = module_invoke($name, "search", $keys); if ($results) { $output .= "<h2>$title</h2>"; + $output .= "<dl class=\"search-results\">"; foreach ($results as $entry) { $output .= search_item($entry, $name); } + $output .= "</dl>"; } } } |