]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
add updated triple-pane theme
[tt-rss.git] / tt-rss.js
index 8ac20bfe8b7d29a04037d12e17d15d202c680f3b..6d3cc73778139bad149da76ebce2d44a507ae2bd 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1,3 +1,4 @@
+
 var total_unread = 0;
 var first_run = true;
 var display_tags = false;
@@ -8,16 +9,50 @@ var daemon_enabled = false;
 var daemon_refresh_only = false;
 //var _qfd_deleted_feed = 0;
 var firsttime_update = true;
-var active_feed_id = 0;
-var active_feed_is_cat = false;
+var _active_feed_id = 0;
+var _active_feed_is_cat = false;
 var number_of_feeds = 0;
 var sanity_check_done = false;
 var _hfd_scrolltop = 0;
 var hotkey_prefix = false;
+var hotkey_prefix_pressed = false;
 var init_params = new Object();
 var ver_offset = 0;
 var hor_offset = 0;
 var feeds_sort_by_unread = false;
+var feedlist_sortable_enabled = false;
+
+function activeFeedIsCat() {
+       return _active_feed_is_cat;
+}
+
+function getActiveFeedId() {
+       try {
+               debug("gAFID: " + _active_feed_id);
+               return _active_feed_id;
+       } catch (e) {
+               exception_error("getActiveFeedId", e);
+       }
+}
+
+function setActiveFeedId(id, is_cat) {
+       try {
+               debug("sAFID(" + id + ", " + is_cat + ")");
+               _active_feed_id = id;
+
+               if (is_cat != undefined) {
+                       _active_feed_is_cat = is_cat;
+               }
+
+       } catch (e) {
+               exception_error("setActiveFeedId", e);
+       }
+}
+
+
+function isFeedlistSortable() {
+       return feedlist_sortable_enabled;
+}
 
 function tagsAreDisplayed() {
        return display_tags;
@@ -29,7 +64,7 @@ function toggleTags(show_all) {
 
        debug("toggleTags: " + show_all + "; " + display_tags);
 
-       var p = document.getElementById("dispSwitchPrompt");
+       var p = $("dispSwitchPrompt");
 
        if (!show_all && !display_tags) {
                displayDlg("printTagCloud");
@@ -53,7 +88,7 @@ function toggleTags(show_all) {
 
 function dlg_frefresh_callback(transport, deleted_feed) {
        if (getActiveFeedId() == deleted_feed) {
-               var h = document.getElementById("headlines-frame");
+               var h = $("headlines-frame");
                if (h) {
                        h.innerHTML = "<div class='whiteBox'>" + __('No feed selected.') + "</div>";
                }
@@ -63,27 +98,6 @@ function dlg_frefresh_callback(transport, deleted_feed) {
        closeInfoBox();
 }
 
-function refetch_callback2(transport) {
-       try {
-
-               var date = new Date();
-
-               parse_counters_reply(transport, true);
-
-               debug("refetch_callback2: done");
-
-/*             if (!daemon_enabled && !daemon_refresh_only) {
-                       notify_info("All feeds updated.");
-                       updateTitle("");
-               } else {
-                       //notify("");
-               } */
-       } catch (e) {
-               exception_error("refetch_callback", e);
-               updateTitle("");
-       }
-}
-
 function backend_sanity_check_callback(transport) {
 
        try {
@@ -96,14 +110,24 @@ function backend_sanity_check_callback(transport) {
                }
 
                if (!transport.responseXML) {
-                       fatalError(3, "[D001, Received reply is not XML]: " + transport.responseText);
-                       return;
+                       if (!store) {
+                               fatalError(3, "Sanity check: Received reply is not XML", 
+                                       transport.responseText);
+                               return;
+                       } else {
+                               init_offline();
+                               return;
+                       }
+               }
+
+               if (getURLParam("offline")) {
+                       return init_offline();
                }
 
                var reply = transport.responseXML.firstChild.firstChild;
 
                if (!reply) {
-                       fatalError(3, "[D002, Invalid RPC reply]: " + transport.responseText);
+                       fatalError(3, "Sanity check: invalid RPC reply", transport.responseText);
                        return;
                }
 
@@ -126,6 +150,13 @@ function backend_sanity_check_callback(transport) {
                                var v = param.getAttribute("value");
                                debug(k + " => " + v);
                                init_params[k] = v;                                     
+
+                               if (db) {
+                                       db.execute("DELETE FROM init_params WHERE key = ?", [k]);
+                                       db.execute("INSERT INTO init_params (key,value) VALUES (?, ?)",
+                                               [k, v]);
+                               }
+
                                param = param.nextSibling;
                        }
                }
@@ -135,7 +166,7 @@ function backend_sanity_check_callback(transport) {
                init_second_stage();
 
        } catch (e) {
-               exception_error("backend_sanity_check_callback", e);    
+               exception_error("backend_sanity_check_callback", e, transport); 
        } 
 }
 
@@ -171,15 +202,12 @@ function scheduleFeedUpdate(force) {
        query_str = query_str + "&omode=" + omode;
        query_str = query_str + "&uctr=" + global_unread;
 
-       var date = new Date();
-       var timestamp = Math.round(date.getTime() / 1000);
-       query_str = query_str + "&ts=" + timestamp
-
        debug("REFETCH query: " + query_str);
 
-       new Ajax.Request(query_str, {
+       new Ajax.Request("backend.php", {
+               parameters: query_str,
                onComplete: function(transport) { 
-                               refetch_callback2(transport); 
+                               parse_counters_reply(transport, true);
                        } });
 }
 
@@ -191,6 +219,8 @@ function updateFeedList(silent, fetch) {
 
        debug("<b>updateFeedList</b>");
 
+       if (offline_mode) return render_offline_feedlist();
+
        var query_str = "backend.php?op=feeds";
 
        if (display_tags) {
@@ -200,19 +230,16 @@ function updateFeedList(silent, fetch) {
        if (getActiveFeedId() && !activeFeedIsCat()) {
                query_str = query_str + "&actid=" + getActiveFeedId();
        }
-
-       var date = new Date();
-       var timestamp = Math.round(date.getTime() / 1000);
-       query_str = query_str + "&ts=" + timestamp
        
        if (fetch) query_str = query_str + "&fetch=yes";
 
-//     var feeds_frame = document.getElementById("feeds-frame");
+//     var feeds_frame = $("feeds-frame");
 //     feeds_frame.src = query_str;
 
        debug("updateFeedList Q=" + query_str);
 
-       new Ajax.Request(query_str, {
+       new Ajax.Request("backend.php", {
+               parameters: query_str,
                onComplete: function(transport) { 
                        feedlist_callback2(transport); 
                } });
@@ -231,7 +258,8 @@ function catchupAllFeeds() {
 
                debug("catchupAllFeeds Q=" + query_str);
 
-               new Ajax.Request(query_str, {
+               new Ajax.Request("backend.php", {
+                       parameters: query_str,
                        onComplete: function(transport) { 
                                feedlist_callback2(transport); 
                        } });
@@ -245,9 +273,8 @@ function viewCurrentFeed(subop) {
 
 //     if (getActiveFeedId()) {
        if (getActiveFeedId() != undefined) {
-               viewfeed(getActiveFeedId(), subop, active_feed_is_cat);
+               viewfeed(getActiveFeedId(), subop, activeFeedIsCat());
        } else {
-               disableContainerChildren("headlinesToolbar", false, document);
 //             viewfeed(-1, subop); // FIXME
        }
        return false; // block unneeded form submits
@@ -259,6 +286,8 @@ function viewfeed(feed, subop) {
 }
 
 function timeout() {
+       if (getInitParam("bw_limit") == "1") return;
+
        scheduleFeedUpdate(false);
 
        var refresh_time = getInitParam("feeds_frame_refresh");
@@ -269,7 +298,7 @@ function timeout() {
 }
 
 function resetSearch() {
-       var searchbox = document.getElementById("searchbox")
+       var searchbox = $("searchbox")
 
        if (searchbox.value != "" && getActiveFeedId()) {       
                searchbox.value = "";
@@ -277,10 +306,6 @@ function resetSearch() {
        }
 }
 
-function searchCancel() {
-       closeInfoBox(true);
-}
-
 function search() {
        closeInfoBox(); 
        viewCurrentFeed(0, "");
@@ -314,9 +339,9 @@ function genericSanityCheck() {
 
 //     if (!Ajax.getTransport()) fatalError(1);
 
-       setCookie("ttrss_vf_test", "TEST");
+       setCookie("ttrss_test", "TEST");
        
-       if (getCookie("ttrss_vf_test") != "TEST") {
+       if (getCookie("ttrss_test") != "TEST") {
                fatalError(2);
        }
 
@@ -327,12 +352,7 @@ function init() {
 
        try {
 
-               // this whole shebang is based on http://www.birnamdesigns.com/misc/busted2.html
-
-               if (arguments.callee.done) return;
-               arguments.callee.done = true;           
-
-               disableContainerChildren("headlinesToolbar", true);
+               init_gears();
 
                Form.disable("main_toolbar_form");
 
@@ -348,7 +368,8 @@ function init() {
 
                loading_set_progress(30);
 
-               new Ajax.Request("backend.php?op=rpc&subop=sanityCheck" + params,       {
+               new Ajax.Request("backend.php", {
+                       parameters: "backend.php?op=rpc&subop=sanityCheck" + params,
                        onComplete: function(transport) {
                                        backend_sanity_check_callback(transport);
                                } });
@@ -364,19 +385,20 @@ function resize_headlines(delta_x, delta_y) {
 
                debug("resize_headlines: " + delta_x + ":" + delta_y);
        
-               var h_frame = document.getElementById("headlines-frame");
-               var c_frame = document.getElementById("content-frame");
-               var f_frame = document.getElementById("footer");
-               var feeds_frame = document.getElementById("feeds-holder");
-               var resize_grab = document.getElementById("resize-grabber");
-       
+               var h_frame = $("headlines-frame");
+               var c_frame = $("content-frame");
+               var f_frame = $("footer");
+               var feeds_frame = $("feeds-holder");
+               var resize_grab = $("resize-grabber");
+               var resize_handle = $("resize-handle");
+
                if (!c_frame || !h_frame) return;
        
-               if (feeds_frame && getInitParam("theme") == "compat") {
+               if (feeds_frame && getInitParam("theme") == "old-skool") {
                                feeds_frame.style.bottom = f_frame.offsetHeight + "px";         
                }
        
-               if (getInitParam("theme") == "3pane") {
+               if (getInitParam("theme_options").match("horiz_resize")) {
        
                        if (delta_x != undefined) {
                                if (c_frame.offsetLeft - delta_x > feeds_frame.offsetWidth + feeds_frame.offsetLeft + 100 && c_frame.offsetWidth + delta_x > 100) {
@@ -393,6 +415,9 @@ function resize_headlines(delta_x, delta_y) {
                        resize_grab.style.left = (h_frame.offsetLeft + h_frame.offsetWidth - 
                                4) + "px";
                        resize_grab.style.display = "block";
+
+                       //resize_handle.src = "themes/"+getInitParam('theme')+"/images/resize_handle_vert.png";
+                       resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
        
                } else {
        
@@ -406,17 +431,9 @@ function resize_headlines(delta_x, delta_y) {
        
                        h_frame.style.height = (300 - ver_offset) + "px";
        
-                       c_frame.style.top = (h_frame.offsetTop + h_frame.offsetHeight + 1) + "px";
+                       c_frame.style.top = (h_frame.offsetTop + h_frame.offsetHeight + 0) + "px";
                        h_frame.style.height = h_frame.offsetHeight + "px";
-       
-                       var theme_c = 0;
-       
-                       if (getInitParam("theme") == "graycube") theme_c = 1;
-       
-                       resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 
-                               4 - theme_c) + "px";
-                       resize_grab.style.display = "block";
-       
+
                }
        
                if (getInitParam("cookie_lifetime") != 0) {
@@ -439,19 +456,33 @@ function init_second_stage() {
 
        try {
 
-               delCookie("ttrss_vf_test");
+               delCookie("ttrss_test");
 
 //             document.onresize = resize_headlines;
+               window.onresize=resize_headlines;
 
                var toolbar = document.forms["main_toolbar_form"];
 
                dropboxSelect(toolbar.view_mode, getInitParam("default_view_mode"));
-               dropboxSelect(toolbar.limit, getInitParam("default_view_limit"));
+               dropboxSelect(toolbar.order_by, getInitParam("default_view_order_by"));
 
                daemon_enabled = getInitParam("daemon_enabled") == 1;
                daemon_refresh_only = getInitParam("daemon_refresh_only") == 1;
                feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
+/*             var fl = cache_find_param("FEEDLIST", getInitParam("num_feeds"));
+
+               if (fl) {
+                       render_feedlist(fl);
+                       if ($("feedList")) {
+                               request_counters();
+                       } else {
+                               setTimeout('updateFeedList(false, false)', 50);
+                       }
+               } else {
+                       setTimeout('updateFeedList(false, false)', 50);
+               } */
+
                setTimeout('updateFeedList(false, false)', 50);
 
                debug("second stage ok");
@@ -461,6 +492,8 @@ function init_second_stage() {
                ver_offset = parseInt(getCookie("ttrss_offset_ver"));
                hor_offset = parseInt(getCookie("ttrss_offset_hor"));
 
+               debug("got offsets from cookies: ver " + ver_offset + " hor " + hor_offset);
+
                /* fuck IE */
 
                if (isNaN(hor_offset)) hor_offset = 0;
@@ -470,13 +503,15 @@ function init_second_stage() {
 
                resize_headlines();
 
+               enable_offline_reading();
+
        } catch (e) {
                exception_error("init_second_stage", e);
        }
 }
 
 function quickMenuChange() {
-       var chooser = document.getElementById("quickMenuChooser");
+       var chooser = $("quickMenuChooser");
        var opid = chooser[chooser.selectedIndex].value;
 
        chooser.selectedIndex = 0;
@@ -491,12 +526,15 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcSearch") {
-                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+                               function() { 
+                                       document.forms['search_form'].query.focus();
+                               });
                        return;
                }
        
                if (opid == "qmcAddFeed") {
-                       displayDlg("quickAddFeed");
+                       quickAddFeed();
                        return;
                }
 
@@ -528,31 +566,6 @@ function quickMenuGo(opid) {
                        return;
                }
 
-               if (opid == "qmcClearFeed") {
-                       var actid = getActiveFeedId();
-
-                       if (!actid) {
-                               alert(__("Please select some feed first."));
-                               return;
-                       }
-
-                       if (activeFeedIsCat() || actid < 0) {
-                               alert(__("You can't clear this type of feed."));
-                               return;
-                       }       
-
-                       var fn = getFeedName(actid);
-
-                       var pr = __("Erase all non-starred articles in %s?").replace("%s", fn);
-
-                       if (confirm(pr)) {
-                               clearFeedArticles(actid);
-                       }
-               
-                       return;
-               }
-       
-
                if (opid == "qmcUpdateFeeds") {
                        scheduleFeedUpdate(true);
                        return;
@@ -569,7 +582,12 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcAddFilter") {
-                       displayDlg("quickAddFilter", getActiveFeedId());
+                       displayDlg('quickAddFilter', '',
+                          function () {document.forms['filter_add_form'].reg_exp.focus();});
+               }
+
+               if (opid == "qmcAddLabel") {
+                       addLabel();
                }
 
                if (opid == "qmcRescoreFeed") {
@@ -587,27 +605,27 @@ function quickMenuGo(opid) {
                        resize_headlines();
                }
 
-       } catch (e) {
-               exception_error("quickMenuGo", e);
-       }
-}
-
-function unsubscribeFeed(feed_id) {
+               if (opid == "qmcResetCats") {
 
-       notify_progress("Removing feed...");
+                       if (confirm(__("Reset category order?"))) {
 
-       var query = "backend.php?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
+                               var query = "?op=feeds&subop=catsortreset";
 
-       new Ajax.Request(query, {
-               onComplete: function(transport) {
-                               dlg_frefresh_callback(transport, feed_id);
-                       } });
+                               notify_progress("Loading, please wait...", true);
 
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) { 
+                                               window.setTimeout('updateFeedList(false, false)', 50);
+                                       } });
+                       }
+               }
 
-       return false;
+       } catch (e) {
+               exception_error("quickMenuGo", e);
+       }
 }
 
-
 function updateFeedTitle(t) {
        active_title_text = t;
        updateTitle();
@@ -616,15 +634,18 @@ function updateFeedTitle(t) {
 function toggleDispRead() {
        try {
 
-               var hide_read_feeds = (getInitParam("hide_read_feeds") == "1");
+               var hide = !(getInitParam("hide_read_feeds") == "1");
 
-               hide_read_feeds = !hide_read_feeds;
+               hideOrShowFeeds(hide);
 
-               debug("toggle_disp_read => " + hide_read_feeds);
+               var query = "?op=rpc&subop=setpref&key=HIDE_READ_FEEDS&value=" + 
+                       param_escape(hide);
 
-               hideOrShowFeeds(hide_read_feeds);
-
-               storeInitParam("hide_read_feeds", hide_read_feeds, true);
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               setInitParam("hide_read_feeds", hide);
+                       } });
                                
        } catch (e) {
                exception_error("toggleDispRead", e);
@@ -647,8 +668,12 @@ function parse_runtime_info(elem) {
 
                debug("RI: " + k + " => " + v);
 
+               if (k == "num_feeds") {
+                       init_params[k] = v;                                     
+               }
+
                if (k == "new_version_available") {
-                       var icon = document.getElementById("newVersionIcon");
+                       var icon = $("newVersionIcon");
                        if (icon) {
                                if (v == "1") {
                                        icon.style.display = "inline";
@@ -674,7 +699,7 @@ function parse_runtime_info(elem) {
                        notify('');
                }
 
-/*             var w = document.getElementById("noDaemonWarning");
+/*             var w = $("noDaemonWarning");
                
                if (w) {
                        if (k == "daemon_is_running" && v != 1) {
@@ -689,25 +714,29 @@ function parse_runtime_info(elem) {
 
 function catchupCurrentFeed() {
 
-       var fn = getFeedName(getActiveFeedId(), active_feed_is_cat);
+       var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
        
        var str = __("Mark all articles in %s as read?").replace("%s", fn);
 
-/*     if (active_feed_is_cat) {
-               str = "Mark all articles in this category as read?";
-       } */
-
        if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
                return viewCurrentFeed('MarkAllRead')
        }
 }
 
-function catchupFeedInGroup(id, title) {
+function catchupFeedInGroup(id) {
+
+       try {
 
-       var str = __("Mark all articles in %s as read?").replace("%s", title);
+               var title = getFeedName(id);
 
-       if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
-               return viewCurrentFeed('MarkAllReadGR:' + id)
+               var str = __("Mark all articles in %s as read?").replace("%s", title);
+
+               if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
+                       return viewCurrentFeed('MarkAllReadGR:' + id)
+               }
+
+       } catch (e) {
+               exception_error("catchupFeedInGroup", e);
        }
 }
 
@@ -719,7 +748,7 @@ function editFeedDlg(feed) {
                        return;
                }
        
-               if ((feed <= 0 && feed > -10) || activeFeedIsCat() || tagsAreDisplayed()) {
+               if ((feed <= 0) || activeFeedIsCat() || tagsAreDisplayed()) {
                        alert(__("You can't edit this kind of feed."));
                        return;
                }
@@ -727,16 +756,20 @@ function editFeedDlg(feed) {
                var query = "";
        
                if (feed > 0) {
-                       query = "backend.php?op=pref-feeds&subop=editfeed&id=" +        param_escape(feed);
+                       query = "?op=pref-feeds&subop=editfeed&id=" +   param_escape(feed);
                } else {
-                       query = "backend.php?op=pref-labels&subop=edit&id=" +   param_escape(-feed-11);
+                       query = "?op=pref-labels&subop=edit&id=" +      param_escape(-feed-11);
                }
 
                disableHotkeys();
 
-               new Ajax.Request(query, {
+               notify_progress("Loading, please wait...", true);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
                                infobox_callback2(transport); 
+                               document.forms["edit_feed_form"].title.focus();
                        } });
 
        } catch (e) {
@@ -768,7 +801,7 @@ function feedEditSave() {
                                dlg_frefresh_callback(transport); 
                        } });
 
-
+               cache_flush();
                closeInfoBox();
 
                return false;
@@ -778,89 +811,25 @@ function feedEditSave() {
        } 
 }
 
-function labelEditCancel() {
-       closeInfoBox();
-       return false;
-}
-
-function labelEditSave() {
-
-       try {
-
-               closeInfoBox();
-       
-               notify_progress("Saving label...");
-       
-               query = Form.serialize("label_edit_form");
-       
-               new Ajax.Request("backend.php?" + query, {
-                       onComplete: function(transport) { 
-                               dlg_frefresh_callback(transport); 
-                       } });
-
-               return false;
-
-       } catch (e) {
-               exception_error("feedEditSave (main)", e);
-       } 
-
-}
-
-function clearFeedArticles(feed_id) {
-
-       notify_progress("Clearing feed...");
-
-       var query = "backend.php?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
-
-       new Ajax.Request(query, {
-               onComplete: function(transport) {
-                               dlg_frefresh_callback(transport, feed_id);
-                       } });
-
-       return false;
-}
-
-/*
-function toggle_feedlist() {
-       try {
-               debug("toggle_feedlist");
-
-               var fl = document.getElementById("feeds-holder");
-
-               if (!Element.visible(fl)) {
-                       Element.show(fl);
-                       fl.style.zIndex = 30;
-                       fl.scrollTop = _hfd_scrolltop;
-               } else {
-                       _hfd_scrolltop = fl.scrollTop;
-                       Element.hide(fl);                       
-//                     Effect.Fade(fl, {duration : 0.2, 
-//                             queue: { position: 'end', scope: 'FLFADEQ', limit: 1 }});
-               }
-       } catch (e) {
-               exception_error("toggle_feedlist", e);
-       }
-} */
-
 function collapse_feedlist() {
        try {
-               debug("toggle_feedlist");
+               debug("collapse_feedlist");
                
                var theme = getInitParam("theme");
-               if (theme != "" && theme != "compact" && theme != "graycube" &&
-                               theme != "compat") return;
+               if (theme != "" && 
+                               !getInitParam("theme_options").match("collapse_feedlist")) return;
 
-               var fl = document.getElementById("feeds-holder");
-               var fh = document.getElementById("headlines-frame");
-               var fc = document.getElementById("content-frame");
-               var ft = document.getElementById("toolbar");
-               var ff = document.getElementById("footer");
-               var fhdr = document.getElementById("header");
-               var fbtn = document.getElementById("collapse_feeds_btn");
+               var fl = $("feeds-holder");
+               var fh = $("headlines-frame");
+               var fc = $("content-frame");
+               var ft = $("toolbar");
+               var ff = $("footer");
+               var fhdr = $("header");
+               var fbtn = $("collapse_feeds_btn");
 
                if (!Element.visible(fl)) {
                        Element.show(fl);
-                       fbtn.value = "<<";
+                       fbtn.innerHTML = "<<";
 
                        if (theme != "graycube") {
 
@@ -876,11 +845,13 @@ function collapse_feedlist() {
                                if (fc) fc.style.left = fl.offsetWidth + 40 + "px";
                        }
 
-                       setCookie("ttrss_vf_fclps", "0");
+                       query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=false";
+
+                       new Ajax.Request("backend.php", { parameters: query });
 
                } else {
                        Element.hide(fl);
-                       fbtn.value = ">>";
+                       fbtn.innerHTML = ">>";
 
                        if (theme != "graycube") {
 
@@ -898,32 +869,36 @@ function collapse_feedlist() {
 
                        }
 
-                       setCookie("ttrss_vf_fclps", "1");
+                       query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=true";
+
+                       new Ajax.Request("backend.php", { parameters: query });
+
                }
        } catch (e) {
-               exception_error("toggle_feedlist", e);
+               exception_error("collapse_feedlist", e);
        }
 }
 
 function viewModeChanged() {
-       cache_empty();
+       cache_flush();
        return viewCurrentFeed(0, '')
 }
 
 function viewLimitChanged() {
-       cache_empty();
+       cache_flush();
        return viewCurrentFeed(0, '')
 }
 
-function adjustArticleScore(id, score) {
+/* function adjustArticleScore(id, score) {
        try {
 
                var pr = prompt(__("Assign score to article:"), score);
 
                if (pr != undefined) {
-                       var query = "backend.php?op=rpc&subop=setScore&id=" + id + "&score=" + pr;
+                       var query = "?op=rpc&subop=setScore&id=" + id + "&score=" + pr;
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        viewCurrentFeed();
                                } });
@@ -932,7 +907,7 @@ function adjustArticleScore(id, score) {
        } catch (e) {
                exception_error("adjustArticleScore", e);
        }
-}      
+} */
 
 function rescoreCurrentFeed() {
 
@@ -954,12 +929,13 @@ function rescoreCurrentFeed() {
        if (confirm(pr)) {
                notify_progress("Rescoring articles...");
 
-               var query = "backend.php?op=pref-feeds&subop=rescore&quiet=1&ids=" + actid;
+               var query = "?op=pref-feeds&subop=rescore&quiet=1&ids=" + actid;
 
-               new Ajax.Request(query, {
-               onComplete: function(transport) {
-                       viewCurrentFeed();
-               } });
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               viewCurrentFeed();
+                       } });
        }
 }
 
@@ -970,7 +946,8 @@ function hotkey_handler(e) {
                var keycode;
                var shift_key = false;
 
-               var feedlist = document.getElementById('feedList');
+               var cmdline = $('cmdline');
+               var feedlist = $('feedList');
 
                try {
                        shift_key = e.shiftKey;
@@ -1001,10 +978,20 @@ function hotkey_handler(e) {
 
                if (keycode == 16) return; // ignore lone shift
 
-               if ((keycode == 70 || keycode == 67 || keycode == 71) && !hotkey_prefix) {
+               if ((keycode == 70 || keycode == 67 || keycode == 71) 
+                               && !hotkey_prefix) {
+
+                       var date = new Date();
+                       var ts = Math.round(date.getTime() / 1000);
+
                        hotkey_prefix = keycode;
-                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
-                       return;
+                       hotkey_prefix_pressed = ts;
+
+                       cmdline.innerHTML = keychar;
+                       Element.show(cmdline);
+
+                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar + " TS=" + ts);
+                       return true;
                }
 
                if (Element.visible("hotkey_help_overlay")) {
@@ -1013,6 +1000,8 @@ function hotkey_handler(e) {
 
                /* Global hotkeys */
 
+               Element.hide(cmdline);
+
                if (!hotkey_prefix) {
 
                        if (keycode == 68 && shift_key) { // d
@@ -1037,7 +1026,10 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 191 || keychar == '/') { // /
-                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+                                       function() { 
+                                               document.forms['search_form'].query.focus();
+                                       });
                                return false;
                        }
 
@@ -1046,37 +1038,59 @@ function hotkey_handler(e) {
                                return;
                        }
 
-                       if (keycode == 82) { // r
-                               if (getActiveFeedId()) {
-                                       viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
-                                       return;
-                               }
-                       }
-
                        if (keycode == 74) { // j
                                var feed = getActiveFeedId();
-                               var new_feed = getRelativeFeedId(feedlist, feed, 'prev');
-                               if (new_feed) viewfeed(new_feed, '');
+                               var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'prev');
+//                             alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
+                               if (new_feed) {
+                                       var is_cat = new_feed.match("CAT:");
+                                       if (is_cat) {
+                                               new_feed = new_feed.replace("CAT:", "");
+                                               viewCategory(new_feed);
+                                       } else {
+                                               viewfeed(new_feed, '', false);
+                                       }
+                               }
                                return;
                        }
        
                        if (keycode == 75) { // k
                                var feed = getActiveFeedId();
-                               var new_feed = getRelativeFeedId(feedlist, feed, 'next');
-                               if (new_feed) viewfeed(new_feed, '');
+                               var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'next');
+//                             alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
+                               if (new_feed) {
+                                       var is_cat = new_feed.match("CAT:");
+                                       if (is_cat == "CAT:") {
+                                               new_feed = new_feed.replace("CAT:", "");
+                                               viewCategory(new_feed);
+                                       } else {
+                                               viewfeed(new_feed, '', false);
+                                       }
+                               }
                                return;
                        }
 
-                       if (shift_key && (keycode == 78 || keycode == 40)) { // shift - n, down
+                       if (shift_key && keycode == 40) { // shift-down
                                catchupRelativeToArticle(1);
                                return;
                        }
 
-                       if (shift_key && (keycode == 80 || keycode == 38)) { // shift - p, up
+                       if (shift_key && keycode == 38) { // shift-up
                                catchupRelativeToArticle(0);
                                return;
                        }
 
+                       if (shift_key && keycode == 78) { // N
+                               scrollArticle(50);      
+                               return;
+                       }
+
+                       if (shift_key && keycode == 80) { // P
+                               scrollArticle(-50);     
+                               return;
+                       }
+
+
                        if (keycode == 78 || keycode == 40) { // n, down
                                if (typeof moveToPost != 'undefined') {
                                        moveToPost('next');
@@ -1127,7 +1141,7 @@ function hotkey_handler(e) {
                        if (keycode == 9) { // tab
                                var id = getArticleUnderPointer();
                                if (id) {                               
-                                       var cb = document.getElementById("RCHK-" + id);
+                                       var cb = $("RCHK-" + id);
 
                                        if (cb) {
                                                cb.checked = !cb.checked;
@@ -1151,23 +1165,9 @@ function hotkey_handler(e) {
                                }
                        }
 
-                       if (keycode == 81) { // q
-                               if (getActiveFeedId()) {
-                                       catchupCurrentFeed();
-                                       return;
-                               }
-                       }
-
-                       if (keycode == 220 && shift_key) { // shift + |
-                               if (document.getElementById("subtoolbar_search")) {
-                                       if (Element.visible("subtoolbar_search")) {
-                                               Element.hide("subtoolbar_search");
-                                               Element.show("subtoolbar_ftitle");
-                                               setTimeout("Element.focus('subtoolbar_search_box')", 100);
-                                       } else {
-                                                       Element.show("subtoolbar_search");
-                                               Element.hide("subtoolbar_ftitle");
-                                       }
+                       if (keycode == 88) { // x
+                               if (activeFeedIsCat()) {
+                                       toggleCollapseCat(getActiveFeedId());
                                }
                        }
                }
@@ -1178,6 +1178,20 @@ function hotkey_handler(e) {
 
                        hotkey_prefix = false;
 
+                       if (keycode == 81) { // q
+                               if (getActiveFeedId()) {
+                                       catchupCurrentFeed();
+                                       return;
+                               }
+                       }
+
+                       if (keycode == 82) { // r
+                               if (getActiveFeedId()) {
+                                       viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
+                                       return;
+                               }
+                       }
+
                        if (keycode == 65) { // a
                                toggleDispRead();
                                return false;
@@ -1201,7 +1215,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 83) { // s
-                               displayDlg("quickAddFeed");
+                               quickAddFeed();
                                return false;
                        }
 
@@ -1224,6 +1238,11 @@ function hotkey_handler(e) {
                                return resort_feedlist();
                        }
 
+                       if (keycode == 72) { // h
+                               hideReadHeadlines();
+                               return;
+                       }
+
                }
 
                /* Prefix c */
@@ -1232,7 +1251,13 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 70) { // f
-                               displayDlg("quickAddFilter", getActiveFeedId());
+                               displayDlg('quickAddFilter', '',
+                                  function () {document.forms['filter_add_form'].reg_exp.focus();});
+                               return false;
+                       }
+
+                       if (keycode == 76) { // l
+                               addLabel();
                                return false;
                        }
 
@@ -1243,6 +1268,28 @@ function hotkey_handler(e) {
                                }
                        }
 
+                       if (keycode == 77) { // m
+                               feedlist_sortable_enabled = !feedlist_sortable_enabled;
+                               if (feedlist_sortable_enabled) {
+                                       notify_info("Category reordering enabled");
+                                       toggle_sortable_feedlist(true);
+                               } else {
+                                       notify_info("Category reordering disabled");
+                                       toggle_sortable_feedlist(false);
+                               }
+                       }
+
+                       if (keycode == 78) { // n
+                               catchupRelativeToArticle(1);
+                               return;
+                       }
+
+                       if (keycode == 80) { // p
+                               catchupRelativeToArticle(0);
+                               return;
+                       }
+
+
                }
 
                /* Prefix g */
@@ -1251,6 +1298,12 @@ function hotkey_handler(e) {
 
                        hotkey_prefix = false;
 
+
+                       if (keycode == 65) { // a
+                               viewfeed(-4);
+                               return false;
+                       }
+
                        if (keycode == 83) { // s
                                viewfeed(-1);
                                return false;
@@ -1275,7 +1328,13 @@ function hotkey_handler(e) {
                                toggleTags();
                                return false;
                        }
+               }
+
+               /* Cmd */
 
+               if (hotkey_prefix == 224 || hotkey_prefix == 91) { // f 
+                       hotkey_prefix = false;
+                       return;
                }
 
                if (hotkey_prefix) {
@@ -1293,3 +1352,7 @@ function hotkey_handler(e) {
 function feedsSortByUnread() {
        return feeds_sort_by_unread;
 }
+
+function inPreferences() {
+       return false;
+}