remove scriptaculous for the time being, place infoBox statically

diff --git a/backend.php b/backend.php
index 31c1215f67b3a6dabd1c20770b0d76dbf2c2d6ce..1daf49aa0c5d03b61ae488ed061f6e8817bb17de 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -1823,7 +1823,7 @@
 
                if (db_num_rows($result) != 0) {
 
-                       print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
+//                     print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
 
                        print "<p><table width=\"100%\" cellspacing=\"0\" 
                                class=\"prefFeedList\" id=\"prefFeedList\">";
@@ -2159,8 +2159,7 @@
 
                if ($quiet) return;
 
-               print "<div id=\"infoBoxShadow\">
-                       <div id=\"infoBox\">PLACEHOLDER</div></div>";
+//             print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
 
                $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 "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
+//             print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
 
                if (db_num_rows($result) != 0) {
 
@@ -3379,7 +3378,7 @@
                                ttrss_users
                        ORDER by login");
 
-               print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
+//             print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
 
                print "<p><table width=\"100%\" cellspacing=\"0\" 
                        class=\"prefUserList\" id=\"prefUserList\">";

diff --git a/functions.js b/functions.js
index fda1ff4e478688f34b302ec871e0e6dcaeebbe31..e098468933a51059ec660b528b777cb22ff36778 100644 (file)
--- 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 8fcdcff20f0d12be775182dc3a823d876c94ccc5..f9ec1a5b508b75110ff2604962488ed700502c4f 100644 (file)
--- 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 03a1e9b6b34a2eb4b34c8ec625ff2f080dc68833..7e71c7548edc3987ed90567d655e369496aa3bac 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -48,6 +48,8 @@
        <script type="text/javascript" src="functions.js?<?= $dt_add ?>"></script>
        <script type="text/javascript" src="prefs.js?<?= $dt_add ?>"></script>
 
+       <div id="infoBoxShadow"><div id="infoBox">BAH</div></div>
+
        <!--[if gte IE 5.5000]>
                <script type="text/javascript" src="pngfix.js"></script>
                <link rel="stylesheet" type="text/css" href="tt-rss-ie.css">