From feead173b066b1abaaf7834e218553b6ce2bc56f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 19 May 2007 12:57:23 +0100 Subject: reintroduce option ENABLE_SEARCH_TOOLBAR --- schema/ttrss_schema_mysql.sql | 2 ++ schema/ttrss_schema_pgsql.sql | 2 ++ schema/versions/mysql/17.sql | 2 ++ schema/versions/pgsql/17.sql | 2 ++ tt-rss.php | 4 ++++ 5 files changed, 12 insertions(+) diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 9d991a4a9..355dab790 100644 --- 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 94b172f3d..b18212725 100644 --- 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 70dce4f15..f5d39f33d 100644 --- 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 70dce4f15..f5d39f33d 100644 --- 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 968f9cfeb..c43cb5d81 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -155,11 +155,15 @@ window.onload = init;
+ + + +