reintroduce option ENABLE_SEARCH_TOOLBAR

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 9d991a4a9faf680140dfd6e24f93bae377f0bfbb..355dab790dced4520329521d6c80a2fc8f6f0776 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -282,6 +282,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('BLACKLISTED_TAGS', 2, 'main, generic, misc', 'Blacklisted tags', 3,
 'When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
 
+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 94b172f3dc1a627e347840cbcc1c66d53de2bb61..b18212725b377b5193ac0c846e753fe45c3b8510 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -262,6 +262,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('BLACKLISTED_TAGS', 2, 'main, generic, misc', 'Blacklisted tags', 3,
 'When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
 
+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/versions/mysql/17.sql b/schema/versions/mysql/17.sql
index 70dce4f15906501fbec11b4c7956fbef3eb72ed5..f5d39f33dc3d7719ec071a81644634251931fce8 100644 (file)
--- a/schema/versions/mysql/17.sql
+++ b/schema/versions/mysql/17.sql
@@ -8,4 +8,6 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('BLACKLISTED_TAGS', 2, 'main, generic, misc', 'Blacklisted tags', 3,
 'When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
+
 update ttrss_version set schema_version = 17;

diff --git a/schema/versions/pgsql/17.sql b/schema/versions/pgsql/17.sql
index 70dce4f15906501fbec11b4c7956fbef3eb72ed5..f5d39f33dc3d7719ec071a81644634251931fce8 100644 (file)
--- a/schema/versions/pgsql/17.sql
+++ b/schema/versions/pgsql/17.sql
@@ -8,4 +8,6 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('BLACKLISTED_TAGS', 2, 'main, generic, misc', 'Blacklisted tags', 3,
 'When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
+
 update ttrss_version set schema_version = 17;

diff --git a/tt-rss.php b/tt-rss.php
index 968f9cfeb8484b32ef0f05cd7cdbd620e160302e..c43cb5d81ac104937d2a32950d923487c0c90fed 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -155,11 +155,15 @@ window.onload = init;
 
                <form id="main_toolbar_form" onsubmit='return false'>
 
+               <?php if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
+
                <?php echo __('Search:') ?>
                <input name="query"
                        onKeyPress="return filterCR(event, viewCurrentFeed)"
                        onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();">
 
+               <?php } ?>
+
                <?php echo __('View:') ?>
                <select name="view_mode" onchange="viewCurrentFeed(0, '')">
                        <option selected value="adaptive"><?php echo __('Adaptive') ?></option>