]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
neon updates; make more icons themeable; misc fixes
[tt-rss.git] / viewfeed.js
index 3c9b306417a401f65ab4062d7a304284fb896784..5421ebd883d293abac40b2fc7c4a2e8dd2cb29ef 100644 (file)
@@ -30,7 +30,7 @@ function catchup_callback2(transport, callback) {
 
 function clean_feed_selections() {
        try {
-               var feeds = document.getElementById("feedList").getElementsByTagName("LI");
+               var feeds = $("feedList").getElementsByTagName("LI");
 
                for (var i = 0; i < feeds.length; i++) {
                        if (feeds[i].id && feeds[i].id.match("FEEDR-")) {
@@ -48,6 +48,11 @@ function clean_feed_selections() {
 function headlines_callback2(transport, feed_cur_page) {
        try {
 
+               if (!transport.responseText && db) {
+                       offlineConfirmModeChange();
+                       return;
+               }
+
                loading_set_progress(100);
 
                debug("headlines_callback2 [page=" + feed_cur_page + "]");
@@ -68,19 +73,32 @@ function headlines_callback2(transport, feed_cur_page) {
                        }
                }
 
+               var ll = $('FLL-' + feed_id);
+
                if (!is_cat) {
-                       var feedr = document.getElementById("FEEDR-" + feed_id);
+                       var feedr = $("FEEDR-" + feed_id);
                        if (feedr && !feedr.className.match("Selected")) {      
                                feedr.className = feedr.className + "Selected";
                        } 
+                       if (feedr && ll) feedr.removeChild(ll);
                } else {
-                       var feedr = document.getElementById("FCAT-" + feed_id);
+                       var feedr = $("FCAT-" + feed_id);
                        if (feedr && !feedr.className.match("Selected")) {      
                                feedr.className = feedr.className + "Selected";
                        } 
+
+                       var fcap = $("FCAP-" + feed_id);
+                       if (fcap && ll) fcap.removeChild(ll);
+
                }
-       
-               var f = document.getElementById("headlines-frame");
+
+               var img = $('FIMG-' + feed_id);
+
+               if (img && !is_cat) {
+                       img.src = img.alt;
+               }
+
+               var f = $("headlines-frame");
                try {
                        if (feed_cur_page == 0) { 
                                debug("resetting headlines scrollTop");
@@ -141,10 +159,10 @@ function headlines_callback2(transport, feed_cur_page) {
                                        if (headlines_count > 0) {
                                                debug("adding some more headlines...");
        
-                                               var c = document.getElementById("headlinesList");
+                                               var c = $("headlinesList");
                
                                                if (!c) {
-                                                       c = document.getElementById("headlinesInnerContainer");
+                                                       c = $("headlinesInnerContainer");
                                                }
 
                                                var ids = getSelectedArticleIds2();
@@ -203,7 +221,7 @@ function headlines_callback2(transport, feed_cur_page) {
        
                if (_cdm_wd_timeout) window.clearTimeout(_cdm_wd_timeout);
        
-               if (!document.getElementById("headlinesList") && 
+               if (!$("headlinesList") && 
                                getActiveFeedId() != -3 &&
                                getInitParam("cdm_auto_catchup") == 1) {
                        debug("starting CDM watchdog");
@@ -227,18 +245,20 @@ function headlines_callback2(transport, feed_cur_page) {
 
 function render_article(article) {
        try {
-               var f = document.getElementById("content-frame");
+               var f = $("content-frame");
                try {
                        f.scrollTop = 0;
                } catch (e) { };
 
-               var fi = document.getElementById("content-insert");
+               var fi = $("content-insert");
 
                try {
                        fi.scrollTop = 0;
                } catch (e) { };
-
+               
                fi.innerHTML = article;
+               
+//             article.evalScripts();          
 
        } catch (e) {
                exception_error("render_article", e);
@@ -251,7 +271,7 @@ function showArticleInHeadlines(id) {
 
                cleanSelected("headlinesList");
        
-               var crow = document.getElementById("RROW-" + id);
+               var crow = $("RROW-" + id);
 
                if (!crow) return;
 
@@ -261,7 +281,7 @@ function showArticleInHeadlines(id) {
 
                selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
        
-               var upd_img_pic = document.getElementById("FUPDPIC-" + id);
+               var upd_img_pic = $("FUPDPIC-" + id);
 
                var cache_prefix = "";
                                
@@ -280,13 +300,15 @@ function showArticleInHeadlines(id) {
                        //
                }
 
-               if (upd_img_pic && upd_img_pic.src.match("updated.png")) {
+               if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+                                       upd_img_pic.src.match("fresh_sign.png"))) {
+
                        upd_img_pic.src = "images/blank_icon.gif";
 
                        cache_invalidate(cache_prefix + getActiveFeedId());
 
                        cache_inject(cache_prefix + getActiveFeedId(),
-                               document.getElementById("headlines-frame").innerHTML,
+                               $("headlines-frame").innerHTML,
                                get_feed_unread(getActiveFeedId()));
 
                } else if (article_is_unread && view_mode == "all_articles") {
@@ -294,7 +316,7 @@ function showArticleInHeadlines(id) {
                        cache_invalidate(cache_prefix + getActiveFeedId());
 
                        cache_inject(cache_prefix + getActiveFeedId(),
-                               document.getElementById("headlines-frame").innerHTML,
+                               $("headlines-frame").innerHTML,
                                get_feed_unread(getActiveFeedId())-1);
 
                } else if (article_is_unread) {
@@ -308,14 +330,37 @@ function showArticleInHeadlines(id) {
        }
 }
 
-function article_callback2(transport, id, feed_id) {
+function article_callback2(transport, id) {
        try {
                debug("article_callback2 " + id);
 
+               if (!transport.responseText && db) {
+                       offlineConfirmModeChange();
+                       return;
+               }
+
                if (transport.responseXML) {
 
                        if (!transport_error_check(transport)) return;
 
+/*                     var ll = $('LL-' + id);
+                       var content = $('HLC-' + id);
+
+                       if (ll && content) content.removeChild(ll); */
+                       
+                       var upic = $('FUPDPIC-' + id);
+
+                       if (upic) {
+                               upic.src = 'images/blank_icon.gif';
+                       }
+
+                       if (id != last_requested_article) {
+                               debug("requested article id is out of sequence, aborting");
+                               return;
+                       }
+
+                       active_post_id = id; 
+
                        debug("looking for articles to cache...");
 
                        var articles = transport.responseXML.getElementsByTagName("article");
@@ -333,13 +378,6 @@ function article_callback2(transport, id, feed_id) {
                                cache_inject(a_id, articles[i].firstChild.nodeValue);
                        }
 
-                       if (id != last_requested_article) {
-                               debug("requested article id is out of sequence, aborting");
-                               return;
-                       }
-
-                       active_real_feed_id = feed_id;
-                       active_post_id = id; 
 
                        showArticleInHeadlines(id);     
 
@@ -351,7 +389,7 @@ function article_callback2(transport, id, feed_id) {
                
                } else {
                        debug("article_callback: returned no XML object");
-                       //var f = document.getElementById("content-frame");
+                       //var f = $("content-frame");
                        //f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
                }
 
@@ -385,43 +423,20 @@ function article_callback2(transport, id, feed_id) {
        }
 }
 
-function view_offline(id, feed_id) {
+function view(id) {
        try {
+               debug("loading article: " + id);
 
-               enableHotkeys();
-               showArticleInHeadlines(id);
-
-               if (db) {
-                       db.execute("UPDATE articles SET unread = 0 WHERE id = ?", [id]);
-               }
-
-               render_article("FIXME");
-               update_feedlist_counters();
-
-               return false;
-
-       } catch (e) {
-               exception_error("view_offline", e);
-       }
-}
-
-function view(id, feed_id, skip_history) {
-       
-       try {
-               debug("loading article: " + id + "/" + feed_id);
-
-               if (offline_mode) return view_offline(id, feed_id);
+               if (offline_mode) return view_offline(id);
 
                var cached_article = cache_find(id);
 
                debug("cache check result: " + (cached_article != false));
        
                enableHotkeys();
-       
-               //setActiveFeedId(feed_id);
+               hideAuxDlg();
 
-               var query = "backend.php?op=view&id=" + param_escape(id) +
-                       "&feed=" + param_escape(feed_id);
+               var query = "?op=view&id=" + param_escape(id);
 
                var date = new Date();
 
@@ -453,7 +468,7 @@ function view(id, feed_id, skip_history) {
 
                query = query + "&cids=" + cids_to_request.toString();
 
-               var crow = document.getElementById("RROW-" + id);
+               var crow = $("RROW-" + id);
                var article_is_unread = crow.className.match("Unread");
 
                if (!async_counters_work) {
@@ -464,7 +479,26 @@ function view(id, feed_id, skip_history) {
 
                if (!cached_article) {
 
-                       notify_progress("Loading, please wait...", true);
+//                     notify_progress("Loading, please wait...", true);
+
+/*                     var content = $('HLC-' + id);
+
+                       if (content && !$('LL-' + id)) {
+                               var ll = document.createElement('img');
+               
+                               ll.src = 'images/indicator_tiny.gif';
+                               ll.className = 'hlLoading';
+                               ll.id = 'LL-' + id;
+
+                               content.appendChild(ll);
+
+                       } */
+
+                       var upic = $('FUPDPIC-' + id);
+
+                       if (upic) {     
+                               upic.src = getInitParam("sign_progress");
+                       }
 
                } else if (cached_article && article_is_unread) {
 
@@ -483,9 +517,10 @@ function view(id, feed_id, skip_history) {
 
                last_requested_article = id;
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
-                               article_callback2(transport, id, feed_id); 
+                               article_callback2(transport, id); 
                        } });
 
                return false;
@@ -541,7 +576,7 @@ function toggleMark(id, client_only, no_effects) {
 
        try {
 
-               var query = "backend.php?op=rpc&id=" + id + "&subop=mark";
+               var query = "?op=rpc&id=" + id + "&subop=mark";
        
                query = query + "&afid=" + getActiveFeedId();
        
@@ -551,12 +586,12 @@ function toggleMark(id, client_only, no_effects) {
                        query = query + "&omode=flc";
                }
        
-               var mark_img = document.getElementById("FMPIC-" + id);
+               var mark_img = $("FMPIC-" + id);
 
                if (!mark_img) return;
 
-               var vfeedu = document.getElementById("FEEDU--1");
-               var crow = document.getElementById("RROW-" + id);
+               var vfeedu = $("FEEDU--1");
+               var crow = $("RROW-" + id);
        
                if (mark_img.src.match("mark_unset")) {
                        mark_img.src = mark_img.src.replace("mark_unset", "mark_set");
@@ -572,7 +607,7 @@ function toggleMark(id, client_only, no_effects) {
                        mark_img.alt = __("Please wait...");
                        query = query + "&mark=0";
        
-                       if (document.getElementById("headlinesList") && !no_effects) {
+                       if ($("headlinesList") && !no_effects) {
                                Effect.Puff(mark_img, {duration : 0.25, afterFinish: tMark_afh_off});
                        } else { 
                                mark_img.src = mark_img.src.replace("mark_set", "mark_unset");
@@ -585,10 +620,13 @@ function toggleMark(id, client_only, no_effects) {
 
                }
 
+               if (!no_effects) update_local_feedlist_counters();
+
                if (!client_only) {
                        debug(query);
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
@@ -600,13 +638,19 @@ function toggleMark(id, client_only, no_effects) {
        }
 }
 
-function togglePub(id, client_only, no_effects) {
+function togglePub(id, client_only, no_effects, note) {
 
        try {
 
-               var query = "backend.php?op=rpc&id=" + id + "&subop=publ";
+               var query = "?op=rpc&id=" + id + "&subop=publ";
        
                query = query + "&afid=" + getActiveFeedId();
+
+               if (note != undefined) {
+                       query = query + "&note=" + param_escape(note);
+               } else {
+                       query = query + "&note=undefined";
+               }
        
                if (tagsAreDisplayed()) {
                        query = query + "&omode=tl";
@@ -614,25 +658,24 @@ function togglePub(id, client_only, no_effects) {
                        query = query + "&omode=flc";
                }
        
-               var mark_img = document.getElementById("FPPIC-" + id);
+               var mark_img = $("FPPIC-" + id);
 
                if (!mark_img) return;
 
-               var vfeedu = document.getElementById("FEEDU--2");
-               var crow = document.getElementById("RROW-" + id);
+               var vfeedu = $("FEEDU--2");
+               var crow = $("RROW-" + id);
        
-               if (mark_img.src.match("pub_unset")) {
+               if (mark_img.src.match("pub_unset") || note != undefined) {
                        mark_img.src = mark_img.src.replace("pub_unset", "pub_set");
                        mark_img.alt = __("Unpublish article");
                        query = query + "&pub=1";
-       
 
                } else {
                        //mark_img.src = "images/pub_unset.png";
                        mark_img.alt = __("Please wait...");
                        query = query + "&pub=0";
        
-                       if (document.getElementById("headlinesList") && !no_effects) {
+                       if ($("headlinesList") && !no_effects) {
                                Effect.Puff(mark_img, {duration : 0.25, afterFinish: tPub_afh_off});
                        } else { 
                                mark_img.src = mark_img.src.replace("pub_set", "pub_unset");
@@ -641,14 +684,36 @@ function togglePub(id, client_only, no_effects) {
                }
 
                if (!client_only) {
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       all_counters_callback2(transport);
+               
+                                       var note = transport.responseXML.getElementsByTagName("note")[0];
+               
+                                       if (note) {
+                                               var note_id = note.getAttribute("id");
+                                               var note_size = note.getAttribute("size");
+                                               var note_content = note.firstChild.nodeValue;
+               
+                                               var container = $('POSTNOTE-' + note_id);
+               
+                                               cache_invalidate(note_id);
+               
+                                               if (container) {
+                                                       if (note_size == "0") {
+                                                               Element.hide(container);
+                                                       } else {
+                                                               container.innerHTML = note_content;
+                                                               Element.show(container);
+                                                       }
+                                               }
+                                       }       
+
                                } });
                }
 
        } catch (e) {
-
                exception_error("togglePub", e);
        }
 }
@@ -657,9 +722,9 @@ function correctHeadlinesOffset(id) {
        
        try {
 
-               var hlist = document.getElementById("headlinesList");
-               var container = document.getElementById("headlinesInnerContainer");
-               var row = document.getElementById("RROW-" + id);
+               var hlist = $("headlinesList");
+               var container = $("headlinesInnerContainer");
+               var row = $("RROW-" + id);
        
                var viewport = container.offsetHeight;
        
@@ -700,7 +765,7 @@ function moveToPost(mode) {
                var prev_id = false;
                var next_id = false;
                
-               if (!document.getElementById('RROW-' + active_post_id)) {
+               if (!$('RROW-' + active_post_id)) {
                        active_post_id = false;
                }
                
@@ -756,9 +821,9 @@ function moveToPost(mode) {
 function toggleSelected(id) {
        try {
        
-               var cb = document.getElementById("RCHK-" + id);
+               var cb = $("RCHK-" + id);
 
-               var row = document.getElementById("RROW-" + id);
+               var row = $("RROW-" + id);
                if (row) {
                        var nc = row.className;
                        
@@ -799,7 +864,7 @@ function toggleUnread_afh(effect) {
 function toggleUnread(id, cmode, effect) {
        try {
        
-               var row = document.getElementById("RROW-" + id);
+               var row = $("RROW-" + id);
                if (row) {
                        var nc = row.className;
                        var is_selected = row.className.match("Selected");
@@ -809,7 +874,7 @@ function toggleUnread(id, cmode, effect) {
                        // since we are removing selection from the object, uncheck
                        // corresponding checkbox
 
-                       var cb = document.getElementById("RCHK-" + id);
+                       var cb = $("RCHK-" + id);
                        if (cb) {
                                cb.checked = false;
                        }
@@ -829,6 +894,12 @@ function toggleUnread(id, cmode, effect) {
                                } else {
                                        row.className = nc + "Unread";
                                }
+
+                               if (db) {
+                                       db.execute("UPDATE articles SET unread = not unread "+
+                                               "WHERE id = ?", [id]);
+                               }
+
                        } else if (cmode == 0) {
                                row.className = nc;
 
@@ -837,28 +908,42 @@ function toggleUnread(id, cmode, effect) {
                                                afterFinish: toggleUnread_afh,
                                                queue: { position:'end', scope: 'TMRQ-' + id, limit: 1 } } );
                                } 
+
+                               if (db) {
+                                       db.execute("UPDATE articles SET unread = 0 "+
+                                               "WHERE id = ?", [id]);
+                               }
+
                        } else if (cmode == 1) {
                                row.className = nc + "Unread";
+
+                               if (db) {
+                                       db.execute("UPDATE articles SET unread = 1 "+
+                                               "WHERE id = ?", [id]);
+                               }
+
                        }
 
+                       update_local_feedlist_counters();
+
                        // Disable unmarking as selected for the time being (16.05.08) -fox
                        if (is_selected) row.className = row.className + "Selected";
 
                        if (cmode == undefined) cmode = 2;
 
-                       var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
-                               param_escape(id) + "&cmode=" + param_escape(cmode);
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=" + param_escape(cmode) + "&ids=" + param_escape(id);
 
 //                     notify_progress("Loading, please wait...");
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
 
                }
 
-
        } catch (e) {
                exception_error("toggleUnread", e);
        }
@@ -878,14 +963,15 @@ function selectionRemoveLabel(id) {
 
 //             if (ok) {
 
-                       var query = "backend.php?op=rpc&subop=removeFromLabel&ids=" +
+                       var query = "?op=rpc&subop=removeFromLabel&ids=" +
                                param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
 //                     notify_progress("Loading, please wait...");
 
                        cache_invalidate("F:" + (-11 - id));
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        show_labels_in_headlines(transport);
                                        all_counters_callback2(transport);
@@ -915,12 +1001,13 @@ function selectionAssignLabel(id) {
 
                        cache_invalidate("F:" + (-11 - id));
 
-                       var query = "backend.php?op=rpc&subop=assignToLabel&ids=" +
+                       var query = "?op=rpc&subop=assignToLabel&ids=" +
                                param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
 //                     notify_progress("Loading, please wait...");
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        show_labels_in_headlines(transport);
                                        all_counters_callback2(transport);
@@ -950,7 +1037,7 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                }
 
                for (i = 0; i < rows.length; i++) {
-                       var row = document.getElementById("RROW-" + rows[i]);
+                       var row = $("RROW-" + rows[i]);
                        if (row) {
                                var nc = row.className;
                                nc = nc.replace("Unread", "");
@@ -962,20 +1049,34 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                                        } else {
                                                row.className = nc + "UnreadSelected";
                                        }
+                                       if (db) {
+                                               db.execute("UPDATE articles SET unread = NOT unread WHERE id = ?", 
+                                                       [rows[i]]);
+                                       }
                                }
 
                                if (set_state == false) {
                                        row.className = nc + "Selected";
+                                       if (db) {
+                                               db.execute("UPDATE articles SET unread = 0 WHERE id = ?", 
+                                                       [rows[i]]);
+                                       }
                                }
 
                                if (set_state == true) {
                                        row.className = nc + "UnreadSelected";
+                                       if (db) {
+                                               db.execute("UPDATE articles SET unread = 1 WHERE id = ?", 
+                                                       [rows[i]]);
+                                       }
                                }
                        }
                }
 
                if (rows.length > 0) {
 
+                       update_local_feedlist_counters();
+
                        var cmode = "";
 
                        if (set_state == undefined) {
@@ -986,12 +1087,13 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                                cmode = "0";
                        }
 
-                       var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
-                               param_escape(rows.toString()) + "&cmode=" + cmode;
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=" + cmode + "&ids=" + param_escape(rows.toString()); 
 
                        notify_progress("Loading, please wait...");
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        catchup_callback2(transport, callback_func); 
                                } });
@@ -1023,9 +1125,11 @@ function selectionToggleMarked(cdm_mode) {
                        toggleMark(rows[i], true, true);
                }
 
+               update_local_feedlist_counters();
+
                if (rows.length > 0) {
 
-                       var query = "backend.php?op=rpc&subop=markSelected&ids=" +
+                       var query = "?op=rpc&subop=markSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
                        query = query + "&afid=" + getActiveFeedId();
@@ -1038,7 +1142,8 @@ function selectionToggleMarked(cdm_mode) {
 
                        query = query + "&omode=lc";
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
@@ -1072,7 +1177,7 @@ function selectionTogglePublished(cdm_mode) {
 
                if (rows.length > 0) {
 
-                       var query = "backend.php?op=rpc&subop=publishSelected&ids=" +
+                       var query = "?op=rpc&subop=publishSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
                        query = query + "&afid=" + getActiveFeedId();
@@ -1085,7 +1190,8 @@ function selectionTogglePublished(cdm_mode) {
 
                        query = query + "&omode=lc";
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
@@ -1099,7 +1205,7 @@ function selectionTogglePublished(cdm_mode) {
 
 function cdmGetSelectedArticles() {
        var sel_articles = new Array();
-       var container = document.getElementById("headlinesInnerContainer");
+       var container = $("headlinesInnerContainer");
 
        for (i = 0; i < container.childNodes.length; i++) {
                var child = container.childNodes[i];
@@ -1115,7 +1221,7 @@ function cdmGetSelectedArticles() {
 
 function cdmGetVisibleArticles() {
        var sel_articles = new Array();
-       var container = document.getElementById("headlinesInnerContainer");
+       var container = $("headlinesInnerContainer");
 
        if (!container) return sel_articles;
 
@@ -1133,7 +1239,7 @@ function cdmGetVisibleArticles() {
 
 function cdmGetUnreadArticles() {
        var sel_articles = new Array();
-       var container = document.getElementById("headlinesInnerContainer");
+       var container = $("headlinesInnerContainer");
 
        for (i = 0; i < container.childNodes.length; i++) {
                var child = container.childNodes[i];
@@ -1150,7 +1256,7 @@ function cdmGetUnreadArticles() {
 
 // mode = all,none,unread
 function cdmSelectArticles(mode) {
-       var container = document.getElementById("headlinesInnerContainer");
+       var container = $("headlinesInnerContainer");
 
        for (i = 0; i < container.childNodes.length; i++) {
                var child = container.childNodes[i];
@@ -1158,7 +1264,7 @@ function cdmSelectArticles(mode) {
                if (child.id && child.id.match("RROW-")) {
                        var aid = child.id.replace("RROW-", "");
 
-                       var cb = document.getElementById("RCHK-" + aid);
+                       var cb = $("RCHK-" + aid);
 
                        if (mode == "all") {
                                if (!child.className.match("Selected")) {
@@ -1190,7 +1296,7 @@ function catchupPage() {
                return;
        }
 
-       if (document.getElementById("headlinesList")) {
+       if ($("headlinesList")) {
                selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true);
                selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
                selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
@@ -1201,13 +1307,13 @@ function catchupPage() {
        }
 }
 
-function catchupSelection() {
+function deleteSelection() {
 
        try {
 
                var rows;
        
-               if (document.getElementById("headlinesList")) {
+               if ($("headlinesList")) {
                        rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
                } else {        
                        rows = cdmGetSelectedArticles();
@@ -1220,8 +1326,14 @@ function catchupSelection() {
        
        
                var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-               
-               var str = __("Mark %d selected articles in %s as read?");
+               var str;
+               var op;
+       
+               if (getActiveFeedId() != 0) {
+                       str = __("Delete %d selected articles in %s?");
+               } else {
+                       str = __("Delete %d selected articles?");
+               }
        
                str = str.replace("%d", rows.length);
                str = str.replace("%s", fn);
@@ -1229,57 +1341,129 @@ function catchupSelection() {
                if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
                        return;
                }
-       
-               if (document.getElementById("headlinesList")) {
-                       selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
-       //              selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-               } else {
-                       selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
-       //              cdmSelectArticles('none');
-               }
+
+               query = "?op=rpc&subop=delete&ids=" + param_escape(rows);
+
+               debug(query);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                                       viewCurrentFeed();
+                               } });
 
        } catch (e) {
-               exception_error("catchupSelection", e);
+               exception_error("deleteSelection", e);
        }
 }
 
-function editArticleTags(id, feed_id, cdm_enabled) {
-       displayDlg('editArticleTags', id);
-}
+function archiveSelection() {
 
-
-function tag_saved_callback(transport) {
        try {
-               debug("in tag_saved_callback");
 
-               closeInfoBox();
-               notify("");
+               var rows;
+       
+               if ($("headlinesList")) {
+                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
+               } else {        
+                       rows = cdmGetSelectedArticles();
+               }
+       
+               if (rows.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
+       
+       
+               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+               var str;
+               var op;
+       
+               if (getActiveFeedId() != 0) {
+                       str = __("Archive %d selected articles in %s?");
+                       op = "archive";
+               } else {
+                       str = __("Move %d archived articles back?");
+                       op = "unarchive";
+               }
+       
+               str = str.replace("%d", rows.length);
+               str = str.replace("%s", fn);
+       
+               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+                       return;
+               }
 
-               if (tagsAreDisplayed()) {
-                       _reload_feedlist_after_view = true;
+               query = "?op=rpc&subop="+op+"&ids=" + param_escape(rows);
+
+               debug(query);
+
+               for (var i = 0; i < rows.length; i++) {
+                       cache_invalidate(rows[i]);
                }
 
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                                       viewCurrentFeed();
+                               } });
 
-               if (transport.responseXML) {
-                       var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
-                       
-                       if (tags_str) {
-                               var id = tags_str.getAttribute("id");
+       } catch (e) {
+               exception_error("archiveSelection", e);
+       }
+}
 
-                               if (id) {
-                                       var tags = document.getElementById("ATSTR-" + id);
-                                       if (tags) {
-                                               tags.innerHTML = tags_str.firstChild.nodeValue;
-                                       }
-                               }
-                       }
+function catchupSelection() {
+
+       try {
+
+               var rows;
+       
+               if ($("headlinesList")) {
+                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
+               } else {        
+                       rows = cdmGetSelectedArticles();
+               }
+       
+               if (rows.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
+       
+       
+               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+               
+               var str = __("Mark %d selected articles in %s as read?");
+       
+               str = str.replace("%d", rows.length);
+               str = str.replace("%s", fn);
+       
+               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+                       return;
+               }
+       
+               if ($("headlinesList")) {
+                       selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
+       //              selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
+               } else {
+                       selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
+       //              cdmSelectArticles('none');
                }
 
        } catch (e) {
-               exception_error("tag_saved_callback", e);
+               exception_error("catchupSelection", e);
        }
 }
 
+function editArticleTags(id, feed_id, cdm_enabled) {
+       displayDlg('editArticleTags', id,
+                          function () {
+                                  new Ajax.Autocompleter('tags_str', 'tags_choices',
+                                          "backend.php?op=rpc&subop=completeTags",
+                                          { tokens: ',', paramName: "search" });
+                          });
+}
+
 function editTagsSave() {
 
        notify_progress("Saving article tags...");
@@ -1288,15 +1472,42 @@ function editTagsSave() {
 
        var query = Form.serialize("tag_edit_form");
 
-       query = "backend.php?op=rpc&subop=setArticleTags&" + query;
+       query = "?op=rpc&subop=setArticleTags&" + query;
 
        debug(query);
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) {
-                               tag_saved_callback(transport);
+                               try {
+                                       debug("tags saved...");
+                       
+                                       closeInfoBox();
+                                       notify("");
+                       
+                                       if (tagsAreDisplayed()) {
+                                               _reload_feedlist_after_view = true;
+                                       }                       
+                       
+                                       if (transport.responseXML) {
+                                               var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
+                                               
+                                               if (tags_str) {
+                                                       var id = tags_str.getAttribute("id");
+                       
+                                                       if (id) {
+                                                               var tags = $("ATSTR-" + id);
+                                                               if (tags) {
+                                                                       tags.innerHTML = tags_str.firstChild.nodeValue;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                       
+                               } catch (e) {
+                                       exception_error("editTagsSave", e);
+                               }
                        } });
-
 }
 
 function editTagsInsert() {
@@ -1327,7 +1538,7 @@ function editTagsInsert() {
 function cdmScrollViewport(where) {
        debug("cdmScrollViewport: " + where);
 
-       var ctr = document.getElementById("headlinesInnerContainer");
+       var ctr = $("headlinesInnerContainer");
 
        if (!ctr) return;
 
@@ -1340,8 +1551,8 @@ function cdmScrollViewport(where) {
 
 function cdmArticleIsBelowViewport(id) {
        try {
-               var ctr = document.getElementById("headlinesInnerContainer");
-               var e = document.getElementById("RROW-" + id);
+               var ctr = $("headlinesInnerContainer");
+               var e = $("RROW-" + id);
 
                if (!e || !ctr) return;
 
@@ -1360,8 +1571,8 @@ function cdmArticleIsBelowViewport(id) {
 
 function cdmArticleIsAboveViewport(id) {
        try {
-               var ctr = document.getElementById("headlinesInnerContainer");
-               var e = document.getElementById("RROW-" + id);
+               var ctr = $("headlinesInnerContainer");
+               var e = $("RROW-" + id);
 
                if (!e || !ctr) return;
 
@@ -1380,8 +1591,8 @@ function cdmArticleIsAboveViewport(id) {
 
 function cdmScrollToArticleId(id) {
        try {
-               var ctr = document.getElementById("headlinesInnerContainer");
-               var e = document.getElementById("RROW-" + id);
+               var ctr = $("headlinesInnerContainer");
+               var e = $("RROW-" + id);
 
                if (!e || !ctr) return;
 
@@ -1394,8 +1605,8 @@ function cdmScrollToArticleId(id) {
 
 function cdmArticleIsActuallyVisible(id) {
        try {
-               var ctr = document.getElementById("headlinesInnerContainer");
-               var e = document.getElementById("RROW-" + id);
+               var ctr = $("headlinesInnerContainer");
+               var e = $("RROW-" + id);
 
                if (!e || !ctr) return;
 
@@ -1426,7 +1637,7 @@ function cdmWatchdog() {
 
        try {
 
-               var ctr = document.getElementById("headlinesInnerContainer");
+               var ctr = $("headlinesInnerContainer");
 
                if (!ctr) return;
 
@@ -1477,16 +1688,17 @@ function cdmWatchdog() {
                if (ids.length > 0) {
 
                        for (var i = 0; i < ids.length; i++) {
-                               var e = document.getElementById("RROW-" + ids[i]);
+                               var e = $("RROW-" + ids[i]);
                                if (e) {
                                        e.className = e.className.replace("Unread", "");
                                }
                        }
 
-                       var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
-                               param_escape(ids.toString()) + "&cmode=0";
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=0" + "&ids=" + param_escape(ids.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
@@ -1538,11 +1750,16 @@ function cache_find(id) {
 
        if (db) {
                var rs = db.execute("SELECT article FROM cache WHERE id = ?", [id]);
+               var a = false;
 
                if (rs.isValidRow()) {
-                       return rs.field(0);
+                       var a = rs.field(0);                    
                }
 
+               rs.close();
+
+               return a;
+
        } else {
                for (var i = 0; i < article_cache.length; i++) {
                        if (article_cache[i]["id"] == id) {
@@ -1558,11 +1775,16 @@ function cache_find_param(id, param) {
        if (db) {
                var rs = db.execute("SELECT article FROM cache WHERE id = ? AND param = ?",
                        [id, param]);
+               var a = false;
 
                if (rs.isValidRow()) {
-                       return rs.field(0);
+                       a = rs.field(0);
                }
 
+               rs.close();
+
+               return a;
+
        } else {
                for (var i = 0; i < article_cache.length; i++) {
                        if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
@@ -1578,11 +1800,16 @@ function cache_check(id) {
        if (db) {
                var rs = db.execute("SELECT COUNT(*) AS c FROM cache WHERE id = ?",
                        [id]);
+               var a = false;
 
                if (rs.isValidRow()) {
-                       return rs.field(0) != "0";
+                        a = rs.field(0) != "0";
                }
 
+               rs.close();
+
+               return a;
+
        } else {
                for (var i = 0; i < article_cache.length; i++) {
                        if (article_cache[i]["id"] == id) {
@@ -1598,11 +1825,16 @@ function cache_check_param(id, param) {
        if (db) {
                var rs = db.execute("SELECT COUNT(*) AS c FROM cache WHERE id = ? AND param = ?",
                        [id, param]);
+               var a = false;
 
                if (rs.isValidRow()) {
-                       return rs.field(0) != "0";
+                       a = rs.field(0) != "0";
                }
 
+               rs.close();
+
+               return a;
+
        } else {
                for (var i = 0; i < article_cache.length; i++) {
                        if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
@@ -1667,15 +1899,15 @@ function getActiveArticleId() {
 
 function cdmClicked(id) {
        try {
-               var elem = document.getElementById("RROW-" + id);
+               var elem = $("RROW-" + id);
 
                if (elem) {
                        var id = elem.id.replace("RROW-", "");
                        active_post_id = id;
 
-                       cdmSelectArticles("none");
+//                     cdmSelectArticles("none");
                        toggleUnread(id, 0, true);
-                       toggleSelected(id);
+//                     toggleSelected(id);
 
                }
        } catch (e) {
@@ -1683,24 +1915,6 @@ function cdmClicked(id) {
        } 
 }
 
-function preload_article_callback(transport) {
-       try {
-               if (transport.responseXML) {
-                       var articles = transport.responseXML.getElementsByTagName("article");
-
-                       for (var i = 0; i < articles.length; i++) {
-                               var id = articles[i].getAttribute("id");
-                               if (!cache_check(id)) {
-                                       cache_inject(id, articles[i].firstChild.nodeValue);                             
-                                       debug("preloaded article: " + id);
-                               }
-                       }
-               }
-       } catch (e) {
-               exception_error("preload_article_callback", e);
-       }
-}
-
 function preloadArticleUnderPointer(id) {
        try {
                if (getInitParam("bw_limit") == "1") return;
@@ -1724,11 +1938,21 @@ function preloadArticleUnderPointer(id) {
 
                        cids_to_request.push(id);
 
-                       var query = "backend.php?op=rpc&subop=getArticles&ids=" + 
+                       var query = "?op=rpc&subop=getArticles&ids=" + 
                                cids_to_request.toString();
-                       new Ajax.Request(query, {
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       preload_article_callback(transport);
+                                       var articles = transport.responseXML.getElementsByTagName("article");
+
+                                       for (var i = 0; i < articles.length; i++) {
+                                               var id = articles[i].getAttribute("id");
+                                               if (!cache_check(id)) {
+                                                       cache_inject(id, articles[i].firstChild.nodeValue);                             
+                                                       debug("preloaded article: " + id);
+                                               }
+                                       }
                        } });
                }
        } catch (e) {
@@ -1761,23 +1985,17 @@ function postMouseOut(id) {
 function headlines_scroll_handler() {
        try {
 
-               var e = document.getElementById("headlinesInnerContainer");
-
-               // don't do infinite scrolling when Limit == All
+               var e = $("headlinesInnerContainer");
 
                var toolbar_form = document.forms["main_toolbar_form"];
 
-               var limit = toolbar_form.limit[toolbar_form.limit.selectedIndex];
-               if (limit.value != 0) {
-               
-                       debug((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
-                               _infscroll_disable);
+               debug((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
+                       _infscroll_disable);
 
-                       if (e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
-                               if (!_infscroll_disable) {
-                                       debug("more cowbell!");
-                                       viewNextFeedPage();
-                               }
+               if (e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
+                       if (!_infscroll_disable) {
+                               debug("more cowbell!");
+                               viewNextFeedPage();
                        }
                }
 
@@ -1798,7 +2016,7 @@ function catchupRelativeToArticle(below) {
 
                var visible_ids;
 
-               if (document.getElementById("headlinesList")) {
+               if ($("headlinesList")) {
                        visible_ids = getVisibleHeadlineIds();
                } else {
                        visible_ids = cdmGetVisibleArticles();
@@ -1809,7 +2027,7 @@ function catchupRelativeToArticle(below) {
                if (!below) {
                        for (var i = 0; i < visible_ids.length; i++) {
                                if (visible_ids[i] != getActiveArticleId()) {
-                                       var e = document.getElementById("RROW-" + visible_ids[i]);
+                                       var e = $("RROW-" + visible_ids[i]);
 
                                        if (e && e.className.match("Unread")) {
                                                ids_to_mark.push(visible_ids[i]);
@@ -1821,7 +2039,7 @@ function catchupRelativeToArticle(below) {
                } else {
                        for (var i = visible_ids.length-1; i >= 0; i--) {
                                if (visible_ids[i] != getActiveArticleId()) {
-                                       var e = document.getElementById("RROW-" + visible_ids[i]);
+                                       var e = $("RROW-" + visible_ids[i]);
 
                                        if (e && e.className.match("Unread")) {
                                                ids_to_mark.push(visible_ids[i]);
@@ -1840,14 +2058,15 @@ function catchupRelativeToArticle(below) {
                        if (confirm(msg)) {
 
                                for (var i = 0; i < ids_to_mark.length; i++) {
-                                       var e = document.getElementById("RROW-" + ids_to_mark[i]);
+                                       var e = $("RROW-" + ids_to_mark[i]);
                                        e.className = e.className.replace("Unread", "");
                                }
 
-                               var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
-                                       param_escape(ids_to_mark.toString()) + "&cmode=0";
+                               var query = "?op=rpc&subop=catchupSelected" +
+                                       "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString()); 
 
-                               new Ajax.Request(query, {
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) { 
                                                catchup_callback2(transport); 
                                        } });
@@ -1871,7 +2090,7 @@ function cdmExpandArticle(a_id) {
                Effect.Appear(id, {duration : 0.5, 
                        beforeStart: function(effect) { 
                                var h_id = 'CICH-' + a_id;
-                               var h_elem = document.getElementById(h_id);
+                               var h_elem = $(h_id);
                                if (h_elem) { h_elem.style.display = "none"; }
 
                                toggleUnread(a_id, 0);
@@ -1887,7 +2106,7 @@ function cdmExpandArticle(a_id) {
 function fixHeadlinesOrder(ids) {
        try {
                for (var i = 0; i < ids.length; i++) {
-                       var e = document.getElementById("RROW-" + ids[i]);
+                       var e = $("RROW-" + ids[i]);
 
                        if (e) {
                                if (i % 2 == 0) {
@@ -1908,7 +2127,7 @@ function hideReadHeadlines() {
                var ids = false;
                var vis_ids = new Array();
 
-               if (document.getElementById("headlinesList")) {
+               if ($("headlinesList")) {
                        ids = getVisibleHeadlineIds();
                } else {
                        ids = cdmGetVisibleArticles();
@@ -1917,7 +2136,7 @@ function hideReadHeadlines() {
                var read_headlines_visible = true;
 
                for (var i = 0; i < ids.length; i++) {
-                       var row = document.getElementById("RROW-" + ids[i]);
+                       var row = $("RROW-" + ids[i]);
 
                        if (row && row.className) {
                                if (read_headlines_visible) {
@@ -1964,7 +2183,7 @@ function invertHeadlineSelection() {
                for (var i = 0; i < rows.length; i++) {
                        var nc = rows[i].className;
                        var id = rows[i].id.replace("RROW-", "");
-                       var cb = document.getElementById("RCHK-" + id);
+                       var cb = $("RCHK-" + id);
 
                        if (!rows[i].className.match("Selected")) {
                                nc = nc + "Selected";
@@ -2001,11 +2220,12 @@ function zoomToArticle(id) {
 function showOriginalArticleInline(id) {
        try {
 
-               var query = "backend.php?op=rpc&subop=getArticleLink&id=" + id;
+               var query = "?op=rpc&subop=getArticleLink&id=" + id;
 
                notify_progress("Loading, please wait...", true);
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
 
                                if (transport.responseXML) {
@@ -2018,7 +2238,7 @@ function showOriginalArticleInline(id) {
                                        if (link && id) {
                                                link = link.firstChild.nodeValue;
 
-                                               var ci = document.getElementById("content-insert");
+                                               var ci = $("content-insert");
 
                                                var tmp = "<iframe id=\"inline_orig_article\" width=\""+ci.offsetWidth+"\" height=\""+ci.offsetHeight+"\" style=\"border-width : 0px;\" src=\""+link+"\"></iframe>";
 
@@ -2037,12 +2257,12 @@ function showOriginalArticleInline(id) {
 function scrollArticle(offset) {
        try {
                if (!isCdmMode()) {
-                       var ci = document.getElementById("content-insert");
+                       var ci = $("content-insert");
                        if (ci) {
                                ci.scrollTop += offset;
                        }
                } else {
-                       var hi = document.getElementById("headlinesInnerContainer");
+                       var hi = $("headlinesInnerContainer");
                        if (hi) {
                                hi.scrollTop += offset;
                        }
@@ -2065,7 +2285,7 @@ function show_labels_in_headlines(transport) {
 
                                if (e_id) {
 
-                                       var ctr = document.getElementById("HLLCTR-" + e_id);
+                                       var ctr = $("HLLCTR-" + e_id);
 
                                        if (ctr) {
                                                ctr.innerHTML = elems[l].firstChild.nodeValue;
@@ -2083,8 +2303,8 @@ function show_labels_in_headlines(transport) {
 
 function toggleHeadlineActions() {
        try {
-               var e = document.getElementById("headlineActionsBody");
-               var p = document.getElementById("headlineActionsDrop");
+               var e = $("headlineActionsBody");
+               var p = $("headlineActionsDrop");
 
                if (!Element.visible(e)) {
                        Element.show(e);
@@ -2094,9 +2314,24 @@ function toggleHeadlineActions() {
 
                e.scrollTop = 0;
                e.style.left = (p.offsetLeft + 1) + "px";
-//             e.style.top = (p.offsetTop + p.offsetHeight - 1) + "px";
+               e.style.top = (p.offsetTop + p.offsetHeight + 2) + "px";
 
        } catch (e) {
                exception_error("toggleHeadlineActions", e);
        }
 }
+
+function publishWithNote(id, def_note) {
+       try {
+               if (!def_note) def_note = '';
+
+               var note = prompt(__("Please enter a note for this article:"), def_note);
+
+               if (note != undefined) {
+                       togglePub(id, false, false, note);
+               }
+
+       } catch (e) {
+               exception_error("publishWithNote", e);
+       }
+}