From 59a543f0ee39ffce6f74856e0ae261fbe5bfac80 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 20 May 2006 17:00:41 +0100 Subject: remove scriptaculous for the time being, place infoBox statically --- backend.php | 9 ++++----- functions.js | 3 ++- prefs.js | 5 +++++ prefs.php | 2 ++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/backend.php b/backend.php index 31c1215f6..1daf49aa0 100644 --- a/backend.php +++ b/backend.php @@ -1823,7 +1823,7 @@ if (db_num_rows($result) != 0) { - print "
PLACEHOLDER
"; +// print "
PLACEHOLDER
"; print "

"; @@ -2159,8 +2159,7 @@ if ($quiet) return; - print "
-
PLACEHOLDER
"; +// print "
PLACEHOLDER
"; $result = db_query($link, "SELECT id,description FROM ttrss_filter_types ORDER BY description"); @@ -2472,7 +2471,7 @@ owner_uid = ".$_SESSION["uid"]." ORDER by description"); - print "
PLACEHOLDER
"; +// print "
PLACEHOLDER
"; if (db_num_rows($result) != 0) { @@ -3379,7 +3378,7 @@ ttrss_users ORDER by login"); - print "
PLACEHOLDER
"; +// print "
PLACEHOLDER
"; print "

"; diff --git a/functions.js b/functions.js index fda1ff4e4..e09846893 100644 --- a/functions.js +++ b/functions.js @@ -80,6 +80,8 @@ function delay(gap) { var notify_hide_timerid = false; var notify_last_doc = false; +var notify_effect = false; + function hide_notify() { if (notify_last_doc) { var n = notify_last_doc.getElementById("notify"); @@ -1028,6 +1030,5 @@ function qafAdd() { xmlhttp.open("GET", "backend.php?" + query, true); xmlhttp.onreadystatechange=dlg_frefresh_callback; xmlhttp.send(null); - } diff --git a/prefs.js b/prefs.js index 8fcdcff20..f9ec1a5b5 100644 --- a/prefs.js +++ b/prefs.js @@ -634,6 +634,8 @@ function feedEditSave() { xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xmlhttp.send(query); + closeInfoBox(); + return false; } catch (e) { @@ -1130,6 +1132,9 @@ function selectTab(id, noupdate) { notify("Loading, please wait...", true); + // close active infobox if needed + closeInfoBox(); + // clean up all current selections, just in case active_feed_cat = false; active_filter = false; diff --git a/prefs.php b/prefs.php index 03a1e9b6b..7e71c7548 100644 --- a/prefs.php +++ b/prefs.php @@ -48,6 +48,8 @@ +
BAH
+