New search 'stuff' ... not complete

git-svn-id: file:///svn/phpbb/trunk@1051 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/templates/PSO/index_body.tpl

@@ -2,6 +2,7 @@
 <table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
+		<td align="right"><span class="gensmall"><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a></span></td>
 	</tr>
 </table>
 
@@ -26,7 +27,7 @@
 				<td class="row2"><span class="gen"><a href="{catrow.forumrow.U_VIEWFORUM}">{catrow.forumrow.FORUM_NAME}</a></span><br /><span class="gensmall">{catrow.forumrow.FORUM_DESC}</span></td>
 				<td class="row1" width="5%" align="center" valign="middle"><span class="gen">{catrow.forumrow.TOPICS}</span></td>
 				<td class="row2" width="5%" align="center" valign="middle"><span class="gen">{catrow.forumrow.POSTS}</span></td>
-				<td class="row1" width="15%" align="center" valign="middle" NOWRAP><span class="gensmall">{catrow.forumrow.LAST_POST}</span></td>
+				<td class="row1" width="15%" align="center" valign="middle" nowrap="nowrap"><span class="gensmall">{catrow.forumrow.LAST_POST}</span></td>
 				<td class="row2" width="5%" align="center" valign="middle"><span class="gensmall">{catrow.forumrow.MODERATORS}</span></td>
 			</tr>
 			<!-- END forumrow -->

phpBB/templates/PSO/search_body.tpl

@@ -1,45 +1,54 @@
-<div align="center"><table width="70%" cellspacing="0" cellpadding="4" border="0">
+<form action="{S_SEARCH_ACTION}" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
+		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="70%">
-	<tr><form action="{S_SEARCH_ACTION}" method="post">
-		<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="4" cellspacing="1" width="100%">
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
+	<tr>
+		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
 			<tr>
-				<td colspan="2" bgcolor="{T_TH_COLOR3}" align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">&nbsp;<b>{L_SEARCH}</b>&nbsp;</font></td>
+				<td class="cat" colspan="4" align="center"><span class="cattitle"><b>{L_SEARCH_QUERY}</b></span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">Search query:&nbsp;</td>
-				<td bgcolor="{T_TD_COLOR1}"><input type="text" name="querystring" size="40"><br><input type="radio" name="addterms" value="any" checked><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}">{L_SEARCH_ANY_TERMS}<br><input type="radio" name="addterms" value="all">{L_SEARCH_ALL_TERMS}</td>
+				<td class="row1" colspan="2" width="50%"><span class="gen">{L_SEARCH_KEYWORDS}:</span><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td>
+				<td class="row2" colspan="2" valign="top"><input type="text" name="search_keywords" size="60" /><br /><input type="radio" name="addterms" value="any" checked="checked" /><span class="gensmall">{L_SEARCH_ANY_TERMS}<br /><input type="radio" name="addterms" value="all" />{L_SEARCH_ALL_TERMS}</span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{L_SEARCH_AUTHOR}:&nbsp;</td>
-				<td bgcolor="{T_TD_COLOR1}"><input type="text" name="authorstring"></td>
+				<td class="row1" colspan="2"><span class="gen">{L_SEARCH_AUTHOR}:</span><br /><span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td>
+				<td class="row2" colspan="2" valign="top"><input type="text" name="search_author" size="40" /></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{L_FORUM}:&nbsp;</td>
-				<td bgcolor="{T_TD_COLOR1}"><select name="searchforum">{S_FORUM_OPTIONS}</select></td>
+				<td class="cat" colspan="4" align="center"><span class="cattitle"><b>{L_SEARCH_OPTIONS}</b></span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{L_LIMIT_CHARACTERS}:&nbsp;</td>
-				<td bgcolor="{T_TD_COLOR1}"><select name="charsreqd">{S_CHARACTER_OPTIONS}</select></td>
+				<td class="row1" align="right"><span class="gen">{L_FORUM}:&nbsp;</span></td>
+				<td class="row2"><select name="searchforum">{S_FORUM_OPTIONS}</select></td>
+				<td class="row1" align="right"><span class="gen">{L_RETURN_FIRST}</span></td>
+				<td class="row2"><select name="charsreqd">{S_CHARACTER_OPTIONS}</select> <span class="gen">{L_CHARACTERS}</span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{L_SORT_BY}:&nbsp;</td>
-				<td bgcolor="{T_TD_COLOR1}" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><select name="sortby">{S_SORT_OPTIONS}</select>&nbsp;&nbsp;<input type="radio" name="sortdir" value="ASC">&nbsp;{L_SORT_ASCENDING}&nbsp;&nbsp;&nbsp;<input type="radio" name="sortdir" value="DESC" checked>&nbsp;{L_SORT_DECENDING}&nbsp;</td>
+				<td class="row1" align="right"><span class="gen">{L_CATEGORY}:&nbsp;</span></td>
+				<td class="row2"><select name="searchcat">{S_CATEGORY_OPTIONS}</select></td>
+				<td class="row1" align="right"><span class="gen">{L_SORT_BY}:&nbsp;</span></td>
+				<td class="row2" valign="middle"><select name="sortby">{S_SORT_OPTIONS}</select><br /><input type="radio" name="sortdir" value="ASC" />&nbsp;<span class="gensmall">{L_SORT_ASCENDING}</span>&nbsp;&nbsp;&nbsp;<input type="radio" name="sortdir" value="DESC" checked="checked" />&nbsp;<span class="gensmall">{L_SORT_DESCENDING}</span>&nbsp;</td>
 			</tr>
 			<tr>
