--- a/templates/channel_search.tmpl	Thu Feb 12 00:57:39 2009 +0200
+++ b/templates/channel_search.tmpl	Thu Feb 12 01:53:52 2009 +0200
@@ -6,12 +6,21 @@
 
 <div id="search">
     <form action="${h.build_url(urls.channel_search, channel=channel)}" method="GET">
-        <input type="text" name="q" />
-        <input type="submit" value="Search" />
+
+        <div id="search-form">    
+            <input type="text" name="q" />
+            <input type="submit" value="Search" />
+        </div>
         
-        Results/page: <select name="count">
+<p>        
+        <label for="count">Results/page:</label>
+        <select name="count">
         ${h.select_options(((cc, cc_label) for cc, cc_label in config.SEARCH_LINE_COUNT_OPTIONS), count)}
         </select>
+</p>
+        <label for="t">Search in:</label><br/>
+            <div class="indent"><input type="radio" name="t" value="msg" checked="checked" /> Messages</div>
+            <div class="indent"><input type="radio" name="t" value="nick" /> Nicknames</div>
     </form>
     
     <div id="search-help">
@@ -30,11 +39,11 @@
 % else :
 <div id="title">${channel.title} :: Search '${search_query}'</div>
 
-${paginate(urls.channel_search, count, page, max, channel=channel, q=search_query, _more=True, _last=not(bool(lines)))}
+${paginate(urls.channel_search, count, page, max, channel=channel, q=search_query, t=search_targets, _more=True, _last=not(bool(lines)))}
 % if lines :
 <%include file="lines.tmpl" />
 % else :
 <div id="search-error">No results found</div>
 % endif
-${paginate(urls.channel_search, count, page, max, channel=channel, q=search_query, _more=True, _last=not(bool(lines)))}
+${paginate(urls.channel_search, count, page, max, channel=channel, q=search_query, t=search_targets, _more=True, _last=not(bool(lines)))}
 % endif