]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
refactor feed edit dialog
[tt-rss.git] / prefs.js
index 2a82ae692a384a86eb431eacbe00e5cf51df0077..5ca4e33383fa500666e60f64b7db1a8cfc1843d9 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -1,23 +1,19 @@
 var active_feed_cat = false;
-var active_tab = false;
 
 var init_params = new Array();
 
 var caller_subop = false;
-var sanity_check_done = false;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
 
-var color_picker_active = false;
-var selection_disabled = false;
-var mouse_is_down = false;
+var seq = "";
 
 function feedlist_callback2(transport) {
 
        try {   
 
-               var container = $('prefContent');       
-               container.innerHTML=transport.responseText;
+               dijit.byId('feedConfigTab').attr('content', transport.responseText); 
+
                selectTab("feedConfig", true);
 
                if (caller_subop) {
@@ -28,11 +24,7 @@ function feedlist_callback2(transport) {
 
                        caller_subop = false;
                }
-               if (typeof correctPNG != 'undefined') {
-                       correctPNG();
-               }
                notify("");
-               remove_splash();
 
        } catch (e) {
                exception_error("feedlist_callback2", e);
@@ -40,53 +32,18 @@ function feedlist_callback2(transport) {
 }
 
 function filterlist_callback2(transport) {
-       var container = $('prefContent');
-       container.innerHTML=transport.responseText;
-       if (typeof correctPNG != 'undefined') {
-               correctPNG();
-       }
+       dijit.byId('filterConfigTab').attr('content', transport.responseText); 
        notify("");
-       remove_splash();
-}
-
-function init_label_inline_editor() {
-       try {
-               if ($("prefLabelList")) {
-                       var elems = $("prefLabelList").getElementsByTagName("SPAN");
-
-                       for (var i = 0; i < elems.length; i++) {
-                               if (elems[i].id && elems[i].id.match("LILT-")) {
-
-                                       var id = elems[i].id.replace("LILT-", "");
-
-                                       new Ajax.InPlaceEditor(elems[i],
-                                               'backend.php?op=pref-labels&subop=save&id=' + id,
-                                               {cols: 20, rows: 1});
-
-                               }
-                       }
-               }
-
-       } catch (e) {
-               exception_error("init_label_inline_editor", e);
-       }
 }
 
 function labellist_callback2(transport) {
 
        try {
 
-               var container = $('prefContent');
-                       closeInfoBox();
-                       container.innerHTML=transport.responseText;
+               dijit.byId('labelConfigTab').attr('content', transport.responseText); 
+               closeInfoBox();
 
-                       init_label_inline_editor();
-       
-                       if (typeof correctPNG != 'undefined') {
-                               correctPNG();
-                       }
-                       notify("");
-                       remove_splash();
+               notify("");
 
        } catch (e) {
                exception_error("labellist_callback2", e);
@@ -95,12 +52,9 @@ function labellist_callback2(transport) {
 
 function userlist_callback2(transport) {
        try {
-               var container = $('prefContent');
-               if (transport.readyState == 4) {
-                       container.innerHTML=transport.responseText;
-                       notify("");
-                       remove_splash();
-               }
+               dijit.byId('userConfigTab').attr('content', transport.responseText); 
+
+               notify("");
        } catch (e) {
                exception_error("userlist_callback2", e);
        }
@@ -108,10 +62,9 @@ function userlist_callback2(transport) {
 
 function prefslist_callback2(transport) {
        try {
-               var container = $('prefContent');
-               container.innerHTML=transport.responseText;
+               dijit.byId('genConfigTab').attr('content', transport.responseText); 
+
                notify("");
-               remove_splash();
        } catch (e) {
                exception_error("prefslist_callback2", e);
        }
@@ -141,35 +94,6 @@ function init_profile_inline_editor() {
        }
 }
 
-function init_cat_inline_editor() {
-       try {
-
-               if ($("prefFeedCatList")) {
-                       var elems = $("prefFeedCatList").getElementsByTagName("SPAN");
-
-                       for (var i = 0; i < elems.length; i++) {
-                               if (elems[i].id && elems[i].id.match("FCATT-")) {
-                                       var cat_id = elems[i].id.replace("FCATT-", "");
-                                               new Ajax.InPlaceEditor(elems[i],
-                                               'backend.php?op=pref-feeds&subop=editCats&action=save&cid=' + cat_id);
-                               }
-                       }
-               }
-
-       } catch (e) {
-               exception_error("init_cat_inline_editor", e);
-       }
-}
-
-function infobox_feed_cat_callback2(transport) {
-       try {
-               infobox_callback2(transport);
-               init_cat_inline_editor();
-       } catch (e) {
-               exception_error("infobox_feed_cat_callback2", e);
-       }
-}
-
 function updateFeedList(sort_key) {
 
        try {
@@ -223,38 +147,6 @@ function updateUsersList(sort_key) {
        }
 }
 
-function addLabel() {
-
-       try {
-
-               var caption = prompt(__("Please enter label caption:"), "");
-       
-               if (caption == null) { 
-                       return false;
-               }
-       
-               if (caption == "") {
-                       alert(__("Can't create label: missing caption."));
-                       return false;
-               }
-       
-               // we can be called from some other tab
-               active_tab = "labelConfig";
-       
-               query = "?op=pref-labels&subop=add&caption=" + 
-                       param_escape(caption);
-       
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_submit_callback2(transport);
-                               } });
-
-       } catch (e) {
-               exception_error("addLabel", e);
-       }
-}
-
 function addFeed() {
 
        try {
@@ -324,10 +216,10 @@ function addFeedCat() {
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) {
-                                       infobox_feed_cat_callback2(transport);
+                                       infobox_callback2(transport);
                                } });
 
-               link.value = "";
+               cat.value = "";
 
        }
 }
@@ -363,19 +255,16 @@ function addUser() {
        }
 }
 
-function editUser(id) {
+function editUser(id, event) {
 
        try {
-
-               disableHotkeys();
+               if (!event || !event.ctrlKey) {
 
                notify_progress("Loading, please wait...");
 
-               selectTableRowsByIdPrefix('prefUserList', 'UMRR-', 'UMCHK-', false);
+               selectTableRows('prefUserList', 'none');
                selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
 
-               disableContainerChildren("userOpToolbar", false);
-
                var query = "?op=pref-users&subop=edit&id=" +
                        param_escape(id);
 
@@ -383,86 +272,124 @@ function editUser(id) {
                        parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
+                                       document.forms['user_edit_form'].login.focus(); 
                                } });
 
+               } else if (event.ctrlKey) {
+                       var cb = $('UMCHK-' + id);
+                       cb.checked = !cb.checked;
+                       toggleSelectRow(cb);
+               }
+
        } catch (e) {
                exception_error("editUser", e);
        }
                
 }
 
-function editFilter(id) {
-
+function editFilter(id, event) {
        try {
 
-               disableHotkeys();
+               var query = "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id);
 
-               notify_progress("Loading, please wait...");
-
-               disableContainerChildren("filterOpToolbar", false);
+               if (dijit.byId("filterEditDlg"))
+                       dijit.byId("filterEditDlg").destroyRecursive();
 
-               selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
-               selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
+               dialog = new dijit.Dialog({
+                       id: "filterEditDlg",
+                       title: __("Edit Filter"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
 
-               var query = "?op=pref-filters&subop=edit&id=" + 
-                       param_escape(id);
+                                       var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + 
+                                               param_escape(dialog.attr('value').reg_exp);
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                               } });
-       } catch (e) {
-               exception_error("editFilter", e);
-       }
-}
+                                       notify_progress("Verifying regular expression...");
 
-function editFeed(feed) {
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       handle_rpc_reply(transport);
+                                                       var response = transport.responseXML;
+
+                                                       if (response) {
+                                                               var s = response.getElementsByTagName("status")[0].firstChild.nodeValue;
+       
+                                                               notify('');
+
+                                                               if (s == "INVALID") {
+                                                                       alert("Match regular expression seems to be invalid.");
+                                                                       return;
+                                                               } else {
+                                                                       notify_progress("Saving data...", true);
+
+                                                                       console.log(dojo.objectToQuery(dialog.attr('value')));
+
+                                                                       new Ajax.Request("backend.php", {
+                                                                               parameters: dojo.objectToQuery(dialog.attr('value')),
+                                                                               onComplete: function(transport) {
+                                                                                       dialog.hide();
+                                                                                       updateFilterList();                             
+                                                                       }})
+                                                               }       
+                                                       }
+                                       }});
+                               }
+                       },
+                       href: query});
 
