new option: ENABLE_SEARCH_TOOLBAR

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 3d3187d72bf762c7b21263a5e35d55307011f595..ad90cc43d7a1379eff0831533d3bc78e2011bcbc 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -229,6 +229,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2,
        'Display expanded list of feed articles, instead of separate displays for headlines and article content');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
+
 create table ttrss_user_prefs (
    owner_uid integer not null,
    pref_name varchar(250),

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 5ddcfe1d7683b11b7febca0678473c04c02ecc99..b2523764d3d7bcea0aff1865d24c826b56c59b88 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -209,6 +209,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2,
        'Display expanded list of feed articles, instead of separate displays for headlines and article content');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
+
 create table ttrss_user_prefs (
        owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
        pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,

diff --git a/schema/upgrade-1.1-1.1.1-mysql.sql b/schema/upgrade-1.1-1.1.1-mysql.sql
index 994cc76de6e90057b37fca94e1cc7e183ad0af6b..0bea5e9a222305797fe07e121bb069185f2270ee 100644 (file)
--- a/schema/upgrade-1.1-1.1.1-mysql.sql
+++ b/schema/upgrade-1.1-1.1.1-mysql.sql
@@ -36,4 +36,6 @@ update ttrss_users set email = '';
 alter table ttrss_users change email email varchar(250) not null;
 alter table ttrss_users alter column email set default '';
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
+
 commit;

diff --git a/schema/upgrade-1.1-1.1.1-pgsql.sql b/schema/upgrade-1.1-1.1.1-pgsql.sql
index 06380815c80d0ba8e02870c4902a41e6807e511c..e48cd90c1afb6a5c2972d319f44d1f1d2552e581 100644 (file)
--- a/schema/upgrade-1.1-1.1.1-pgsql.sql
+++ b/schema/upgrade-1.1-1.1.1-pgsql.sql
@@ -36,4 +36,6 @@ update ttrss_users set email = '';
 alter table ttrss_users alter column email set not null;
 alter table ttrss_users alter column email set default '';
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
+
 commit;

diff --git a/tt-rss.php b/tt-rss.php
index d6b3aeee0024fde174a2ad5a9e8eb89f1df085e2..a59b0ece8053f02b83b711227d508277acd5c813 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -130,9 +130,12 @@
        </td>
        <td valign="top" class="headlinesToolbarBox">
                <table width="100%" cellpadding="0" cellspacing="0">
-               
+
                <tr><td class="headlinesToolbar" id="headlinesToolbar">
-                       <input id="searchbox"
+
+               <? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
+
+               <input id="searchbox"
                        onblur="javascript:enableHotkeys()" onfocus="javascript:disableHotkeys()"
                        onchange="javascript:search()">
                <select id="searchmodebox">
@@ -143,7 +146,11 @@
                <input type="submit" 
                        class="button" onclick="javascript:search()" value="Search">
 
-               &nbsp;View: 
+               &nbsp;
+               
+               <? } ?>
+               
+               View: 
                
                <select id="viewbox" onchange="javascript:viewCurrentFeed(0, '')">
                        <option selected>Adaptive</option>