new hidden param, _INFOBOX_DISABLE_OVERLAY

diff --git a/functions.js b/functions.js
index f308a3d2783564f1e54c25912cf861fc3b07e682..3a67b183728ec3178bb8854193a0397aa4180960 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -1320,7 +1320,7 @@ function leading_zero(p) {
 
 function closeInfoBox(cleanup) {
 
-       if (!is_msie()) {
+       if (!is_msie() && !getInitParam("infobox_disable_overlay")) {
                var overlay = document.getElementById("dialog_overlay");
                if (overlay) {
                        overlay.style.display = "none";
@@ -1383,10 +1383,12 @@ function infobox_submit_callback() {
 
 function infobox_callback() {
        if (xmlhttp.readyState == 4) {
-               var overlay = document.getElementById("dialog_overlay");
 
-               if (overlay) {
-                       overlay.style.display = "block";
+               if (!is_msie() && !getInitParam("infobox_disable_overlay")) {
+                       var overlay = document.getElementById("dialog_overlay");
+                       if (overlay) {
+                               overlay.style.display = "block";
+                       }
                }
 
                var box = document.getElementById('infoBox');

diff --git a/functions.php b/functions.php
index f528edc9b93323bf2378a8f9707b58a0002899b8..cdf592f7027323674c65347914ada18106d2448e 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -2202,16 +2202,16 @@
                        get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
 
                print "<param key=\"hide_read_feeds\" value=\"" . 
-                       sprintf("%d", get_pref($link, "HIDE_READ_FEEDS")) . "\"/>";
+                       (int) get_pref($link, "HIDE_READ_FEEDS") . "\"/>";
 
                print "<param key=\"feeds_sort_by_unread\" value=\"" . 
-                       sprintf("%d", get_pref($link, "FEEDS_SORT_BY_UNREAD")) . "\"/>";
+                       (int) get_pref($link, "FEEDS_SORT_BY_UNREAD") . "\"/>";
 
                print "<param key=\"confirm_feed_catchup\" value=\"" . 
-                       sprintf("%d", get_pref($link, "CONFIRM_FEED_CATCHUP")) . "\"/>";
+                       (int) get_pref($link, "CONFIRM_FEED_CATCHUP") . "\"/>";
 
                print "<param key=\"cdm_auto_catchup\" value=\"" . 
-                       sprintf("%d", get_pref($link, "CDM_AUTO_CATCHUP")) . "\"/>";
+                       (int) get_pref($link, "CDM_AUTO_CATCHUP") . "\"/>";
 
                print "<param key=\"icons_url\" value=\"" . ICONS_URL . "\"/>";
 
@@ -2221,11 +2221,14 @@
                        get_pref($link, "_DEFAULT_VIEW_MODE") . "\"/>";
 
                print "<param key=\"default_view_limit\" value=\"" . 
-                       sprintf("%d", get_pref($link, "_DEFAULT_VIEW_LIMIT")) . "\"/>";
+                       (int) get_pref($link, "_DEFAULT_VIEW_LIMIT") . "\"/>";
 
                print "<param key=\"prefs_active_tab\" value=\"" . 
                        get_pref($link, "_PREFS_ACTIVE_TAB") . "\"/>";
 
+               print "<param key=\"infobox_disable_overlay\" value=\"" . 
+                       get_pref($link, "_INFOBOX_DISABLE_OVERLAY") . "\"/>";
+
                print "</init-params>";
        }
 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 6db955e5fce0ffed2422ddc17486866a0a74a6ec..25c2ec95e2b9029dfde3dd4cd764215d7447c299 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -274,6 +274,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('_PREFS_ACTIVE_TAB', 2, '', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_INFOBOX_DISABLE_OVERLAY', 1, 'false', '', 1);
+
 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 e5509a981738ca54c359918026a83c3d43aa946c..ed109e5fd1abaca166e4b52a11ac44ae9bc52908 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -254,6 +254,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('_PREFS_ACTIVE_TAB', 2, '', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_INFOBOX_DISABLE_OVERLAY', 1, 'false', '', 1);
+
 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/17.sql b/schema/versions/mysql/17.sql
index 631dc30a26f8c99932c21457877e34487ffd9919..1416be2c1e149a5d6b7e3baafd915629341b0114 100644 (file)
--- a/schema/versions/mysql/17.sql
+++ b/schema/versions/mysql/17.sql
@@ -1,3 +1,5 @@
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ACTIVE_TAB', 2, '', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_INFOBOX_DISABLE_OVERLAY', 1, 'false', '', 1);
+
 update ttrss_version set schema_version = 17;

diff --git a/schema/versions/pgsql/17.sql b/schema/versions/pgsql/17.sql
index 631dc30a26f8c99932c21457877e34487ffd9919..1416be2c1e149a5d6b7e3baafd915629341b0114 100644 (file)
--- a/schema/versions/pgsql/17.sql
+++ b/schema/versions/pgsql/17.sql
@@ -1,3 +1,5 @@
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ACTIVE_TAB', 2, '', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_INFOBOX_DISABLE_OVERLAY', 1, 'false', '', 1);
+
 update ttrss_version set schema_version = 17;