From 80e4dc34fd6673ab789560b6b8cee74293aa2401 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 28 Sep 2006 13:23:28 +0100 Subject: css-based layout + required fixes (2) --- backend.php | 2 +- feedlist.js | 14 ++++++++------ functions.js | 2 +- tt-rss.css | 15 ++++++++++++++- tt-rss.js | 2 +- tt-rss.php | 44 ++++++++++++++++++++++++++++---------------- viewfeed.js | 2 +- 7 files changed, 54 insertions(+), 27 deletions(-) diff --git a/backend.php b/backend.php index cfe322b72..75891208d 100644 --- a/backend.php +++ b/backend.php @@ -809,7 +809,7 @@ $class = "headlinesSubToolbar"; $tid = "headlineActionsTop"; } else { - $class = "invisible"; + $class = "headlinesSubToolbar"; $tid = "headlineActionsBottom"; } diff --git a/feedlist.js b/feedlist.js index df1e17fb6..1a83a454c 100644 --- a/feedlist.js +++ b/feedlist.js @@ -1,4 +1,4 @@ -var xmlhttp = Ajax.getTransport(); +//var xmlhttp = Ajax.getTransport(); function viewCategory(cat) { getMainContext().active_feed_is_cat = true; @@ -7,8 +7,10 @@ function viewCategory(cat) { function feedlist_callback() { if (xmlhttp.readyState == 4) { + debug("feedlist_callback"); var f = document.getElementById("feeds-frame"); f.innerHTML = xmlhttp.responseText; + feedlist_init(); } } @@ -144,19 +146,19 @@ function feedlist_init() { if (arguments.callee.done) return; arguments.callee.done = true; - parent.debug("in feedlist init"); + debug("in feedlist init"); hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1); document.onkeydown = hotkey_handler; - parent.setTimeout("timeout()", 0); + setTimeout("timeout()", 0); - parent.debug("about to remove splash, OMG!"); + debug("about to remove splash, OMG!"); - var o = parent.document.getElementById("overlay"); + var o = document.getElementById("overlay"); if (o) { o.style.display = "none"; - parent.debug("removed splash!"); + debug("removed splash!"); } } catch (e) { diff --git a/functions.js b/functions.js index ccf2bab16..876e03ba6 100644 --- a/functions.js +++ b/functions.js @@ -1264,7 +1264,7 @@ function qafAdd() { var feeds_doc = getFeedsContext().document; - feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait..."; +// feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait..."; var query = Form.serialize("feed_add_form"); diff --git a/tt-rss.css b/tt-rss.css index 29f855a0d..6d4aaf49f 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -1263,7 +1263,7 @@ table.loginForm2 .innerLoginCell { font-size : small; } -#headlines-frame { +div.headlines_normal { position : absolute; border-width : 1px 0px 0px 0px; border-style : solid; @@ -1276,6 +1276,19 @@ table.loginForm2 .innerLoginCell { font-size : small; } +div.headlines_cdm { + position : absolute; + border-width : 1px 0px 1px 0px; + border-style : solid; + border-color : #88b0f0; + left : 260px; + bottom : 50px; + top : 85px; + right : 0px; + overflow : auto; + font-size : small; +} + #content-frame { position : absolute; border-width : 1px 0px 1px 0px; diff --git a/tt-rss.js b/tt-rss.js index bcbadcb52..925721367 100644 --- a/tt-rss.js +++ b/tt-rss.js @@ -225,7 +225,7 @@ function updateFeedList(silent, fetch) { // var feeds_frame = document.getElementById("feeds-frame"); // feeds_frame.src = query_str; - debug("updateFeedList"); + debug("updateFeedList: " + query_str); if (xmlhttp_ready(xmlhttp)) { xmlhttp.open("GET", query_str, true); diff --git a/tt-rss.php b/tt-rss.php index a3a7f465c..b985867bb 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -75,7 +75,7 @@ - +

Loading, please wait...

Fatal Error

@@ -99,15 +99,22 @@ window.onload = init;

- + + + +

+ Hello, + (Logout) +

@@ -193,13 +200,18 @@ window.onload = init;

-fixme-

- -

-fixme-

+ +

+ - + + + diff --git a/viewfeed.js b/viewfeed.js index ee8d0216e..838f3b0e5 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -1,6 +1,6 @@ var active_post_id = false; -var xmlhttp_rpc = Ajax.getTransport(); +//var xmlhttp_rpc = Ajax.getTransport(); function headlines_callback() { if (xmlhttp.readyState == 4) { -- cgit v1.2.3