summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--schema/ttrss_schema_mysql.sql2
-rw-r--r--schema/ttrss_schema_pgsql.sql2
-rw-r--r--tt-rss.css16
-rw-r--r--tt-rss.js5
-rw-r--r--tt-rss.php10
6 files changed, 0 insertions, 36 deletions
diff --git a/NEWS b/NEWS
index d3edd100d..56f28d3a6 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,6 @@ v1.1 (Dec xy, 2005)
* Multi-user support (yay!)
* Per-feed purge preferences (0 means default, negative numbers disable purging)
- * Optional loading splashscreen
* Reworked compact stylesheet support
* Interactive user preferences editor
* Per-feed content filters
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index edd91e134..7abbc1f49 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -189,8 +189,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('DISPLAY_FEEDLIST_ACTIONS', 1, 'false', 'Display feedlist actions',2,
'Display separate dropbox for feedlist actions, if disabled these actions are available in global actions menu.');
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SPLASH', 1, 'false', 'Enable loading splashscreen',2);
-
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 'Allow duplicate posts',1,
'This option is useful when you are reading several planet-type aggregators with partially colliding userbase.
When disabled, it forces same posts from different feeds to appear only once.');
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 30ad8cb54..cef4b96c8 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -171,8 +171,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('DISPLAY_FEEDLIST_ACTIONS', 1, 'false', 'Display feedlist actions',2,
'Display separate dropbox for feedlist actions, if disabled these actions are available in global actions menu.');
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SPLASH', 1, 'false', 'Enable loading splashscreen',2);
-
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 'Allow duplicate posts',1,
'This option is useful when you are reading several planet-type aggregators with partially colliding userbase.
When disabled, it forces same posts from different feeds to appear only once.');
diff --git a/tt-rss.css b/tt-rss.css
index 681bf95be..b3a7df42c 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -595,22 +595,6 @@ div.bigErrorMsg {
margin : 20px;
}
-#splash {
- z-index : 3;
- width : 100%;
- height : 100%;
- position : absolute;
- text-align : center;
- background-image : url("images/vgrad_light_rev.png");
- background-color : white;
- background-position : top left;
- background-repeat : repeat-x;
-}
-
-td.innerSplash {
- margin : 35px;
-}
-
div.prefHelp, td.prefHelp {
font-size : x-small;
color : gray;
diff --git a/tt-rss.js b/tt-rss.js
index 94aad44d0..41e52c8fe 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -383,11 +383,6 @@ function init_second_stage() {
// setTimeout("timeout()", 2*1000);
// scheduleFeedUpdate(true);
- var splash = document.getElementById("splash");
-
- if (splash) {
- splash.style.display = "none";
- }
} catch (e) {
exception_error("init_second_stage", e);
}
diff --git a/tt-rss.php b/tt-rss.php
index 9d1dadbb6..91df6b009 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -49,16 +49,6 @@
<body onload="init()">
-<? if (get_pref($link, 'ENABLE_SPLASH')) { ?>
-<div id="splash">
- <table width='100%' height='100%'><tr>
- <td class="innerSplash" valign="middle" align="center">
- <img src="images/ttrss_logo.png" alt="logo">
- <p>Loading, please wait...</p>
- </td></tr></table>
-</div>
-<? } ?>
-
<table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main">
<? if (get_pref($link, 'DISPLAY_HEADER')) { ?>
<tr>