-       try {
+               dialog.show();
 
-               disableHotkeys();
-       
-               notify_progress("Loading, please wait...");
-       
-               // clean selection from all rows & select row being edited
-               selectTableRowsByIdPrefix('prefFeedList', 'FEEDR-', 'FRCHK-', false);
-               selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
-       
-               disableContainerChildren("feedOpToolbar", false);
-       
-               var query = "?op=pref-feeds&subop=editfeed&id=" +
-                       param_escape(feed);
-       
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                               } });
 
        } catch (e) {
-               exception_error("editFeed", e);
+               exception_error("editFilter", e);
        }
 }
 
 function getSelectedLabels() {
-       return getSelectedTableRowIds("prefLabelList", "LILRR");
+       var tree = dijit.byId("labelTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
 }
 
 function getSelectedUsers() {
-       return getSelectedTableRowIds("prefUserList", "UMRR");
+       return getSelectedTableRowIds("prefUserList");
 }
 
 function getSelectedFeeds() {
-       return getSelectedTableRowIds("prefFeedList", "FEEDR");
+       var tree = dijit.byId("feedTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
 }
 
 function getSelectedFilters() {
-       return getSelectedTableRowIds("prefFilterList", "FILRR");
+       var tree = dijit.byId("filterTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
+
 }
 
 function getSelectedFeedCats() {
-       return getSelectedTableRowIds("prefFeedCatList", "FCATR");
+       return getSelectedTableRowIds("prefFeedCatList");
 }
 
 
@@ -502,7 +429,7 @@ function removeSelectedUsers() {
        
                if (sel_rows.length > 0) {
        
-                       var ok = confirm(__("Remove selected users?"));
+                       var ok = confirm(__("Remove selected users? Neither default admin nor your account will be removed."));
        
                        if (ok) {
                                notify_progress("Removing selected users...");
@@ -581,7 +508,7 @@ function removeSelectedFeeds() {
                                var query = "?op=pref-feeds&subop=remove&ids="+
                                        param_escape(sel_rows.toString());
 
-                               debug(query);
+                               console.log(query);
 
                                new Ajax.Request("backend.php", {
                                        parameters: query,
@@ -642,7 +569,7 @@ function purgeSelectedFeeds() {
                        var query = "?op=rpc&subop=purge&ids="+
                                param_escape(sel_rows.toString()) + "&days=" + pr;
 
-                       debug(query);
+                       console.log(query);
 
                        new Ajax.Request("prefs.php",   {
                                parameters: query,
@@ -705,7 +632,7 @@ function removeSelectedFeedCats() {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
-                                       infobox_feed_cat_callback2(transport);
+                                       infobox_callback2(transport);
                                } });
 
                }
@@ -719,56 +646,8 @@ function removeSelectedFeedCats() {
        return false;
 }
 
-function feedEditCancel() {
-
-       closeInfoBox();
-
-       selectPrefRows('feed', false); // cleanup feed selection
-
-       return false;
-}
-
-function feedEditSave() {
-
-       try {
-       
-               // FIXME: add parameter validation
-
-               var query = Form.serialize("edit_feed_form");
-
-               notify_progress("Saving feed...");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               feedlist_callback2(transport); 
-                       } });
-
-               closeInfoBox();
-
-               return false;
-
-       } catch (e) {
-               exception_error("feedEditSave", e);
-       } 
-}
-
 function userEditCancel() {
-
-       selectPrefRows('user', false); // cleanup feed selection
        closeInfoBox();
-
-       return false;
-}
-
-function filterEditCancel() {
-
-       try {
-               selectPrefRows('filter', false); // cleanup feed selection
-       } catch (e) { }
-
-       closeInfoBox();
-
        return false;
 }
 
@@ -804,30 +683,6 @@ function userEditSave() {
 }
 
 
-function filterEditSave() {
-
-       try {
-
-               notify_progress("Saving filter...");
-       
-               var query = "?" + Form.serialize("filter_edit_form");
-       
-               closeInfoBox();
-
-               new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               filterlist_callback2(transport);
-                       } });
-
-       } catch (e) {
-               exception_error("filterEditSave", e);
-       }
-
-       return false;
-}
-
-
 function editSelectedUser() {
        var rows = getSelectedUsers();
 
@@ -952,7 +807,7 @@ function editSelectedFeed() {
 
        notify("");
 
-       editFeed(rows[0]);
+       editFeed(rows[0], {});
 
 }
 
@@ -968,9 +823,7 @@ function editSelectedFeeds() {
        
                notify("");
        
-               disableHotkeys();
-       
-               notify_progress("Loading, please wait...");
+               notify_progress("Loading, please wait...", true);
        
                var query = "?op=pref-feeds&subop=editfeeds&ids=" +
                        param_escape(rows.toString());
@@ -988,7 +841,7 @@ function editSelectedFeeds() {
 
 function piggie(enable) {
        if (enable) {
-               debug("I LOVEDED IT!");
+               console.log("I LOVEDED IT!");
                var piggie = $("piggie");
 
                Element.show(piggie);
@@ -1006,10 +859,9 @@ function opmlImport() {
                alert(__("No OPML file to upload."));
                return false;
        } else {
+               notify_progress("Importing, please wait...", true);
                return true;
        }
-
-       notify_progress("Importing, please wait...", true);
 }
 
 function updateFilterList(sort_key) {
@@ -1071,23 +923,11 @@ function updatePrefsList() {
 }
 
 function selectTab(id, noupdate, subop) {
-
-//     alert(id);
-
-       if (!id) id = active_tab;
-
        try {
 
-               try {
-                       if (id != active_tab) {
-                               var c = $('prefContent');       
-                               c.scrollTop = 0;
-                       }
-               } catch (e) { };
-
                if (!noupdate) {
 
-                       debug("selectTab: " + id + "(NU: " + noupdate + ")");
+                       console.log("selectTab: " + id + "(NU: " + noupdate + ")");
        
                        notify_progress("Loading, please wait...");
        
@@ -1111,124 +951,51 @@ function selectTab(id, noupdate, subop) {
                        } else if (id == "userConfig") {
                                updateUsersList();
                        }
+
+                       var tab = dijit.byId(id + "Tab");
+                       dijit.byId("pref-tabs").selectChild(tab);
+
                }
 
                /* clean selection from all tabs */
        
-               var tabs_holder = $("prefTabs");
-               var tab = tabs_holder.firstChild;
-
-               while (tab) {
-                       if (tab.className && tab.className.match("prefsTabSelected")) {
-                               tab.className = "prefsTab";
-                       }
-                       tab = tab.nextSibling;
-               }
+               $$("#prefTabs div").invoke('removeClassName', 'Selected');
 
                /* mark new tab as selected */
 
-               tab = $(id + "Tab");
+               $(id + "Tab").addClassName("Selected");
        
-               if (tab) {
-                       if (!tab.className.match("Selected")) {
-                               tab.className = tab.className + "Selected";
-                       }
-               }
-       
-               active_tab = id;
-
        } catch (e) {
                exception_error("selectTab", e);
        }
 }
 
-function backend_sanity_check_callback2(transport) {
-
-       try {
-
-               if (sanity_check_done) {
-                       fatalError(11, "Sanity check request received twice. This can indicate "+
-                     "presence of Firebug or some other disrupting extension. "+
-                               "Please disable it and try again.");
-                       return;
-               }
-
-               if (!transport.responseXML) {
-                       fatalError(3, "Sanity Check: Received reply is not XML", 
-                               transport.responseText);
-                       return;
-               }
-
-               var reply = transport.responseXML.firstChild.firstChild;
-
-               if (!reply) {
-                       fatalError(3, "Sanity Check: Invalid RPC reply", transport.responseText);
-                       return;
-               }
-
-               var error_code = reply.getAttribute("error-code");
-       
-               if (error_code && error_code != 0) {
-                       return fatalError(error_code, reply.getAttribute("error-msg"));
-               }
-
-               debug("sanity check ok");
-
-               var params = reply.nextSibling;
-
-               if (params) {
-                       debug('reading init-params...');
-                       var param = params.firstChild;
-
-                       while (param) {
-                               var k = param.getAttribute("key");
-                               var v = param.getAttribute("value");
-                               debug(k + " => " + v);
-                               init_params[k] = v;                                     
-                               param = param.nextSibling;
-                       }
-               }
-
-               sanity_check_done = true;
-
-               init_second_stage();
-
-       } catch (e) {
-               exception_error("backend_sanity_check_callback", e);
-       }
-}
-
 function init_second_stage() {
 
        try {
-               active_tab = getInitParam("prefs_active_tab");
-               if (!$(active_tab+"Tab")) active_tab = "genConfig";
-               if (!active_tab || active_tab == '0') active_tab = "genConfig";
 
                document.onkeydown = pref_hotkey_handler;
-               document.onmousedown = mouse_down_handler;
-               document.onmouseup = mouse_up_handler;
 
-               var tab = getURLParam('tab');
-               
                caller_subop = getURLParam('subop');
 
                if (getURLParam("subopparam")) {
                        caller_subop = caller_subop + ":" + getURLParam("subopparam");
                }
 
-               if (tab) {
-                       active_tab = tab;
-               }
+               loading_set_progress(50);
 
-               if (navigator.userAgent.match("Opera")) {       
-                       setTimeout("selectTab()", 500);
-               } else {
-                       selectTab(active_tab);
-               }
                notify("");
 
-               loading_set_progress(60);
+               dojo.addOnLoad(function() {
+
+                       var tab = getURLParam('tab');
+
+                       if (tab) {
+                               tab = dijit.byId(tab + "Tab");
+                               if (tab) dijit.byId("pref-tabs").selectChild(tab);
+                       }
+
+                       });
 
                setTimeout("hotkey_prefix_timeout()", 5*1000);
 
@@ -1241,20 +1008,47 @@ function init() {
 
        try {
        
-               if (getURLParam('debug')) {
-                       Element.show("debug_output");
-                       debug('debug mode activated');
-               }
-
-               loading_set_progress(30);
+               dojo.require("dijit.layout.TabContainer");
+               dojo.require("dijit.layout.BorderContainer");
+               dojo.require("dijit.layout.AccordionContainer");
+               dojo.require("dijit.layout.ContentPane");
+               dojo.require("dijit.Dialog");
+               dojo.require("dijit.form.Button");
+               dojo.require("dijit.form.Select");
+               dojo.require("dijit.form.FilteringSelect");
+               dojo.require("dijit.form.TextBox");
+               dojo.require("dijit.form.CheckBox");
+               dojo.require("dijit.form.ValidationTextBox");
+               dojo.require("dijit.form.RadioButton");
+               dojo.require("dijit.form.Select");
+               dojo.require("dijit.Toolbar");
+               dojo.require("dojo.data.ItemFileWriteStore");
+               dojo.require("dijit.Tree");
+               dojo.require("dijit.form.DropDownButton");
+               dojo.require("dijit.form.Form");
+               dojo.require("dijit.Menu");
+               dojo.require("dijit.tree.dndSource");
+               dojo.require("dijit.InlineEditBox");
+               dojo.require("dijit.ColorPalette");
+               dojo.require("dijit.ProgressBar"); 
+
+               dojo.registerModulePath("lib", "..");
+               dojo.registerModulePath("fox", "../..");
+
+               dojo.require("lib.CheckBoxTree");
+               dojo.require("fox.PrefFeedTree");
+               dojo.require("fox.PrefFilterTree");
+               dojo.require("fox.PrefLabelTree");
+
+               dojo.addOnLoad(function() {
+                       loading_set_progress(50);
 
-               var query = "?op=rpc&subop=sanityCheck";
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               backend_sanity_check_callback2(transport);
-                       } });
+                       new Ajax.Request("backend.php", {
+                               parameters: {op: "rpc", subop: "sanityCheck"},
+                                       onComplete: function(transport) { 
+                                       backend_sanity_check_callback(transport);
+                               } });
+               });
 
        } catch (e) {
                exception_error("init", e);
@@ -1269,7 +1063,7 @@ function validatePrefsReset() {
 
                        var query = Form.serialize("pref_prefs_form");
                        query = query + "&subop=reset-config";
-                       debug(query);
+                       console.log(query);
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -1293,128 +1087,6 @@ function validatePrefsReset() {
 
 }
 
-/*function feedBrowserSubscribe() {
-       try {
-
-               var selected = getSelectedFeedsFromBrowser();
-
-               var mode = document.forms['feed_browser'].mode;
-
-               mode = mode[mode.selectedIndex].value;
-
-               if (selected.length > 0) {
-                       closeInfoBox();
-
-                       var query = "?op=pref-feeds&subop=massSubscribe&ids="+
-                               param_escape(selected.toString()) + "&mode=" + param_escape(mode);
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       feedlist_callback2(transport); 
-                               } });
-
-               } else {
-                       alert(__("No feeds are selected."));
-               }
-
-       } catch (e) {
-               exception_error("feedBrowserSubscribe", e);
-       }
-} */
-
-function updateBigFeedBrowserBtn() {
-       notify_progress("Loading, please wait...");
-       return updateBigFeedBrowser();
-}
-
-function selectPrefRows(kind, select) {
-
-       if (kind) {
-               var opbarid = false;    
-               var nchk = false;
-               var nrow = false;
-               var lname = false;
-
-               if (kind == "feed") {
-                       opbarid = "feedOpToolbar";
-                       nrow = "FEEDR-";
-                       nchk = "FRCHK-";                        
-                       lname = "prefFeedList";
-               } else if (kind == "fcat") {
-                       opbarid = "catOpToolbar";
-                       nrow = "FCATR-";
-                       nchk = "FCCHK-";
-                       lname = "prefFeedCatList";
-               } else if (kind == "filter") {
-                       opbarid = "filterOpToolbar";
-                       nrow = "FILRR-";
-                       nchk = "FICHK-";
-                       lname = "prefFilterList";
-               } else if (kind == "label") {
-                       opbarid = "labelOpToolbar";
-                       nrow = "LILRR-";
-                       nchk = "LICHK-";
-                       lname = "prefLabelList";
-               } else if (kind == "user") {
-                       opbarid = "userOpToolbar";
-                       nrow = "UMRR-";
-                       nchk = "UMCHK-";
-                       lname = "prefUserList";
-               } else if (kind == "fbrowse") {
-                       opbarid = "browseOpToolbar";
-                       nrow = "FBROW-";
-                       nchk = "FBCHK-";
-                       lname = "browseFeedList";
-               }
-
-               if (opbarid) {
-                       selectTableRowsByIdPrefix(lname, nrow, nchk, select);
-                       disableContainerChildren(opbarid, !select);
-               }
-
-       } 
-}
-
-
-function toggleSelectPrefRow(sender, kind) {
-
-       toggleSelectRow(sender);
-
-       if (kind) {
-               var opbarid = false;    
-               var nsel = -1;
-               
-               if (kind == "feed") {
-                       opbarid = "feedOpToolbar";
-                       nsel = getSelectedFeeds();
-               } else if (kind == "fcat") {
-                       opbarid = "catOpToolbar";
-                       nsel = getSelectedFeedCats();
-               } else if (kind == "filter") {
-                       opbarid = "filterOpToolbar";
-                       nsel = getSelectedFilters();
-               } else if (kind == "label") {
-                       opbarid = "labelOpToolbar";
-                       nsel = getSelectedLabels();
-               } else if (kind == "user") {
-                       opbarid = "userOpToolbar";
-                       nsel = getSelectedUsers();
-               }
-
-               if (opbarid && nsel != -1) {
-                       disableContainerChildren(opbarid, nsel == false);
-               }
-
-       } 
-}
-
-function toggleSelectFBListRow(sender) {
-       toggleSelectListRow(sender);
-       disableContainerChildren("fbrOpToolbar", getSelectedFeedsFromBrowser() == 0);
-}
-
-var seq = "";
 
 function pref_hotkey_handler(e) {
        try {
@@ -1442,17 +1114,23 @@ function pref_hotkey_handler(e) {
                        if (Element.visible("hotkey_help_overlay")) {
                                Element.hide("hotkey_help_overlay");
                        }
-                       colorPickerHideAll();
                        hotkey_prefix = false;
                        closeInfoBox();
                } 
 
-               if (!hotkeys_enabled) {
-                       debug("hotkeys disabled");
+               var dialog = dijit.byId("infoBox");
+               var dialog_visible = false;
+
+               if (dialog)
+                       dialog_visible = Element.visible(dialog.domNode);
+
+               if (dialog_visible || !hotkeys_enabled) {
+                       console.log("hotkeys disabled");
                        return;
                }
 
                if (keycode == 16) return; // ignore lone shift
+               if (keycode == 17) return; // ignore lone ctrl
 
                if ((keycode == 67 || keycode == 71) && !hotkey_prefix) {
                        hotkey_prefix = keycode;
@@ -1465,7 +1143,7 @@ function pref_hotkey_handler(e) {
                        cmdline.innerHTML = keychar;
                        Element.show(cmdline);
 
-                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
+                       console.log("KP: PREFIX=" + keycode + " CHAR=" + keychar);
                        return;
                }
 
@@ -1485,16 +1163,6 @@ function pref_hotkey_handler(e) {
 
                if (!hotkey_prefix) {
 
-                       if (keycode == 68 && shift_key) { // d
-                               if (!Element.visible("debug_output")) {
-                                       Element.show("debug_output");
-                                       debug('debug mode activated');
-                               } else {
-                                       Element.hide("debug_output");
-                               }
-                               return;
-                       }
-       
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
                                        //Element.show("hotkey_help_overlay");
@@ -1512,7 +1180,7 @@ function pref_hotkey_handler(e) {
                                for (var i = 0; i < search_boxes.length; i++) {
                                        var elem = $(search_boxes[i]);
                                        if (elem) {
-                                               focus_element(search_boxes[i]);
+                                               $(search_boxes[i]).focus();
                                                return false;
                                        }
                                }
@@ -1525,20 +1193,15 @@ function pref_hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 70) { // f
-                               displayDlg("quickAddFilter");
+                               quickAddFilter();
                                return false;
                        }
 
                        if (keycode == 83) { // s
-                               displayDlg("quickAddFeed");
+                               quickAddFeed();
                                return false;
                        }
 
-/*                     if (keycode == 76) { // l
-                               displayDlg("quickAddLabel");
-                               return false;
-                       } */
-
                        if (keycode == 85) { // u
                                // no-op
                        }
@@ -1549,7 +1212,7 @@ function pref_hotkey_handler(e) {
                        }
 
                        if (keycode == 84 && shift_key) { // T
-                               browseFeeds();
+                               displayDlg('feedBrowser');
                                return false;
                        }
 
@@ -1593,8 +1256,7 @@ function pref_hotkey_handler(e) {
                }
 
                if ($("piggie")) {
-       
-                       if (seq.match("807371717369")) {
+                       if (seq.match("8073717369")) {
                                seq = "";
                                piggie(true);
                        } else {
@@ -1603,9 +1265,9 @@ function pref_hotkey_handler(e) {
                }
 
                if (hotkey_prefix) {
-                       debug("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode + " CHAR=" + keychar);
+                       console.log("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode + " CHAR=" + keychar);
                } else {
-                       debug("KP: CODE=" + keycode + " CHAR=" + keychar);
+                       console.log("KP: CODE=" + keycode + " CHAR=" + keychar);
                }
 
        } catch (e) {
@@ -1617,10 +1279,12 @@ function editFeedCats() {
        try {
                var query = "?op=pref-feeds&subop=editCats";
 
+               notify_progress("Loading, please wait...");
+
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) {
-                               infobox_feed_cat_callback2(transport);
+                               infobox_callback2(transport);
                        } });
        } catch (e) {
                exception_error("editFeedCats", e);
@@ -1697,7 +1361,7 @@ function changeUserEmail() {
 
                var query = Form.serialize("change_email_form");
        
-               notify_progress("Trying to change e-mail...");
+               notify_progress("Saving...");
        
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -1713,28 +1377,23 @@ function changeUserEmail() {
 
 }
 
-function feedlistToggleSLAT() {
-       notify_progress("Loading, please wait...");
-       updateFeedList()
-}
-
-function pubRegenKey() {
+function opmlRegenKey() {
 
        try {
-               var ok = confirm(__("Replace current publishing address with a new one?"));
+               var ok = confirm(__("Replace current OPML publishing address with a new one?"));
        
                if (ok) {
        
                        notify_progress("Trying to change address...", true);
        
-                       var query = "?op=rpc&subop=regenPubKey";
+                       var query = "?op=rpc&subop=regenOPMLKey";
        
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
                                                var new_link = transport.responseXML.getElementsByTagName("link")[0];
        
-                                               var e = $('pub_feed_url');
+                                               var e = $('pub_opml_url');
        
                                                if (new_link) {
                                                        e.href = new_link.firstChild.nodeValue;
@@ -1750,11 +1409,10 @@ function pubRegenKey() {
                                } });
                }
        } catch (e) {
-               exception_error("pubRegenKey", e);
+               exception_error("opmlRegenKey", e);
        }
        return false;
 }
-
 function validatePrefsSave() {
        try {
 
@@ -1764,7 +1422,7 @@ function validatePrefsSave() {
 
                        var query = Form.serialize("pref_prefs_form");
                        query = query + "&subop=save-config";
-                       debug(query);
+                       console.log(query);
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -1906,8 +1564,8 @@ function removeFilter(id, title) {
                var ok = confirm(msg);
        
                if (ok) {
-                       closeInfoBox();
-       
+                       dijit.byId("filterEditDlg").hide();
+
                        notify_progress("Removing filter...");
                
                        var query = "?op=pref-filters&subop=remove&ids="+
@@ -1928,37 +1586,6 @@ function removeFilter(id, title) {
        return false;
 }
 
-function unsubscribeFeed(id, title) {
-
-       try {
-
-               var msg = __("Unsubscribe from %s?").replace("%s", title);
-       
-               var ok = confirm(msg);
-       
-               if (ok) {
-                       closeInfoBox();
-       
-                       notify_progress("Removing feed...");
-               
-                       var query = "?op=pref-feeds&subop=remove&ids="+
-                               param_escape(id);
-       
-                       new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) {
-                                                       feedlist_callback2(transport);
-                               } });
-               }
-       
-       } catch (e) {
-               exception_error("unsubscribeFeed", e);
-       }
-
-       return false;
-
-}
-
 function feedsEditSave() {
        try {
 
@@ -2061,127 +1688,41 @@ function labelColorReset() {
        }
 }
 
-function labelColorAsk(id, kind) {
-       try {
-
-               var p = null
-
-               if (kind == "fg") {
-                       p = prompt(__("Please enter new label foreground color:"));
-               } else {
-                       p = prompt(__("Please enter new label background color:"));
-               }
-
-               if (p != null) {
-
-                       var query = "?op=pref-labels&subop=color-set&kind=" + kind +
-                               "&ids="+        param_escape(id) + "&color=" + param_escape(p);
-
-                       selectPrefRows('label', false);
-
-                       var e = $("LICID-" + id);
-
-                       if (e) {                
-                               if (kind == "fg") {
-                                       e.style.color = p
-                               } else {
-                                       e.style.backgroundColor = p;
-                               }
-                       }
-
-                       new Ajax.Request("backend.php", { parameters: query });
-               }
-
-       } catch (e) {
-               exception_error("labelColorReset", e);
-       }
-}
-
-
-function colorPicker(id, fg, bg) {
-       try {
-               var picker = $("colorPicker-" + id);
-
-               if (picker) Element.show(picker);
-
-       } catch (e) {
-               exception_error("colorPicker", e);
-       }
-}
-
-function colorPickerHideAll() {
+function setLabelColor(id, fg, bg) {
        try {
-               if ($("prefLabelList")) {
 
-                       var elems = $("prefLabelList").getElementsByTagName("DIV");
+               var kind = '';
+               var color = '';
 
-                       for (var i = 0; i < elems.length; i++) {
-                               if (elems[i].id && elems[i].id.match("colorPicker-")) {
-                                       Element.hide(elems[i]);
-                               }
-                       }
+               if (fg && bg) {
+                       kind = 'both';
+               } else if (fg) {
+                       kind = 'fg';
+                       color = fg;
+               } else if (bg) {
+                       kind = 'bg';
+                       color = bg;
                }
 
-       } catch (e) {
-               exception_error("colorPickerHideAll", e);
-       }
-}
-
-function colorPickerDo(id, fg, bg) {
-       try {
-
-               var query = "?op=pref-labels&subop=color-set&kind=both"+
+               var query = "?op=pref-labels&subop=color-set&kind="+kind+
                        "&ids=" + param_escape(id) + "&fg=" + param_escape(fg) + 
-                       "&bg=" + param_escape(bg);
+                       "&bg=" + param_escape(bg) + "&color=" + param_escape(color);
+
+//             console.log(query);
 
                var e = $("LICID-" + id);
 
                if (e) {                
-                       e.style.color = fg;
-                       e.style.backgroundColor = bg;
+                       if (fg) e.style.color = fg;
+                       if (bg) e.style.backgroundColor = bg;
                }
 
                new Ajax.Request("backend.php", { parameters: query });
 
-       } catch (e) {
-               exception_error("colorPickerDo", e);
-       }
-}
-
-function colorPickerActive(b) {
-       color_picker_active = b;
-}
-
-function mouse_down_handler(e) {
-       try {
-
-               /* do not prevent right click */
-               if (e && e.button && e.button == 2) return;
-
-               if (selection_disabled) {
-                       document.onselectstart = function() { return false; };
-                       return false;
-               }
+               updateFilterList();
 
        } catch (e) {
-               exception_error("mouse_down_handler", e);
-       }
-}
-
-function mouse_up_handler(e) {
-       try {
-               mouse_is_down = false;
-
-               if (!selection_disabled) {
-                       document.onselectstart = null;
-               }
-
-               if (!color_picker_active) {
-                       colorPickerHideAll();
-               }
-
-       } catch (e) {
-               exception_error("mouse_up_handler", e);
+               exception_error("colorPickerDo", e);
        }
 }
 
@@ -2238,3 +1779,138 @@ function opmlImportHandler(iframe) {
                exception_error("opml_import_handler", e);
        }
 }
+
+function clearFeedAccessKeys() {
+
+       var ok = confirm(__("This will invalidate all previously generated feed URLs. Continue?"));
+
+       if (ok) {
+               notify_progress("Clearing URLs...");
+
+               var query = "?op=rpc&subop=clearKeys";
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               notify_info("Generated URLs cleared.");
+                       } });
+       }
+       
+       return false;
+}
+
+function handle_rpc_reply(transport, scheduled_call) {
+       try {
+               if (transport.responseXML) {
+
+                       if (!transport_error_check(transport)) return false;
+
+               } else {
+                       notify_error("Error communicating with server.");
+               }
+
+       } catch (e) {
+               exception_error("handle_rpc_reply", e, transport);
+       }
+
+       return true;
+}
+
+function resetFeedOrder() {
+       try {
+               notify_progress("Loading, please wait...");
+
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&subop=feedsortreset",
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
+
+
+       } catch (e) {
+               exception_error("resetFeedOrder");
+       }
+}
+
+function resetCatOrder() {
+       try {
+               notify_progress("Loading, please wait...");
+
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&subop=catsortreset",
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
+
+
+       } catch (e) {
+               exception_error("resetCatOrder");
+       }
+}
+
+function editCat(id, item, event) {
+       try {
+               var new_name = prompt(__('Rename category to:'), item.name);
+
+               if (new_name && new_name != item.name) {
+
+                       notify_progress("Loading, please wait...");
+
+                       new Ajax.Request("backend.php", {
+                       parameters: {
+                               op: 'pref-feeds', 
+                               subop: 'renamecat',
+                               id: id,
+                               title: new_name,
+                       },
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
+               }
+
+       } catch (e) {
+               exception_error("editCat", e);
+       }
+}
+
+function editLabel(id, event) {
+       try {
+               var query = "backend.php?op=pref-labels&subop=edit&id=" +
+                       param_escape(id);
+
+               if (dijit.byId("labelEditDlg"))
+                       dijit.byId("labelEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "labelEditDlg",
+                       title: __("Label Editor"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       var caption = this.attr('value').id;
+                                       var caption = this.attr('value').caption;
+                                       var fg_color = this.attr('value').fg_color;
+                                       var bg_color = this.attr('value').bg_color;
+                                       var query = dojo.objectToQuery(this.attr('value'));
+
+                                       dijit.byId('labelTree').setNameById(id, caption);
+                                       setLabelColor(id, fg_color, bg_color);
+                                       this.hide();
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       updateFilterList();     
+                                       } });
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("editLabel", e);
+       }
+}
+
+