remove scriptaculous for the time being, place infoBox statically

This commit is contained in:
Andrew Dolgov 2006-05-20 17:00:41 +01:00
parent 07eb917846
commit 59a543f0ee
4 changed files with 13 additions and 6 deletions

View File

@ -1823,7 +1823,7 @@
if (db_num_rows($result) != 0) { 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\" print "<p><table width=\"100%\" cellspacing=\"0\"
class=\"prefFeedList\" id=\"prefFeedList\">"; class=\"prefFeedList\" id=\"prefFeedList\">";
@ -2159,8 +2159,7 @@
if ($quiet) return; if ($quiet) return;
print "<div id=\"infoBoxShadow\"> // print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
<div id=\"infoBox\">PLACEHOLDER</div></div>";
$result = db_query($link, "SELECT id,description $result = db_query($link, "SELECT id,description
FROM ttrss_filter_types ORDER BY description"); FROM ttrss_filter_types ORDER BY description");
@ -2472,7 +2471,7 @@
owner_uid = ".$_SESSION["uid"]." owner_uid = ".$_SESSION["uid"]."
ORDER by description"); 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) { if (db_num_rows($result) != 0) {
@ -3379,7 +3378,7 @@
ttrss_users ttrss_users
ORDER by login"); 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\" print "<p><table width=\"100%\" cellspacing=\"0\"
class=\"prefUserList\" id=\"prefUserList\">"; class=\"prefUserList\" id=\"prefUserList\">";

View File

@ -80,6 +80,8 @@ function delay(gap) {
var notify_hide_timerid = false; var notify_hide_timerid = false;
var notify_last_doc = false; var notify_last_doc = false;
var notify_effect = false;
function hide_notify() { function hide_notify() {
if (notify_last_doc) { if (notify_last_doc) {
var n = notify_last_doc.getElementById("notify"); var n = notify_last_doc.getElementById("notify");
@ -1028,6 +1030,5 @@ function qafAdd() {
xmlhttp.open("GET", "backend.php?" + query, true); xmlhttp.open("GET", "backend.php?" + query, true);
xmlhttp.onreadystatechange=dlg_frefresh_callback; xmlhttp.onreadystatechange=dlg_frefresh_callback;
xmlhttp.send(null); xmlhttp.send(null);
} }

View File

@ -634,6 +634,8 @@ function feedEditSave() {
xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xmlhttp.send(query); xmlhttp.send(query);
closeInfoBox();
return false; return false;
} catch (e) { } catch (e) {
@ -1130,6 +1132,9 @@ function selectTab(id, noupdate) {
notify("Loading, please wait...", true); notify("Loading, please wait...", true);
// close active infobox if needed
closeInfoBox();
// clean up all current selections, just in case // clean up all current selections, just in case
active_feed_cat = false; active_feed_cat = false;
active_filter = false; active_filter = false;

View File

@ -48,6 +48,8 @@
<script type="text/javascript" src="functions.js?<?= $dt_add ?>"></script> <script type="text/javascript" src="functions.js?<?= $dt_add ?>"></script>
<script type="text/javascript" src="prefs.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]> <!--[if gte IE 5.5000]>
<script type="text/javascript" src="pngfix.js"></script> <script type="text/javascript" src="pngfix.js"></script>
<link rel="stylesheet" type="text/css" href="tt-rss-ie.css"> <link rel="stylesheet" type="text/css" href="tt-rss-ie.css">