new option: HIDE_FEEDLIST (bump schema)

diff --git a/feedlist.js b/feedlist.js
index fdfe4d86f09d2fa0eea22aa70f3f10dd9f3d9294..7a373b718d0225e8775edee1bb02bf1e036586ae 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -40,7 +40,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        cache_invalidate("F:" + feed);
                }
 
-               if (getInitParam("theme") == "" &&  getInitParam("hide_feedlist")) {
+               if (getInitParam("theme") == "" && getInitParam("hide_feedlist") == 1) {
                        Element.hide("feeds-holder");
 //                     Effect.Fade('feeds-holder', {duration : 0.2, 
 //                             queue: { position: 'end', scope: 'FLFADEQ', limit: 1 }});
@@ -346,7 +346,7 @@ function feedlist_init() {
                if (getInitParam("theme") == "") {
                        setTimeout("hide_footer()", 5000);
 
-                       if (getInitParam("hide_feedlist")) {
+                       if (getInitParam("hide_feedlist") == 1) {
                                init_hidden_feedlist();
                        }
                }

diff --git a/functions.php b/functions.php
index d4f853a541862e4a6cf5c8fa5b723481ac13a8fa..05ba701af7acbb89360caca6eb3571d35b6ad71d 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -2925,9 +2925,8 @@
                print "<param key=\"hide_read_shows_special\" value=\"" . 
                        (int) get_pref($link, "HIDE_READ_SHOWS_SPECIAL") . "\"/>";
 
-               if (defined('_HIDDEN_FL_TEST')) {
-                       print "<param key=\"hide_feedlist\" value=\"1\"/>";
-               }
+               print "<param key=\"hide_feedlist\" value=\"" .
+                       (int) get_pref($link, "HIDE_FEEDLIST") . "\"/>";
 
                print "</init-params>";
        }

diff --git a/sanity_check.php b/sanity_check.php
index 2a7c07a15d2803221444080196b430ff3bf3b189..47d12f98db83aec801d5acd4ccb045062af25586 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 15);
-       define('SCHEMA_VERSION', 32);
+       define('SCHEMA_VERSION', 33);
 
        if (!file_exists("config.php")) {
                print __("<b>Fatal Error</b>: You forgot to copy 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 04f740281302b5dadd3270bd0242ca4e494cfad0..db72c74be958f128703a07d90457a07cf8151447 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -205,7 +205,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB;
 
-insert into ttrss_version values (32);
+insert into ttrss_version values (33);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,
@@ -323,6 +323,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) values('HIDE_READ_SHOWS_SPECIAL', 1, 'true', 'Show special feeds when hiding read feeds',3);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.');
+
 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 228ce526f7778db3d753c760b6c9dc5339e20474..92aa72b72626d26d068bbdc678b5e6cdc393a183 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -184,7 +184,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (32);
+insert into ttrss_version values (33);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,
@@ -296,6 +296,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) values('HIDE_READ_SHOWS_SPECIAL', 1, 'true', 'Show special feeds when hiding read feeds',3);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.');
+
 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/33.sql b/schema/versions/mysql/33.sql
new file mode 100644 (file)
index 0000000..8317dc2
--- /dev/null
+++ b/schema/versions/mysql/33.sql
@@ -0,0 +1,3 @@
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.');
+
+update ttrss_version set schema_version = 33;

diff --git a/schema/versions/pgsql/33.sql b/schema/versions/pgsql/33.sql
new file mode 100644 (file)
index 0000000..8317dc2
--- /dev/null
+++ b/schema/versions/pgsql/33.sql
@@ -0,0 +1,3 @@
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.');
+
+update ttrss_version set schema_version = 33;