diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-01-11 18:56:07 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-01-11 18:56:07 +0000 |
| commit | 0e0b1120fba8ed4f2ebc5d62eb29b1a34c1b1007 (patch) | |
| tree | 5cd57f820281c20c6936433d92483cc4712a7ab7 /phpBB/styles | |
| parent | 9ea5fa1768feebfb04f2303788eb4c685161e3dd (diff) | |
| download | forums-0e0b1120fba8ed4f2ebc5d62eb29b1a34c1b1007.tar forums-0e0b1120fba8ed4f2ebc5d62eb29b1a34c1b1007.tar.gz forums-0e0b1120fba8ed4f2ebc5d62eb29b1a34c1b1007.tar.bz2 forums-0e0b1120fba8ed4f2ebc5d62eb29b1a34c1b1007.tar.xz forums-0e0b1120fba8ed4f2ebc5d62eb29b1a34c1b1007.zip | |
- overhauled search system
- updated structure for search backend plugins
- better result caching using ACM
- search results no longer session restricted => link to them by copying the URL :)
- in-topic search
- indexing posts now uses search backend plugins
- develop/search_fill.php working again
- fulltext_mysql not working yet
- tiny bugfixes to ACM
git-svn-id: file:///svn/phpbb/trunk@5441 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/subSilver/template/search_body.html | 14 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/search_results.html | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/styles/subSilver/template/search_body.html b/phpBB/styles/subSilver/template/search_body.html index f3811ff140..11a7cdc93c 100644 --- a/phpBB/styles/subSilver/template/search_body.html +++ b/phpBB/styles/subSilver/template/search_body.html @@ -4,13 +4,13 @@ <div id="pagecontent"> - <form method="post" action="{S_SEARCH_ACTION}"><table class="tablebg" width="100%" cellspacing="1"> + <form method="get" action="{S_SEARCH_ACTION}"><table class="tablebg" width="100%" cellspacing="1"> <tr> <th colspan="4">{L_SEARCH_QUERY}</th> </tr> <tr> <td class="row1" colspan="2" width="50%"><b class="genmed">{L_SEARCH_KEYWORDS}: </b><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td> - <td class="row2" colspan="2" valign="top"><input type="text" style="width: 300px" class="post" name="keywords" size="30" /><br /><input type="radio" name="search_terms" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_ALL_TERMS}</span><br /><input type="radio" name="search_terms" value="any" /> <span class="genmed">{L_SEARCH_ANY_TERMS}</span></td> + <td class="row2" colspan="2" valign="top"><input type="text" style="width: 300px" class="post" name="keywords" size="30" /><br /><input type="radio" name="terms" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_ALL_TERMS}</span><br /><input type="radio" name="terms" value="any" /> <span class="genmed">{L_SEARCH_ANY_TERMS}</span></td> </tr> <tr> <td class="row1" colspan="2"><b class="genmed">{L_SEARCH_AUTHOR}:</b><br /><span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td> @@ -18,28 +18,28 @@ </tr> <tr> <td class="row1" colspan="2"><b class="genmed">{L_SEARCH_FORUMS}: </b><br /><span class="gensmall">{L_SEARCH_FORUMS_EXPLAIN}</span></td> - <td class="row2" colspan="2"><select name="search_forum[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></td> + <td class="row2" colspan="2"><select name="fid[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></td> </tr> <tr> <th colspan="4">{L_SEARCH_OPTIONS}</th> </tr> <tr> <td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_SUBFORUMS}: </b></td> - <td class="row2" width="25%" nowrap="nowrap"><input type="radio" name="search_child" value="1" checked="checked" /> <span class="genmed">{L_YES}</span> <input type="radio" name="search_child" value="0" /> <span class="genmed">{L_NO}</span></td> + <td class="row2" width="25%" nowrap="nowrap"><input type="radio" name="sc" value="1" checked="checked" /> <span class="genmed">{L_YES}</span> <input type="radio" name="sc" value="0" /> <span class="genmed">{L_NO}</span></td> <td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_WITHIN}: </b></td> - <td class="row2" width="25%" nowrap="nowrap"><input type="radio" name="search_fields" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_TITLE_MSG}</span><br /><input type="radio" name="search_fields" value="msgonly" /> <span class="genmed">{L_SEARCH_MSG_ONLY}</span> <br /><input type="radio" name="search_fields" value="titleonly" /> <span class="genmed">{L_SEARCH_TITLE_ONLY}</span></td> + <td class="row2" width="25%" nowrap="nowrap"><input type="radio" name="sf" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_TITLE_MSG}</span><br /><input type="radio" name="sf" value="msgonly" /> <span class="genmed">{L_SEARCH_MSG_ONLY}</span> <br /><input type="radio" name="sf" value="titleonly" /> <span class="genmed">{L_SEARCH_TITLE_ONLY}</span></td> </tr> <tr> <td class="row1"><b class="genmed">{L_RESULT_SORT}: </b></td> <td class="row2" nowrap="nowrap">{S_SELECT_SORT_KEY}<br /><input type="radio" name="sd" value="a" /> <span class="genmed">{L_SORT_ASCENDING}</span><br /><input type="radio" name="sd" value="d" checked="checked" /> <span class="genmed">{L_SORT_DESCENDING}</span></td> <td class="row1" nowrap="nowrap"><b class="genmed">{L_DISPLAY_RESULTS}: </b></td> - <td class="row2" nowrap="nowrap"><input type="radio" name="show_results" value="posts" /> <span class="genmed">{L_POSTS}</span> <input type="radio" name="show_results" value="topics" checked="checked" /> <span class="genmed">{L_TOPICS}</td> + <td class="row2" nowrap="nowrap"><input type="radio" name="sr" value="posts" /> <span class="genmed">{L_POSTS}</span> <input type="radio" name="sr" value="topics" checked="checked" /> <span class="genmed">{L_TOPICS}</td> </tr> <tr> <td class="row1" width="25%"><b class="genmed">{L_RESULT_DAYS}: </b></td> <td class="row2" width="25%" nowrap="nowrap">{S_SELECT_SORT_DAYS}</td> <td class="row1" nowrap="nowrap"><b class="genmed">{L_RETURN_FIRST}: </b></td> - <td class="row2" nowrap="nowrap"><select name="return_chars">{S_CHARACTER_OPTIONS}</select> <span class="genmed">{L_POST_CHARACTERS}</span></td> + <td class="row2" nowrap="nowrap"><select name="ch">{S_CHARACTER_OPTIONS}</select> <span class="genmed">{L_POST_CHARACTERS}</span></td> </tr> <tr> <td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" value="{L_SEARCH}" /> <input class="btnlite" type="reset" value="{L_RESET}" /></td> diff --git a/phpBB/styles/subSilver/template/search_results.html b/phpBB/styles/subSilver/template/search_results.html index 8ed1f327f6..b801da453e 100644 --- a/phpBB/styles/subSilver/template/search_results.html +++ b/phpBB/styles/subSilver/template/search_results.html @@ -9,8 +9,8 @@ <td colspan="2"><span class="titles">{SEARCH_MATCHES}</span><br /></td> </tr> <tr> - <td class="genmed"><!-- IF SEARCH_WORDS -->{L_SEARCHED_FOR}: <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a><!-- ENDIF --><!-- IF IGNORED_WORDS --> {L_IGNORED_TERMS}: <b>{IGNORED_WORDS}</b><!-- ENDIF --></td> - <td align="right"><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td> + <td class="genmed"><!-- IF SEARCH_TOPIC -->{L_SEARCHED_TOPIC}: <a href="{U_SEARCH_TOPIC}"><b>{SEARCH_TOPIC}</b></a><br /><!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_SEARCHED_FOR}: <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a><!-- ENDIF --><!-- IF IGNORED_WORDS --> {L_IGNORED_TERMS}: <b>{IGNORED_WORDS}</b><!-- ENDIF --></td> + <td align="right"><!-- IF SEARCH_IN_RESULTS --><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="add_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /><!-- ENDIF --></td> </tr> </table> @@ -64,7 +64,7 @@ </tr> <!-- END searchresults --> <tr> - <td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> + <td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --> <span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /><!-- ENDIF --></td> </tr> </table> |