-				<td colspan="2" bgcolor="{T_TH_COLOR2}" align="center">{S_HIDDEN_FIELDS}<input type="submit" value="{L_SEARCH}"></td>
+				<td class="row1" align="right"><span class="gen">{L_DISPLAY_RESULTS}:&nbsp;</span></td>
+				<td class="row2"><input type="radio" name="showresults" value="posts" checked="checked" />&nbsp;<span class="gensmall">{L_POSTS}</span>&nbsp;&nbsp;&nbsp;<input type="radio" name="showresults" value="topics" />&nbsp;<span class="gensmall">{L_TOPICS}</span>&nbsp;</td>
+				<td class="row1" align="right"><span class="gen">{L_SEARCH_PREVIOUS}:&nbsp;</span></td>
+				<td class="row2" valign="middle">{S_TIME_OPTIONS}</td>
+			</tr>
+			<tr>
+				<td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SEARCH}" /></td>
 			</tr>
 		</table></td>
-	</form></tr>
-</table></div>
+	</tr>
+</table></form>
 
-<div align="center"><table width="70%" border="0">
+<table width="98%" border="0" align="center">
 	<tr>
-		<td align="left" valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><b>{S_TIMEZONE}</b></font></td>
+		<td align="left" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
 	</tr>
-</table>
+</table>

phpBB/templates/PSO/search_results_posts.tpl

