new hidden param, _INFOBOX_DISABLE_OVERLAY
This commit is contained in:
parent
a4919a1663
commit
465ff90b4a
|
@ -1320,7 +1320,7 @@ function leading_zero(p) {
|
||||||
|
|
||||||
function closeInfoBox(cleanup) {
|
function closeInfoBox(cleanup) {
|
||||||
|
|
||||||
if (!is_msie()) {
|
if (!is_msie() && !getInitParam("infobox_disable_overlay")) {
|
||||||
var overlay = document.getElementById("dialog_overlay");
|
var overlay = document.getElementById("dialog_overlay");
|
||||||
if (overlay) {
|
if (overlay) {
|
||||||
overlay.style.display = "none";
|
overlay.style.display = "none";
|
||||||
|
@ -1383,11 +1383,13 @@ function infobox_submit_callback() {
|
||||||
|
|
||||||
function infobox_callback() {
|
function infobox_callback() {
|
||||||
if (xmlhttp.readyState == 4) {
|
if (xmlhttp.readyState == 4) {
|
||||||
var overlay = document.getElementById("dialog_overlay");
|
|
||||||
|
|
||||||
|
if (!is_msie() && !getInitParam("infobox_disable_overlay")) {
|
||||||
|
var overlay = document.getElementById("dialog_overlay");
|
||||||
if (overlay) {
|
if (overlay) {
|
||||||
overlay.style.display = "block";
|
overlay.style.display = "block";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var box = document.getElementById('infoBox');
|
var box = document.getElementById('infoBox');
|
||||||
var shadow = document.getElementById('infoBoxShadow');
|
var shadow = document.getElementById('infoBoxShadow');
|
||||||
|
|
|
@ -2202,16 +2202,16 @@
|
||||||
get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
|
get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
|
||||||
|
|
||||||
print "<param key=\"hide_read_feeds\" value=\"" .
|
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=\"" .
|
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=\"" .
|
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=\"" .
|
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 . "\"/>";
|
print "<param key=\"icons_url\" value=\"" . ICONS_URL . "\"/>";
|
||||||
|
|
||||||
|
@ -2221,11 +2221,14 @@
|
||||||
get_pref($link, "_DEFAULT_VIEW_MODE") . "\"/>";
|
get_pref($link, "_DEFAULT_VIEW_MODE") . "\"/>";
|
||||||
|
|
||||||
print "<param key=\"default_view_limit\" value=\"" .
|
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=\"" .
|
print "<param key=\"prefs_active_tab\" value=\"" .
|
||||||
get_pref($link, "_PREFS_ACTIVE_TAB") . "\"/>";
|
get_pref($link, "_PREFS_ACTIVE_TAB") . "\"/>";
|
||||||
|
|
||||||
|
print "<param key=\"infobox_disable_overlay\" value=\"" .
|
||||||
|
get_pref($link, "_INFOBOX_DISABLE_OVERLAY") . "\"/>";
|
||||||
|
|
||||||
print "</init-params>";
|
print "</init-params>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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('_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 (
|
create table ttrss_user_prefs (
|
||||||
owner_uid integer not null,
|
owner_uid integer not null,
|
||||||
pref_name varchar(250),
|
pref_name varchar(250),
|
||||||
|
|
|
@ -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('_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 (
|
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,
|
||||||
|
|
|
@ -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('_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;
|
update ttrss_version set schema_version = 17;
|
||||||
|
|
|
@ -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('_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;
|
update ttrss_version set schema_version = 17;
|
||||||
|
|
Loading…
Reference in New Issue