diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-01-21 22:57:42 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-01-21 22:57:42 +0000 |
| commit | 7de53b46ec192c66192f3ebcd6123c2c3dbecb6f (patch) | |
| tree | e9bc358c5840c795bb35711182a978c1e9ef82c2 /phpBB/styles/subSilver/template | |
| parent | 133ce52d3b7fb4c653ac7195d681e0201c1cf38d (diff) | |
| download | forums-7de53b46ec192c66192f3ebcd6123c2c3dbecb6f.tar forums-7de53b46ec192c66192f3ebcd6123c2c3dbecb6f.tar.gz forums-7de53b46ec192c66192f3ebcd6123c2c3dbecb6f.tar.bz2 forums-7de53b46ec192c66192f3ebcd6123c2c3dbecb6f.tar.xz forums-7de53b46ec192c66192f3ebcd6123c2c3dbecb6f.zip | |
- search deals with global topics
- fixed some other search related bugs
git-svn-id: file:///svn/phpbb/trunk@5482 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/subSilver/template')
| -rw-r--r-- | phpBB/styles/subSilver/template/search_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/search_results.html | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/styles/subSilver/template/search_body.html b/phpBB/styles/subSilver/template/search_body.html index 11a7cdc93c..c0eac4241d 100644 --- a/phpBB/styles/subSilver/template/search_body.html +++ b/phpBB/styles/subSilver/template/search_body.html @@ -27,7 +27,7 @@ <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="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="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> + <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> <br /><input type="radio" name="sf" value="firstpost" /> <span class="genmed">{L_SEARCH_FIRST_POST}</span></td> </tr> <tr> <td class="row1"><b class="genmed">{L_RESULT_SORT}: </b></td> diff --git a/phpBB/styles/subSilver/template/search_results.html b/phpBB/styles/subSilver/template/search_results.html index b801da453e..b261e7eae5 100644 --- a/phpBB/styles/subSilver/template/search_results.html +++ b/phpBB/styles/subSilver/template/search_results.html @@ -46,7 +46,11 @@ <!-- IF searchresults.PAGINATION --> <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ] </p> <!-- ENDIF --> - <p class="gensmall">in <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></p> + <!-- IF searchresults.S_TOPIC_GLOBAL --> + <p class="gensmall">{L_GLOBAL}</p> + <!-- ELSE --> + <p class="gensmall">{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></p> + <!-- ENDIF --> </td> <td class="row2" width="100" align="center"><p class="topicauthor">{searchresults.TOPIC_AUTHOR}</p></td> <td class="row1" width="50" align="center"><p class="topicdetails">{searchresults.REPLIES}</p></td> @@ -80,7 +84,7 @@ <!-- IF searchresults.S_IGNORE_POST --> <td class="gensmall" colspan="2" height="25" align="center">{searchresults.L_IGNORE_POST}</td> <!-- ELSE --> - <td colspan="2" height="25"><p class="topictitle"><a name="{searchresults.POST_ID}"></a> {L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> {L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></p></td> + <td colspan="2" height="25"><p class="topictitle"><a name="{searchresults.POST_ID}"></a> <!-- IF searchresults.FORUM_TITLE -->{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><!-- ELSE -->{L_GLOBAL}<!-- ENDIF --> {L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></p></td> </tr> <tr class="row1"> <td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POSTER_NAME}</b></td> |