reintroduce option ENABLE_SEARCH_TOOLBAR
This commit is contained in:
parent
84e0e3bb66
commit
feead173b0
5 changed files with 12 additions and 0 deletions
|
@ -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),
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue