new option: ENABLE_SEARCH_TOOLBAR

This commit is contained in:
Andrew Dolgov 2005-12-20 16:58:39 +01:00
parent 734bec9e09
commit 5238347d43
5 changed files with 18 additions and 3 deletions

View File

@ -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, 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'); '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 ( create table ttrss_user_prefs (
owner_uid integer not null, owner_uid integer not null,
pref_name varchar(250), pref_name varchar(250),

View File

@ -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, 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'); '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 ( create table ttrss_user_prefs (
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, 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, pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,

View File

@ -36,4 +36,6 @@ update ttrss_users set email = '';
alter table ttrss_users change email email varchar(250) not null; alter table ttrss_users change email email varchar(250) not null;
alter table ttrss_users alter column email set default ''; 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; commit;

View File

@ -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 not null;
alter table ttrss_users alter column email set default ''; 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; commit;

View File

@ -132,7 +132,10 @@
<table width="100%" cellpadding="0" cellspacing="0"> <table width="100%" cellpadding="0" cellspacing="0">
<tr><td class="headlinesToolbar" id="headlinesToolbar"> <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()" onblur="javascript:enableHotkeys()" onfocus="javascript:disableHotkeys()"
onchange="javascript:search()"> onchange="javascript:search()">
<select id="searchmodebox"> <select id="searchmodebox">
@ -143,7 +146,11 @@
<input type="submit" <input type="submit"
class="button" onclick="javascript:search()" value="Search"> class="button" onclick="javascript:search()" value="Search">
&nbsp;View: &nbsp;
<? } ?>
View:
<select id="viewbox" onchange="javascript:viewCurrentFeed(0, '')"> <select id="viewbox" onchange="javascript:viewCurrentFeed(0, '')">
<option selected>Adaptive</option> <option selected>Adaptive</option>