diff --git a/backend.php b/backend.php index 61b9bab5c..956ff2e46 100644 --- a/backend.php +++ b/backend.php @@ -1578,7 +1578,7 @@ FROM ttrss_prefs,ttrss_prefs_types,ttrss_prefs_sections WHERE type_id = ttrss_prefs_types.id AND section_id = ttrss_prefs_sections.id - ORDER BY section_name,short_desc"); + ORDER BY section_id,short_desc"); print "
"; @@ -1605,9 +1605,9 @@ $lnum = 0; } - $class = ($lnum % 2) ? "even" : "odd"; +// $class = ($lnum % 2) ? "even" : "odd"; - print ""; + print ""; $type_name = $line["type_name"]; $pref_name = $line["pref_name"]; diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 66a76a402..bd1fea8db 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -107,6 +107,7 @@ create table ttrss_prefs_sections (id integer primary key, insert into ttrss_prefs_sections (id, section_name) values (1, 'General'); insert into ttrss_prefs_sections (id, section_name) values (2, 'Interface'); +insert into ttrss_prefs_sections (id, section_name) values (3, 'Advanced'); create table ttrss_prefs (pref_name varchar(250) primary key, type_id integer not null, @@ -126,7 +127,7 @@ insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id) values('PURGE_OLD_DAYS', 3, '60', '60', 'Purge old posts after this number of days (0 - disables)',1); insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id) values('UPDATE_POST_ON_CHECKSUM_CHANGE', 1, 'true', 'true', 'Update post on checksum change',1); insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id) values('ENABLE_PREFS_CATCHUP_UNCATCHUP', 1, 'false', 'false', 'Enable catchup/uncatchup buttons in feed editor',2); -insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('ENABLE_LABELS', 1, 'false', 'false', 'Enable labels',1, +insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('ENABLE_LABELS', 1, 'false', 'false', 'Enable labels',3, 'Experimental support for virtual feeds based on user crafted SQL queries. This feature is highly experimental and at this point not user friendly. Use with caution.'); insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', '30', 'Default interval between feed updates (in minutes)',1); @@ -136,7 +137,7 @@ insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('DEFAULT_ARTICLE_LIMIT', 3, '0', '0', 'Default article limit',2, 'Default limit for articles to display, any custom number you like (0 - disables).'); -insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('DAEMON_REFRESH_ONLY', 1, 'false', 'false', 'Daemon refresh only',1, +insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('DAEMON_REFRESH_ONLY', 1, 'false', 'false', 'Daemon refresh only', 3, 'Updates to all feeds will only run when the backend script is invoked with a "daemon" option on the URI stem.'); insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('DISPLAY_FEEDLIST_ACTIONS', 1, 'false', 'false', 'Display feedlist actions',2, diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index 94ea4e19e..5b099e5b4 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -102,6 +102,7 @@ create table ttrss_prefs_sections (id integer primary key, insert into ttrss_prefs_sections (id, section_name) values (1, 'General'); insert into ttrss_prefs_sections (id, section_name) values (2, 'Interface'); +insert into ttrss_prefs_sections (id, section_name) values (3, 'Advanced'); create table ttrss_prefs (pref_name varchar(250) primary key, type_id integer not null references ttrss_prefs_types(id), @@ -117,7 +118,7 @@ insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id) values('PURGE_OLD_DAYS', 3, '60', '60', 'Purge old posts after this number of days (0 - disables)',1); insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id) values('UPDATE_POST_ON_CHECKSUM_CHANGE', 1, 'true', 'true', 'Update post on checksum change',1); insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id) values('ENABLE_PREFS_CATCHUP_UNCATCHUP', 1, 'false', 'false', 'Enable catchup/uncatchup buttons in feed editor',2); -insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('ENABLE_LABELS', 1, 'false', 'false', 'Enable labels',1, +insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('ENABLE_LABELS', 1, 'false', 'false', 'Enable labels',3, 'Experimental support for virtual feeds based on user crafted SQL queries. This feature is highly experimental and at this point not user friendly. Use with caution.'); insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', '30', 'Default interval between feed updates (in minutes)',1); @@ -127,7 +128,7 @@ insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('DEFAULT_ARTICLE_LIMIT', 3, '0', '0', 'Default article limit',2, 'Default limit for articles to display, any custom number you like (0 - disables).'); -insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('DAEMON_REFRESH_ONLY', 1, 'false', 'false', 'Daemon refresh only',1, +insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('DAEMON_REFRESH_ONLY', 1, 'false', 'false', 'Daemon refresh only', 3, 'Updates to all feeds will only run when the backend script is invoked with a "daemon" option on the URI stem.'); insert into ttrss_prefs (pref_name,type_id,value,def_value,short_desc,section_id,help_text) values('DISPLAY_FEEDLIST_ACTIONS', 1, 'false', 'false', 'Display feedlist actions',2, diff --git a/tt-rss.css b/tt-rss.css index 69745405c..e075acda6 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -533,4 +533,3 @@ div.prefHelp, td.prefHelp { padding : 5px; } -