From 164f4738ebbd48dc7379d58aadbd0ff2b658079e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Sun, 21 May 2006 13:09:55 +0100
Subject: enable search toolbar

---
 tt-rss.php | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'tt-rss.php')

diff --git a/tt-rss.php b/tt-rss.php
index c915bbc2d..c40521563 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -150,26 +150,17 @@ window.onload = init;
 
 		<tr><td class="headlinesToolbar" id="headlinesToolbar">
 
-<!--		<? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
+		<form id="main_toolbar_form">
 
-		<input id="searchbox"
+		<? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
+		<input name="query"
+			onKeyPress="return filterCR(event)"
 			onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();">
-		<select id="searchmodebox">
-			<option value="all_feeds">All feeds</option>
-			<option value="this_feed" selected>This feed</option>
-			<? if (get_pref($link, 'ENABLE_FEED_CATS')) { ?>
-			<option value="this_cat">This category</option>
-			<? } ?>
-		</select>
-		
-		<input type="submit" 
-			class="button" onclick="javascript:search()" value="Search">
+		<input class="button" type="submit"
+			onclick="return viewCurrentFeed(0)" value="Search">
+		&nbsp; 
+		<? } ?>
 
-			&nbsp; 
-		
-		<? } ?> -->
-		
-		<form id="main_toolbar_form">
 		View: 		
 		<select name="view_mode" onchange="viewCurrentFeed(0, '')">
 			<option selected value="adaptive">Adaptive</option>
@@ -177,7 +168,8 @@ window.onload = init;
 			<option value="marked">Starred</option>
 			<option value="unread">Unread</option>
 		</select>
-		&nbsp;Limit:
+		
+		&nbsp;Limit:		
 		<?
 		$limits = array(15 => 15, 30 => 30, 60 => 60, 0 => "All");
 			
-- 
cgit v1.2.3