@@ -0,0 +1,72 @@
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
+	<tr>
+		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
+	</tr>
+</table>
+
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
+	<tr>
+		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
+			<tr>
+				<td class="cat" colspan="2" align="center"><span class="cattitle">&nbsp;<b>{L_SEARCH} - {SEARCH_MATCHES} Matches</b>&nbsp;</span></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+
+<br clear="all" />
+
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
+	<tr>
+		<td class="tablebg"><table border="0" cellpadding="0" cellspacing="1" width="100%">
+			<!-- BEGIN searchresults -->
+			<tr>
+				<td class="cat" colspan="2" align="left"><table cellpadding="4" cellspacing="1" border="0">
+					<tr>
+						<td><span class="gen"><img src="images/folder.gif">&nbsp;{L_FORUM}:&nbsp;<a href="{U_FORUM}">{searchresults.FORUM_NAME}</a></span></td>
+					</tr>
+				</table></td>
+			</tr>
+			<tr>
+				<td class="row1" rowspan="2" width="20%"><table height="100%" cellspacing="0" cellpadding="4" border="0">
+					<tr>
+						<td valign="top"><span class="gen"><b><a href="{searchresults.U_USER_PROFILE}">{searchresults.POSTER_NAME}</a></b></span><br><br><span class="gen">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br>{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b><br></td>
+					</tr>
+				</table></td>
+				<td width="80%"><table width="100%" cellspacing="0" cellpadding="4" border="0">
+					<tr>
+						<td class="row1"><span class="gen">{L_TOPIC}:&nbsp;<a href="{searchresults.U_TOPIC}">{searchresults.TOPIC_TITLE}</a></span></td>
+					</tr>
+				</table></td>
+			</tr>
+			<tr>
+				<td><table width="100%" height="100%" cellspacing="0" cellpadding="4" border="0">
+					<tr>
+						<td class="row2"><img src="images/icon_minipost.gif" alt="Post image icon" border="0"></a><span class="gensmall">{L_POSTED}: {searchresults.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Post Subject: <a href="{searchresults.U_POST}">{searchresults.POST_SUBJECT}</a></span><hr></td>
+					</tr>
+					<tr>
+						<td height="100%" class="row2"><span class="gen">{searchresults.MESSAGE}</span><br><br></td>
+					</tr>
+				</table></td>
+			</tr>
+			<!-- END searchresults -->
+			<tr>
+				<td class="cat" colspan="2"><table width="100%" cellspacing="0" cellpadding="4" border="0">
+					<tr>
+						<td align="left" valign="middle">&nbsp;<span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span>&nbsp;</td>
+						<td align="right" valign="middle"><span class="gen">{PAGINATION}</span></td>
+					</tr>
+				</table></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+
+<br clear="all" />
+
+<div align="center"><table width="98%" border="0">
+	<tr>
+		<td align="left" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
+		<td align="right" valign="top" nowrap="nowrap">{JUMPBOX}</td>
+	</tr>
+</table>

phpBB/templates/PSO/search_results_topics.tpl

@@ -0,0 +1,58 @@
+
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
+	<tr>
+		<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</span></td>
+	</tr>
+</table>
+
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
+	<tr>
+		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
+			<tr>
+				<td class="cat" colspan="7" align="center"><span class="cattitle">&nbsp;<b>{L_SEARCH} - {SEARCH_MATCHES} Matches</b>&nbsp;</span></td>
+			</tr>
+			<tr>
+				<th width="4%">&nbsp;</th>
+				<th>&nbsp;{L_FORUM}&nbsp;</th>
+				<th>&nbsp;{L_TOPICS}&nbsp;</th>
+				<th>&nbsp;{L_REPLIES}&nbsp;</th>
+				<th>&nbsp;{L_AUTHOR}&nbsp;</th>
+				<th>&nbsp;{L_VIEWS}&nbsp;</th>
+				<th>&nbsp;{L_LASTPOST}&nbsp;</th>
+			</tr>
+			<!-- BEGIN searchresults -->
+			<tr>
+				<td class="row1" align="center" valign="middle">&nbsp;{searchresults.FOLDER}&nbsp;</td>
+				<td class="row2">&nbsp;<span class="gensmall"><a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_NAME}</a></span></td>
+				<td class="row2">&nbsp;<span class="gensmall">{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a>&nbsp;{searchresults.GOTO_PAGE}</span></td>
+				<td class="row1" align="center" valign="middle"><span class="gen">{searchresults.REPLIES}</span></td>
+				<td class="row2" align="center" valign="middle"><span class="gen"><a href="{searchresults.U_TOPIC_POSTER_PROFILE}">{searchresults.TOPIC_POSTER}</a></span></td>
+				<td class="row1" align="center" valign="middle"><span class="gen">{searchresults.VIEWS}</span></td>
+				<td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="gensmall">{searchresults.LAST_POST}</span></td>
+			</tr>
+			<!-- END searchresults -->
+			<!-- BEGIN nosearchresults -->
+			<tr>
+				<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td>
+			</tr>
+			<!-- END nosearchresults -->
+			<tr>
+				<td class="cat" colspan="7"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+					<tr>
+						<td align="left" valign="middle">&nbsp;&nbsp;&nbsp;<span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span>&nbsp;</td>
+						<td align="right" valign="middle"><span class="gen">{PAGINATION}&nbsp;</span></td>
+					</tr>
+				</table></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+
+<br clear="all" />
+
+<table width="98%" border="0" align="center">
+	<tr>
+		<td align="left" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
+		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
+	</tr>
+</table>