diff options
author | Andrew Dolgov <[email protected]> | 2005-12-20 16:58:39 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2005-12-20 16:58:39 +0100 |
commit | 5238347d4370e9519b288a5128a6426dc1ceabd2 (patch) | |
tree | 7ff28a7daee288d668832f346079e11db16256d9 | |
parent | 734bec9e0954fccdb8861d98e218d02793e9fbda (diff) |
new option: ENABLE_SEARCH_TOOLBAR
-rw-r--r-- | schema/ttrss_schema_mysql.sql | 2 | ||||
-rw-r--r-- | schema/ttrss_schema_pgsql.sql | 2 | ||||
-rw-r--r-- | schema/upgrade-1.1-1.1.1-mysql.sql | 2 | ||||
-rw-r--r-- | schema/upgrade-1.1-1.1.1-pgsql.sql | 2 | ||||
-rw-r--r-- | tt-rss.php | 13 |
5 files changed, 18 insertions, 3 deletions
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 3d3187d72..ad90cc43d 100644 --- 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 5ddcfe1d7..b2523764d 100644 --- 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 994cc76de..0bea5e9a2 100644 --- 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 06380815c..e48cd90c1 100644 --- 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 d6b3aeee0..a59b0ece8 100644 --- 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"> - View: + + + <? } ?> + + View: <select id="viewbox" onchange="javascript:viewCurrentFeed(0, '')"> <option selected>Adaptive</option> |