enable search toolbar

[tt-rss.git] / tt-rss.php

diff --git a/tt-rss.php b/tt-rss.php
index c915bbc2d14b9dd47d7db260dc5812790e23d4b2..c405215639114a3c5bf2b1d95118c02de6128373 100644 (file)
--- 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");