]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
rework initial sanitycheck to use JSON
[tt-rss.git] / prefs.js
index 334bed379e3632870943a137c4ec8f371ec3e4be..2d7f9dff1697d2429e380ee69757bf59815b8d86 100644 (file)
--- a/prefs.js
+++ b/prefs.js
-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;
 
-function replace_pubkey_callback(transport) {
-       try {   
-               var link = document.getElementById("pubGenAddress");
-
-               if (transport.responseXML) {
-
-                       var new_link = transport.responseXML.getElementsByTagName("link")[0];
-
-                       if (new_link) {
-                               link.href = new_link.firstChild.nodeValue;
-                               //link.innerHTML = new_link.firstChild.nodeValue;
-
-                               new Effect.Highlight(link);
-
-                               notify_info("Published feed URL changed.");
-                       } else {
-                               notify_error("Could not change feed URL.");
-                       }
-
-               } else {
-                       notify_error("Could not change feed URL.");
-               }
-       } catch (e) {
-               exception_error("replace_pubkey_callback", e);
-       }
-}
+var seq = "";
 
 function feedlist_callback2(transport) {
-
-       try {   
-
-               var container = document.getElementById('prefContent'); 
-               container.innerHTML=transport.responseText;
+       try {
+               dijit.byId('feedConfigTab').attr('content', transport.responseText);
                selectTab("feedConfig", true);
-
-               if (caller_subop) {
-                       var tuple = caller_subop.split(":");
-                       if (tuple[0] == 'editFeed') {
-                               window.setTimeout('editFeed('+tuple[1]+')', 100);
-                       }                               
-
-                       caller_subop = false;
-               }
-               if (typeof correctPNG != 'undefined') {
-                       correctPNG();
-               }
                notify("");
-               remove_splash();
-
        } catch (e) {
                exception_error("feedlist_callback2", e);
        }
 }
 
-/* stub for subscription dialog */
-
-function dlg_frefresh_callback(transport) {
-       return feedlist_callback2(transport);
-}
-
 function filterlist_callback2(transport) {
-       var container = document.getElementById('prefContent');
-       container.innerHTML=transport.responseText;
-       if (typeof correctPNG != 'undefined') {
-               correctPNG();
-       }
+       dijit.byId('filterConfigTab').attr('content', transport.responseText);
        notify("");
-       remove_splash();
 }
 
 function labellist_callback2(transport) {
-
        try {
-
-               var container = document.getElementById('prefContent');
-                       closeInfoBox();
-                       container.innerHTML=transport.responseText;
-       
-                       if (document.getElementById("prefLabelList")) {
-                               var elems = document.getElementById("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});
-                                       }
-                               }
-                       }
-       
-                       if (typeof correctPNG != 'undefined') {
-                               correctPNG();
-                       }
-                       notify("");
-                       remove_splash();
-
+               dijit.byId('labelConfigTab').attr('content', transport.responseText);
+               notify("");
        } catch (e) {
                exception_error("labellist_callback2", e);
        }
@@ -112,12 +31,9 @@ function labellist_callback2(transport) {
 
 function userlist_callback2(transport) {
        try {
-               var container = document.getElementById('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);
        }
@@ -125,208 +41,46 @@ function userlist_callback2(transport) {
 
 function prefslist_callback2(transport) {
        try {
-               var container = document.getElementById('prefContent');
-               container.innerHTML=transport.responseText;
+               dijit.byId('genConfigTab').attr('content', transport.responseText);
+
                notify("");
-               remove_splash();
        } catch (e) {
                exception_error("prefslist_callback2", e);
        }
 }
 
 function notify_callback2(transport) {
-       notify_info(transport.responseText);     
-}
-
-function prefs_reset_callback2(transport) {
-       try {
-               notify_info(transport.responseText);
-               selectTab();
-       } catch (e) {
-               exception_error("prefs_reset_callback2", e);
-       }
-}
-
-
-function changepass_callback2(transport) {
-       try {
-       
-                       if (transport.responseText.indexOf("ERROR: ") == 0) {
-                               notify_error(transport.responseText.replace("ERROR: ", ""));
-                       } else {
-                               notify_info(transport.responseText);
-                               var warn = document.getElementById("default_pass_warning");
-                               if (warn) warn.style.display = "none";
-                       }
-       
-                       document.forms['change_pass_form'].reset();
-
-       } catch (e) {
-               exception_error("changepass_callback2", e);
-       }
-}
-
-function init_cat_inline_editor() {
-       try {
-
-               if (document.getElementById("prefFeedCatList")) {
-                       var elems = document.getElementById("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);
-       }
+       notify_info(transport.responseText);
 }
 
 function updateFeedList(sort_key) {
-
-       try {
-
-       var feed_search = document.getElementById("feed_search");
-       var search = "";
-       if (feed_search) { search = feed_search.value; }
-
-       var slat = document.getElementById("show_last_article_times");
-
-       var slat_checked = false;
-       if (slat) {
-               slat_checked = slat.checked;
-       }
-
-       var query = "backend.php?op=pref-feeds" +
-               "&sort=" + param_escape(sort_key) + 
-               "&slat=" + param_escape(slat_checked) +
-               "&search=" + param_escape(search);
-
-       new Ajax.Request(query, {
-               onComplete: function(transport) { 
-                       feedlist_callback2(transport); 
+       new Ajax.Request("backend.php", {
+               parameters: "?op=pref-feeds",
+               onComplete: function(transport) {
+                       feedlist_callback2(transport);
                } });
-       } catch (e) {
-               exception_error("updateFeedList", e);
-       }
 }
 
 function updateUsersList(sort_key) {
 
        try {
 
-               var user_search = document.getElementById("user_search");
+               var user_search = $("user_search");
                var search = "";
                if (user_search) { search = user_search.value; }
-       
-               var query = "backend.php?op=pref-users&sort="
+
+               var query = "?op=pref-users&sort="
                        + param_escape(sort_key) +
                        "&search=" + param_escape(search);
-       
-               new Ajax.Request(query, {
-                       onComplete: function(transport) { 
-                               userlist_callback2(transport); 
-                       } });
 
-       } catch (e) {
-               exception_error("updateUsersList", e);
-       }
-}
-
-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 = "backend.php?op=pref-labels&subop=add&caption=" + 
-                       param_escape(caption);
-       
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
-                                       infobox_submit_callback2(transport);
-                               } });
-
-       } catch (e) {
-               exception_error("addLabel", e);
-       }
-}
-
-function addFeed() {
-
-       try {
-
-               var link = document.getElementById("fadd_link");
-       
-               if (link.value.length == 0) {
-                       alert(__("Error: No feed URL given."));
-               } else if (!isValidURL(link.value)) {
-                       alert(__("Error: Invalid feed URL."));
-               } else {
-                       notify_progress("Adding feed...");
-       
-                       var query = "backend.php?op=pref-feeds&subop=add&from=tt-rss&feed_url=" +
-                               param_escape(link.value);
-       
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) {
-                                               feedlist_callback2(transport);
-                                       } });
-       
-                       link.value = "";
-       
-               }
+                               userlist_callback2(transport);
+                       } });
 
        } catch (e) {
-               exception_error("addFeed", e);
-       }
-
-}
-
-function addFeedCat() {
-
-       var cat = document.getElementById("fadd_cat");
-
-       if (cat.value.length == 0) {
-               alert(__("Can't add category: no name specified."));
-       } else {
-               notify_progress("Adding feed category...");
-
-               var query = "backend.php?op=pref-feeds&subop=editCats&action=add&cat=" +
-                       param_escape(cat.value);
-
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       infobox_feed_cat_callback2(transport);
-                               } });
-
-               link.value = "";
-
+               exception_error("updateUsersList", e);
        }
 }
 
@@ -335,24 +89,25 @@ function addUser() {
        try {
 
                var login = prompt(__("Please enter login:"), "");
-       
-               if (login == null) { 
+
+               if (login == null) {
                        return false;
                }
-       
+
                if (login == "") {
                        alert(__("Can't create user: no login specified."));
                        return false;
                }
-       
+
                notify_progress("Adding user...");
-       
-               var query = "backend.php?op=pref-users&subop=add&login=" +
+
+               var query = "?op=pref-users&subop=add&login=" +
                        param_escape(login);
-                               
-               new Ajax.Request(query, {
-                       onComplete: function(transport) { 
-                               userlist_callback2(transport); 
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               userlist_callback2(transport);
                        } });
 
        } catch (e) {
@@ -360,105 +115,161 @@ 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 = "backend.php?op=pref-users&subop=edit&id=" +
+               var query = "?op=pref-users&subop=edit&id=" +
                        param_escape(id);
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       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) {
-
        try {
 
-               disableHotkeys();
+               var query = "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id);
 
-               notify_progress("Loading, please wait...");
+               if (dijit.byId("filterEditDlg"))
+                       dijit.byId("filterEditDlg").destroyRecursive();
 
-               disableContainerChildren("filterOpToolbar", false);
+               dialog = new dijit.Dialog({
+                       id: "filterEditDlg",
+                       title: __("Edit Filter"),
+                       style: "width: 600px",
+                       removeFilter: function() {
+                               var title = this.attr('value').reg_exp;
+                               var msg = __("Remove filter %s?").replace("%s", title);
 
-               selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
-               selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
+                               if (confirm(msg)) {
+                                       this.hide();
 
-               var query = "backend.php?op=pref-filters&subop=edit&id=" + 
-                       param_escape(id);
+                                       notify_progress("Removing filter...");
 
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                               } });
-       } catch (e) {
-               exception_error("editFilter", e);
-       }
-}
+                                       var id = this.attr('value').id;
 
-function editFeed(feed) {
+                                       var query = "?op=pref-filters&subop=remove&ids="+
+                                               param_escape(id);
 
-       try {
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       updateFilterList();
+                                               } });
+                               }
+                       },
+
+                       execute: function() {
+                               if (this.validate()) {
+
+                                       var query = "?op=rpc&subop=verifyRegexp&reg_exp=" +
+                                               param_escape(dialog.attr('value').reg_exp);
+
+                                       notify_progress("Verifying regular expression...");
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       var reply = JSON.parse(transport.responseText);
+
+                                                       if (reply) {
+                                                               notify('');
+
+                                                               if (!reply['status']) {
+                                                                       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});
+
+               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 = "backend.php?op=pref-feeds&subop=editfeed&id=" +
-                       param_escape(feed);
-       
-               new Ajax.Request(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");
 }
 
+/* function getSelectedFeedCats() {
+       return getSelectedTableRowIds("prefFeedCatList");
+} */
 
 function removeSelectedLabels() {
 
@@ -470,11 +281,12 @@ function removeSelectedLabels() {
 
                if (ok) {
                        notify_progress("Removing selected labels...");
-       
-                       var query = "backend.php?op=pref-labels&subop=remove&ids="+
+
+                       var query = "?op=pref-labels&subop=remove&ids="+
                                param_escape(sel_rows.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                labellist_callback2(transport);
                                        } });
@@ -492,24 +304,25 @@ function removeSelectedUsers() {
        try {
 
                var sel_rows = getSelectedUsers();
-       
+
                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...");
-               
-                               var query = "backend.php?op=pref-users&subop=remove&ids="+
+
+                               var query = "?op=pref-users&subop=remove&ids="+
                                        param_escape(sel_rows.toString());
-       
-                               new Ajax.Request(query, {
-                                       onComplete: function(transport) { 
-                                               userlist_callback2(transport); 
+
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) {
+                                               userlist_callback2(transport);
                                        } });
-       
+
                        }
-       
+
                } else {
                        alert(__("No users are selected."));
                }
@@ -526,22 +339,23 @@ function removeSelectedFilters() {
        try {
 
                var sel_rows = getSelectedFilters();
-       
+
                if (sel_rows.length > 0) {
-       
+
                        var ok = confirm(__("Remove selected filters?"));
-       
+
                        if (ok) {
                                notify_progress("Removing selected filters...");
-               
-                               var query = "backend.php?op=pref-filters&subop=remove&ids="+
+
+                               var query = "?op=pref-filters&subop=remove&ids="+
                                        param_escape(sel_rows.toString());
-       
-                               new Ajax.Request(query, {
+
+                               new Ajax.Request("backend.php", {
+                                               parameters: query,
                                                onComplete: function(transport) {
                                                                filterlist_callback2(transport);
                                        } });
-       
+
                        }
                } else {
                        alert(__("No filters are selected."));
@@ -560,24 +374,27 @@ function removeSelectedFeeds() {
        try {
 
                var sel_rows = getSelectedFeeds();
-       
+
                if (sel_rows.length > 0) {
-       
+
                        var ok = confirm(__("Unsubscribe from selected feeds?"));
-       
+
                        if (ok) {
-       
-                               notify_progress("Unsubscribing from selected feeds...");
-               
-                               var query = "backend.php?op=pref-feeds&subop=remove&ids="+
+
+                               notify_progress("Unsubscribing from selected feeds...", true);
+
+                               var query = "?op=pref-feeds&subop=remove&ids="+
                                        param_escape(sel_rows.toString());
-       
-                               new Ajax.Request(query, {
+
+                               console.log(query);
+
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) {
-                                                       feedlist_callback2(transport);
+                                               updateFeedList();
                                                } });
                        }
-       
+
                } else {
                        alert(__("No feeds are selected."));
                }
@@ -585,7 +402,7 @@ function removeSelectedFeeds() {
        } catch (e) {
                exception_error("removeSelectedFeeds", e);
        }
-       
+
        return false;
 }
 
@@ -612,7 +429,7 @@ function clearSelectedFeeds() {
                alert(__("No feeds are selected."));
 
        }
-       
+
        return false;
 }
 
@@ -627,12 +444,13 @@ function purgeSelectedFeeds() {
                if (pr != undefined) {
                        notify_progress("Purging selected feed...");
 
-                       var query = "backend.php?op=rpc&subop=purge&ids="+
+                       var query = "?op=rpc&subop=purge&ids="+
                                param_escape(sel_rows.toString()) + "&days=" + pr;
 
-                       debug(query);
+                       console.log(query);
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("prefs.php",   {
+                               parameters: query,
                                onComplete: function(transport) {
                                        notify('');
                                } });
@@ -643,98 +461,40 @@ function purgeSelectedFeeds() {
                alert(__("No feeds are selected."));
 
        }
-       
+
        return false;
 }
 
-function removeSelectedFeedCats() {
+function removeSelectedPrefProfiles() {
 
        var sel_rows = getSelectedFeedCats();
 
        if (sel_rows.length > 0) {
 
-               var ok = confirm(__("Remove selected categories?"));
+               var ok = confirm(__("Remove selected profiles? Active and default profiles will not be removed."));
 
                if (ok) {
-                       notify_progress("Removing selected categories...");
-       
-                       var query = "backend.php?op=pref-feeds&subop=editCats&action=remove&ids="+
+                       notify_progress("Removing selected profiles...");
+
+                       var query = "?op=rpc&subop=remprofiles&ids="+
                                param_escape(sel_rows.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
-                                       infobox_feed_cat_callback2(transport);
+                                       editProfiles();
                                } });
-
                }
 
        } else {
-
-               alert(__("No categories are selected."));
-
+               alert(__("No profiles selected."));
        }
 
        return false;
 }
 
-function feedEditCancel() {
-
-       try {
-               document.getElementById("subscribe_to_feed_btn").disabled = false;
-               document.getElementById("top25_feeds_btn").disabled = false;
-       } catch (e) {
-               // this button is not always available, no-op if not found
-       }
-
-       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 {
-               document.getElementById("create_filter_btn").disabled = false;
-               selectPrefRows('filter', false); // cleanup feed selection
-       } catch (e) { }
-
        closeInfoBox();
-
        return false;
 }
 
@@ -743,24 +503,24 @@ function userEditSave() {
        try {
 
                var login = document.forms["user_edit_form"].login.value;
-       
+
                if (login.length == 0) {
                        alert(__("Login field cannot be blank."));
                        return;
                }
-               
+
                notify_progress("Saving user...");
-       
+
                closeInfoBox();
-       
+
                var query = Form.serialize("user_edit_form");
-               
+
                new Ajax.Request("backend.php", {
                        parameters: query,
-                       onComplete: function(transport) { 
-                               userlist_callback2(transport); 
+                       onComplete: function(transport) {
+                               userlist_callback2(transport);
                        } });
-       
+
        } catch (e) {
                exception_error("userEditSave", e);
        }
@@ -770,31 +530,6 @@ function userEditSave() {
 }
 
 
-function filterEditSave() {
-
-       try {
-
-               notify_progress("Saving filter...");
-       
-               var query = "backend.php?" + Form.serialize("filter_edit_form");
-       
-               closeInfoBox();
-       
-               document.getElementById("create_filter_btn").disabled = false;
-
-               new Ajax.Request(query, {
-                               onComplete: function(transport) {
-                                               filterlist_callback2(transport);
-                       } });
-
-       } catch (e) {
-               exception_error("filterEditSave", e);
-       }
-
-       return false;
-}
-
-
 function editSelectedUser() {
        var rows = getSelectedUsers();
 
@@ -818,32 +553,33 @@ function resetSelectedUserPass() {
        try {
 
                var rows = getSelectedUsers();
-       
+
                if (rows.length == 0) {
                        alert(__("No users are selected."));
                        return;
                }
-       
+
                if (rows.length > 1) {
                        alert(__("Please select only one user."));
                        return;
                }
-       
+
                var ok = confirm(__("Reset password of selected user?"));
-       
+
                if (ok) {
                        notify_progress("Resetting password for selected user...");
-               
+
                        var id = rows[0];
-               
-                       var query = "backend.php?op=pref-users&subop=resetPass&id=" +
+
+                       var query = "?op=pref-users&subop=resetPass&id=" +
                                param_escape(id);
-       
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) { 
-                                       userlist_callback2(transport); 
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       userlist_callback2(transport);
                                } });
-       
+
                }
 
        } catch (e) {
@@ -856,24 +592,25 @@ function selectedUserDetails() {
        try {
 
                var rows = getSelectedUsers();
-       
+
                if (rows.length == 0) {
                        alert(__("No users are selected."));
                        return;
                }
-       
+
                if (rows.length > 1) {
                        alert(__("Please select only one user."));
                        return;
                }
-       
+
                notify_progress("Loading, please wait...");
-       
+
                var id = rows[0];
-       
-               var query = "backend.php?op=pref-users&subop=user-details&id=" + id;
 
-               new Ajax.Request(query, {
+               var query = "?op=pref-users&subop=user-details&id=" + id;
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
                                } });
@@ -912,13 +649,12 @@ function editSelectedFeed() {
        }
 
        if (rows.length > 1) {
-               alert(__("Please select one feed."));
-               return;
+               return editSelectedFeeds();
        }
 
        notify("");
 
-       editFeed(rows[0]);
+       editFeed(rows[0], {});
 
 }
 
@@ -926,25 +662,86 @@ function editSelectedFeeds() {
 
        try {
                var rows = getSelectedFeeds();
-       
+
                if (rows.length == 0) {
                        alert(__("No feeds are selected."));
                        return;
                }
-       
+
                notify("");
-       
-               disableHotkeys();
-       
-               notify_progress("Loading, please wait...");
-       
+
                var query = "backend.php?op=pref-feeds&subop=editfeeds&ids=" +
                        param_escape(rows.toString());
 
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                               } });
+               if (dijit.byId("feedEditDlg"))
+                       dijit.byId("feedEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "feedEditDlg",
+                       title: __("Edit Multiple Feeds"),
+                       style: "width: 600px",
+                       getChildByName: function (name) {
+                               var rv = null
+                               this.getChildren().each(
+                                       function(child) {
+                                               if (child.name == name) {
+                                                       rv = child;
+                                                       return;
+                                               }
+                                       });
+                               return rv;
+                       },
+                       toggleField: function (checkbox, elem, label) {
+                               this.getChildByName(elem).attr('disabled', !checkbox.checked);
+
+                               if ($(label))
+                                       if (checkbox.checked)
+                                               $(label).removeClassName('insensitive');
+                                       else
+                                               $(label).addClassName('insensitive');
+
+                       },
+                       execute: function() {
+                               if (this.validate() && confirm(__("Save changes to selected feeds?"))) {
+                                       var query = dojo.objectToQuery(this.attr('value'));
+
+                                       /* Form.serialize ignores unchecked checkboxes */
+
+                                       if (!query.match("&rtl_content=") &&
+                                                       this.getChildByName('rtl_content').attr('disabled') == false) {
+                                               query = query + "&rtl_content=false";
+                                       }
+
+                                       if (!query.match("&private=") &&
+                                                       this.getChildByName('private').attr('disabled') == false) {
+                                               query = query + "&private=false";
+                                       }
+
+                                       if (!query.match("&cache_images=") &&
+                                                       this.getChildByName('cache_images').attr('disabled') == false) {
+                                               query = query + "&cache_images=false";
+                                       }
+
+                                       if (!query.match("&include_in_digest=") &&
+                                                       this.getChildByName('include_in_digest').attr('disabled') == false) {
+                                               query = query + "&include_in_digest=false";
+                                       }
+
+                                       console.log(query);
+
+                                       notify_progress("Saving data...", true);
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       dialog.hide();
+                                                       updateFeedList();
+                                       }})
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
 
        } catch (e) {
                exception_error("editSelectedFeeds", e);
@@ -953,8 +750,8 @@ function editSelectedFeeds() {
 
 function piggie(enable) {
        if (enable) {
-               debug("I LOVEDED IT!");
-               var piggie = document.getElementById("piggie");
+               console.log("I LOVEDED IT!");
+               var piggie = $("piggie");
 
                Element.show(piggie);
                Position.Center(piggie);
@@ -963,100 +760,74 @@ function piggie(enable) {
        }
 }
 
-function validateOpmlImport() {
-       
-       var opml_file = document.getElementById("opml_file");
+function opmlImportComplete(iframe) {
+       try {
+               if (!iframe.contentDocument.body.innerHTML) return false;
 
-       if (opml_file.value.length == 0) {
-               alert(__("No OPML file to upload."));
-               return false;
-       } else {
-               return true;
-       }
-}
+               notify('');
 
-function updateFilterList(sort_key) {
-       try {
+               if (dijit.byId('opmlImportDlg'))
+                       dijit.byId('opmlImportDlg').destroyRecursive();
 
-               var filter_search = document.getElementById("filter_search");
-               var search = "";
-               if (filter_search) { search = filter_search.value; }
-       
-               var query = "backend.php?op=pref-filters&sort=" + 
-                       param_escape(sort_key) + 
-                       "&search=" + param_escape(search);
+               var content = iframe.contentDocument.body.innerHTML;
 
-               new Ajax.Request(query, {
-                               onComplete: function(transport) {
-                                               filterlist_callback2(transport);
-                       } });
+               dialog = new dijit.Dialog({
+                       id: "opmlImportDlg",
+                       title: __("OPML Import"),
+                       style: "width: 600px",
+                       onCancel: function() {
+                               updateFeedList();
+                       },
+                       content: content});
+
+               dialog.show();
 
        } catch (e) {
-               exception_error("updateFilterList", e);
+               exception_error("opmlImportComplete", e);
        }
-
 }
 
-function updateLabelList(sort_key) {
+function opmlImport() {
 
-       try {
+       var opml_file = $("opml_file");
 
-               var label_search = document.getElementById("label_search");
-               var search = "";
-               if (label_search) { search = label_search.value; }
-       
-               var query = "backend.php?op=pref-labels&sort=" + 
-                       param_escape(sort_key) +
-                       "&search=" + param_escape(search);
-       
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                               labellist_callback2(transport);
-                       } });
-
-       } catch (e) {
-               exception_error("updateLabelList", e);
+       if (opml_file.value.length == 0) {
+               alert(__("Please choose an OPML file first."));
+               return false;
+       } else {
+               notify_progress("Importing, please wait...", true);
+               return true;
        }
 }
 
-function updatePrefsList() {
-
-       var query = "backend.php?op=pref-prefs";
+function updateFilterList() {
+       new Ajax.Request("backend.php", {
+               parameters: "?op=pref-filters",
+               onComplete: function(transport) {
+                       filterlist_callback2(transport);
+               } });
+}
 
-       new Ajax.Request(query, {
-               onComplete: function(transport) { 
-                       prefslist_callback2(transport); 
+function updateLabelList() {
+       new Ajax.Request("backend.php", {
+               parameters: "?op=pref-labels",
+               onComplete: function(transport) {
+                       labellist_callback2(transport);
                } });
+}
 
+function updatePrefsList() {
+       new Ajax.Request("backend.php", {
+               parameters: "?op=pref-prefs",
+               onComplete: function(transport) {
+                       prefslist_callback2(transport);
+               } });
 }
 
 function selectTab(id, noupdate, subop) {
-
-//     alert(id);
-
-       if (!id) id = active_tab;
-
        try {
-
-               try {
-                       var c = document.getElementById('prefContent'); 
-                       c.scrollTop = 0;
-               } catch (e) { };
-
                if (!noupdate) {
-
-                       debug("selectTab: " + id + "(NU: " + noupdate + ")");
-       
                        notify_progress("Loading, please wait...");
-       
-                       // close active infobox if needed
-                       closeInfoBox();
-       
-                       // clean up all current selections, just in case
-                       active_feed_cat = false;
-
-//                     Effect.Fade("prefContent", {duration: 1, to: 0.01, 
-//                             queue: { position:'end', scope: 'FEED_TAB', limit: 1 } } );
 
                        if (id == "feedConfig") {
                                updateFeedList();
@@ -1069,326 +840,143 @@ function selectTab(id, noupdate, subop) {
                        } else if (id == "userConfig") {
                                updateUsersList();
                        }
-               }
 
-               /* clean selection from all tabs */
-       
-               var tabs_holder = document.getElementById("prefTabs");
-               var tab = tabs_holder.firstChild;
+                       var tab = dijit.byId(id + "Tab");
+                       dijit.byId("pref-tabs").selectChild(tab);
 
-               while (tab) {
-                       if (tab.className && tab.className.match("prefsTabSelected")) {
-                               tab.className = "prefsTab";
-                       }
-                       tab = tab.nextSibling;
                }
 
-               /* mark new tab as selected */
-
-               tab = document.getElementById(id + "Tab");
-       
-               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 (!document.getElementById(active_tab+"Tab")) active_tab = "genConfig";
-               if (!active_tab || active_tab == '0') active_tab = "genConfig";
 
                document.onkeydown = pref_hotkey_handler;
-
-               var tab = getURLParam('tab');
-               
-               caller_subop = getURLParam('subop');
-
-               if (getURLParam("subopparam")) {
-                       caller_subop = caller_subop + ":" + getURLParam("subopparam");
-               }
-
-               if (tab) {
-                       active_tab = tab;
-               }
-
-               if (navigator.userAgent.match("Opera")) {       
-                       setTimeout("selectTab()", 500);
-               } else {
-                       selectTab(active_tab);
-               }
+               loading_set_progress(50);
                notify("");
 
-               loading_set_progress(60);
-
-       } catch (e) {
-               exception_error("init_second_stage", e);
-       }
-}
-
-function init() {
-
-       try {
-       
-               if (arguments.callee.done) return;
-               arguments.callee.done = true;           
-
-               if (getURLParam('debug')) {
-                       Element.show("debug_output");
-                       debug('debug mode activated');
-               }
-
-               loading_set_progress(30);
-
-               var query = "backend.php?op=rpc&subop=sanityCheck";
-
-               new Ajax.Request(query, {
-                       onComplete: function(transport) { 
-                               backend_sanity_check_callback2(transport);
-                       } });
-
-       } catch (e) {
-               exception_error("init", e);
-       }
-}
-
-function categorizeSelectedFeeds() {
-
-       var sel_rows = getSelectedFeeds();
-
-       var cat_sel = document.getElementById("sfeed_set_fcat");
-       var cat_id = cat_sel[cat_sel.selectedIndex].value;
-
-       if (sel_rows.length > 0) {
-
-               notify_progress("Changing category of selected feeds...");
+               dojo.addOnLoad(function() {
+                       var tab = getURLParam('tab');
 
-               var query = "backend.php?op=pref-feeds&subop=categorize&ids="+
-                       param_escape(sel_rows.toString()) + "&cat_id=" + param_escape(cat_id);
-
-               new Ajax.Request(query, {
-                       onComplete: function(transport) { 
-                               feedlist_callback2(transport); 
-                       } });
-
-       } else {
-
-               alert(__("No feeds are selected."));
-
-       }
-
-}
-
-function validatePrefsReset() {
-       try {
-               var ok = confirm(__("Reset to defaults?"));
+                       if (tab) {
+                               tab = dijit.byId(tab + "Tab");
+                               if (tab) dijit.byId("pref-tabs").selectChild(tab);
+                       }
 
-               if (ok) {
+                       var subop = getURLParam('subop');
 
-                       var query = Form.serialize("pref_prefs_form");
-                       query = query + "&subop=reset-config";
-                       debug(query);
+                       if (subop == 'editFeed') {
+                               var param = getURLParam('subopparam');
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       prefs_reset_callback2(transport);
-                               } });
+                               window.setTimeout('editFeed(' + param + ')', 100);
+                       }
+               });
 
-               }
+               setTimeout("hotkey_prefix_timeout()", 5*1000);
 
        } catch (e) {
-               exception_error("validatePrefsSave", e);
+               exception_error("init_second_stage", e);
        }
-
-       return false;
-
 }
 
-function feedBrowserSubscribe() {
-       try {
-
-               var selected = getSelectedFeedsFromBrowser();
+function init() {
 
-               if (selected.length > 0) {
-                       closeInfoBox();
+       try {
 
-                       var query = "backend.php?op=pref-feeds&subop=massSubscribe&ids="+
-                               param_escape(selected.toString());
+               /* 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.require("dijit.form.SimpleTextarea"); */
+
+               dojo.registerModulePath("lib", "..");
+               dojo.registerModulePath("fox", "../..");
+
+               dojo.require("lib.CheckBoxTree");
+               dojo.require("fox.PrefFeedTree");
+               dojo.require("fox.PrefFilterTree");
+               dojo.require("fox.PrefLabelTree");
+
+               dojo.parser.parse();
+
+               dojo.addOnLoad(function() {
+                       loading_set_progress(50);
 
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) { 
-                                       feedlist_callback2(transport); 
+                       new Ajax.Request("backend.php", {
+                               parameters: {op: "rpc", subop: "sanityCheck"},
+                                       onComplete: function(transport) {
+                                       backend_sanity_check_callback(transport);
                                } });
-
-               } else {
-                       alert(__("No feeds are selected."));
-               }
+               });
 
        } catch (e) {
-               exception_error("feedBrowserSubscribe", e);
+               exception_error("init", 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";
-               }
+function validatePrefsReset() {
+       try {
+               var ok = confirm(__("Reset to defaults?"));
 
-               if (opbarid) {
-                       selectTableRowsByIdPrefix(lname, nrow, nchk, select);
-                       disableContainerChildren(opbarid, !select);
-               }
+               if (ok) {
 
-       } 
-}
+                       query = "?op=pref-prefs&subop=reset-config";
+                       console.log(query);
 
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       var msg = transport.responseText;
+                                       if (msg.match("PREFS_THEME_CHANGED")) {
+                                               window.location.reload();
+                                       } else {
+                                               notify_info(msg);
+                                               selectTab();
+                                       }
+                               } });
 
-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);
-               }
+       } catch (e) {
+               exception_error("validatePrefsReset", e);
+       }
 
-       } 
-}
+       return false;
 
-function toggleSelectFBListRow(sender) {
-       toggleSelectListRow(sender);
-       disableContainerChildren("fbrOpToolbar", getSelectedFeedsFromBrowser() == 0);
 }
 
-var seq = "";
 
 function pref_hotkey_handler(e) {
        try {
+               if (e.target.nodeName == "INPUT") return;
 
                var keycode;
                var shift_key = false;
 
+               var cmdline = $('cmdline');
+
                try {
                        shift_key = e.shiftKey;
                } catch (e) {
@@ -1409,18 +997,23 @@ function pref_hotkey_handler(e) {
                        }
                        hotkey_prefix = false;
                        closeInfoBox();
-               } 
-
-               if (!hotkeys_enabled) {
-                       debug("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;
-                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
+
+                       var date = new Date();
+                       var ts = Math.round(date.getTime() / 1000);
+
+                       hotkey_prefix_pressed = ts;
+
+                       cmdline.innerHTML = keychar;
+                       Element.show(cmdline);
+
+                       console.log("KP: PREFIX=" + keycode + " CHAR=" + keychar);
                        return;
                }
 
@@ -1436,18 +1029,10 @@ function pref_hotkey_handler(e) {
 
                /* Global hotkeys */
 
+               Element.hide(cmdline);
+
                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");
@@ -1459,13 +1044,13 @@ function pref_hotkey_handler(e) {
                        }
 
                        if (keycode == 191 || keychar == '/') { // /
-                               var search_boxes = new Array("label_search", 
+                               var search_boxes = new Array("label_search",
                                        "feed_search", "filter_search", "user_search", "feed_browser_search");
 
                                for (var i = 0; i < search_boxes.length; i++) {
-                                       var elem = document.getElementById(search_boxes[i]);
+                                       var elem = $(search_boxes[i]);
                                        if (elem) {
-                                               focus_element(search_boxes[i]);
+                                               $(search_boxes[i]).focus();
                                                return false;
                                        }
                                }
@@ -1478,20 +1063,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
                        }
@@ -1502,7 +1082,7 @@ function pref_hotkey_handler(e) {
                        }
 
                        if (keycode == 84 && shift_key) { // T
-                               browseFeeds();
+                               feedBrowser();
                                return false;
                        }
 
@@ -1514,27 +1094,27 @@ function pref_hotkey_handler(e) {
 
                        hotkey_prefix = false;
 
-                       if (keycode == 49 && document.getElementById("genConfigTab")) { // 1
+                       if (keycode == 49 && $("genConfigTab")) { // 1
                                selectTab("genConfig");
                                return false;
                        }
 
-                       if (keycode == 50 && document.getElementById("feedConfigTab")) { // 2
+                       if (keycode == 50 && $("feedConfigTab")) { // 2
                                selectTab("feedConfig");
                                return false;
                        }
 
-                       if (keycode == 51 && document.getElementById("filterConfigTab")) { // 4
+                       if (keycode == 51 && $("filterConfigTab")) { // 4
                                selectTab("filterConfig");
                                return false;
                        }
 
-                       if (keycode == 52 && document.getElementById("labelConfigTab")) { // 5
+                       if (keycode == 52 && $("labelConfigTab")) { // 5
                                selectTab("labelConfig");
                                return false;
                        }
 
-                       if (keycode == 53 && document.getElementById("userConfigTab")) { // 6
+                       if (keycode == 53 && $("userConfigTab")) { // 6
                                selectTab("userConfig");
                                return false;
                        }
@@ -1545,9 +1125,8 @@ function pref_hotkey_handler(e) {
 
                }
 
-               if (document.getElementById("piggie")) {
-       
-                       if (seq.match("807371717369")) {
+               if ($("piggie")) {
+                       if (seq.match("8073717369")) {
                                seq = "";
                                piggie(true);
                        } else {
@@ -1556,9 +1135,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) {
@@ -1568,157 +1147,119 @@ function pref_hotkey_handler(e) {
 
 function editFeedCats() {
        try {
-               document.getElementById("subscribe_to_feed_btn").disabled = true;
-       
-               try {
-                       document.getElementById("top25_feeds_btn").disabled = true;
-               } catch (e) {
-                       // this button is not always available, no-op if not found
-               }
-       
                var query = "backend.php?op=pref-feeds&subop=editCats";
 
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                               infobox_feed_cat_callback2(transport);
-                       } });
-       } catch (e) {
-               exception_error("editFeedCats", e);
-       }
-}
-
-function showFeedsWithErrors() {
-       displayDlg('feedUpdateErrors');
-}
-
-function changeUserPassword() {
-
-       try {
-
-               var f = document.forms["change_pass_form"];
-
-               if (f) {
-                       if (f.OLD_PASSWORD.value == "") {
-                               new Effect.Highlight(f.OLD_PASSWORD);
-                               notify_error("Old password cannot be blank.");
-                               return false;
-                       }
-
-                       if (f.NEW_PASSWORD.value == "") {
-                               new Effect.Highlight(f.NEW_PASSWORD);
-                               notify_error("New password cannot be blank.");
-                               return false;
-                       }
+               if (dijit.byId("feedCatEditDlg"))
+                       dijit.byId("feedCatEditDlg").destroyRecursive();
 
-                       if (f.CONFIRM_PASSWORD.value == "") {
-                               new Effect.Highlight(f.CONFIRM_PASSWORD);
-                               notify_error("Entered passwords do not match.");
-                               return false;
-                       }
+               dialog = new dijit.Dialog({
+                       id: "feedCatEditDlg",
+                       title: __("Feed Categories"),
+                       style: "width: 600px",
+                       getSelectedCategories: function() {
+                               return getSelectedTableRowIds("prefFeedCatList");
+                       },
+                       removeSelected: function() {
+                               var sel_rows = this.getSelectedCategories();
 
-                       if (f.CONFIRM_PASSWORD.value != f.NEW_PASSWORD.value) {
-                               new Effect.Highlight(f.CONFIRM_PASSWORD);
-                               new Effect.Highlight(f.NEW_PASSWORD);
-                               notify_error("Entered passwords do not match.");
-                               return false;
-                       }
+                               if (sel_rows.length > 0) {
+                                       var ok = confirm(__("Remove selected categories?"));
 
-               }
+                                       if (ok) {
+                                               notify_progress("Removing selected categories...", true);
 
-               var query = Form.serialize("change_pass_form");
-       
-               notify_progress("Trying to change password...");
+                                               var query = "?op=pref-feeds&subop=editCats&action=remove&ids="+
+                                                       param_escape(sel_rows.toString());
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               changepass_callback2(transport); 
-                       } });
+                                               new Ajax.Request("backend.php", {
+                                                       parameters: query,
+                                                       onComplete: function(transport) {
+                                                               notify('');
+                                                               dialog.attr('content', transport.responseText);
+                                                               updateFeedList();
+                                                       } });
 
+                                       }
 
-       } catch (e) {
-               exception_error("changeUserPassword", e);
-       }
-       
-       return false;
-}
+                               } else {
+                                       alert(__("No categories are selected."));
+                               }
+                       },
+                       addCategory: function() {
+                               if (this.validate()) {
+                                       notify_progress("Creating category...");
 
-function changeUserEmail() {
+                                       var query = "?op=pref-feeds&subop=editCats&action=add&cat=" +
+                                               param_escape(this.attr('value').newcat);
 
-       try {
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       notify('');
+                                                       dialog.attr('content', transport.responseText);
+                                                       updateFeedList();
+                                               } });
+                               }
+                       },
+                       execute: function() {
+                               if (this.validate()) {
+                               }
+                       },
+                       href: query});
 
-               var query = Form.serialize("change_email_form");
-       
-               notify_progress("Trying to change e-mail...");
-       
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               notify_callback2(transport); 
-                       } });
+               dialog.show();
 
        } catch (e) {
-               exception_error("changeUserPassword", e);
+               exception_error("editFeedCats", e);
        }
-       
-       return false;
-
 }
 
-function feedlistToggleSLAT() {
-       notify_progress("Loading, please wait...");
-       updateFeedList()
+function showFeedsWithErrors() {
+       displayDlg('feedUpdateErrors');
 }
 
-function pubRegenKey() {
-
-       var ok = confirm(__("Replace current publishing address with a new one?"));
-
-       if (ok) {
+function opmlRegenKey() {
 
-               notify_progress("Trying to change address...");
+       try {
+               var ok = confirm(__("Replace current OPML publishing address with a new one?"));
 
-               var query = "backend.php?op=rpc&subop=regenPubKey";
+               if (ok) {
 
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       replace_pubkey_callback(transport);
-                               } });
+                       notify_progress("Trying to change address...", true);
 
-       }
+                       var query = "?op=rpc&subop=regenOPMLKey";
 
-       return false;
-}
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                               var reply = JSON.parse(transport.responseText);
 
-function validatePrefsSave() {
-       try {
+                                               var new_link = reply.link;
 
-               var ok = confirm(__("Save current configuration?"));
+                                               var e = $('pub_opml_url');
 
-               if (ok) {
+                                               if (new_link) {
+                                                       e.href = new_link;
+                                                       e.innerHTML = new_link;
 
-                       var query = Form.serialize("pref_prefs_form");
-                       query = query + "&subop=save-config";
-                       debug(query);
+                                                       new Effect.Highlight(e);
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                               notify_callback2(transport); 
-                       } });
+                                                       notify('');
 
+                                               } else {
+                                                       notify_error("Could not change feed URL.");
+                                               }
+                               } });
                }
-
        } catch (e) {
-               exception_error("validatePrefsSave", e);
+               exception_error("opmlRegenKey", e);
        }
-
        return false;
 }
 
 function feedActionChange() {
        try {
-               var chooser = document.getElementById("feedActionChooser");
+               var chooser = $("feedActionChooser");
                var opid = chooser[chooser.selectedIndex].value;
 
                chooser.selectedIndex = 0;
@@ -1728,7 +1269,7 @@ function feedActionChange() {
        }
 }
 
-function feedActionGo(op) {    
+function feedActionGo(op) {
        try {
                if (op == "facEdit") {
 
@@ -1771,9 +1312,10 @@ function clearFeedArticles(feed_id) {
 
        notify_progress("Clearing feed...");
 
-       var query = "backend.php?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
+       var query = "?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) {
                                notify('');
                        } });
@@ -1792,11 +1334,12 @@ function rescoreSelectedFeeds() {
 
                if (ok) {
                        notify_progress("Rescoring selected feeds...", true);
-       
-                       var query = "backend.php?op=pref-feeds&subop=rescore&quiet=1&ids="+
+
+                       var query = "?op=pref-feeds&subop=rescore&quiet=1&ids="+
                                param_escape(sel_rows.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                notify_callback2(transport);
                        } });
@@ -1815,169 +1358,364 @@ function rescore_all_feeds() {
        if (ok) {
                notify_progress("Rescoring feeds...", true);
 
-               var query = "backend.php?op=pref-feeds&subop=rescoreAll&quiet=1";
+               var query = "?op=pref-feeds&subop=rescoreAll&quiet=1";
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        notify_callback2(transport);
                } });
        }
 }
 
-function removeFilter(id, title) {
-
+function labelColorReset() {
        try {
+               var labels = getSelectedLabels();
 
-               var msg = __("Remove filter %s?").replace("%s", title);
-       
-               var ok = confirm(msg);
-       
-               if (ok) {
-                       closeInfoBox();
-       
-                       notify_progress("Removing filter...");
-               
-                       var query = "backend.php?op=pref-filters&subop=remove&ids="+
-                               param_escape(id);
+               if (labels.length > 0) {
+                       var ok = confirm(__("Reset selected labels to default colors?"));
 
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) {
-                                               filterlist_callback2(transport);
-                       } });
+                       if (ok) {
+                               var query = "?op=pref-labels&subop=color-reset&ids="+
+                                       param_escape(labels.toString());
+
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) {
+                                               labellist_callback2(transport);
+                                       } });
+                       }
 
+               } else {
+                       alert(__("No labels are selected."));
                }
 
        } catch (e) {
-               exception_error("removeFilter", e);
+               exception_error("labelColorReset", e);
        }
-
-       return false;
 }
 
-function unsubscribeFeed(id, title) {
 
+function inPreferences() {
+       return true;
+}
+
+function editProfiles() {
        try {
 
-               var msg = __("Unsubscribe from %s?").replace("%s", title);
-       
-               var ok = confirm(msg);
-       
+               if (dijit.byId("profileEditDlg"))
+                       dijit.byId("profileEditDlg").destroyRecursive();
+
+               var query = "backend.php?op=dlg&id=editPrefProfiles";
+
+               dialog = new dijit.Dialog({
+                       id: "profileEditDlg",
+                       title: __("Settings Profiles"),
+                       style: "width: 600px",
+                       getSelectedProfiles: function() {
+                               return getSelectedTableRowIds("prefFeedProfileList");
+                       },
+                       removeSelected: function() {
+                               var sel_rows = this.getSelectedProfiles();
+
+                               if (sel_rows.length > 0) {
+                                       var ok = confirm(__("Remove selected profiles? Active and default profiles will not be removed."));
+
+                                       if (ok) {
+                                               notify_progress("Removing selected profiles...", true);
+
+                                               var query = "?op=rpc&subop=remprofiles&ids="+
+                                                       param_escape(sel_rows.toString());
+
+                                               new Ajax.Request("backend.php", {
+                                                       parameters: query,
+                                                       onComplete: function(transport) {
+                                                               notify('');
+                                                               editProfiles();
+                                                       } });
+
+                                       }
+
+                               } else {
+                                       alert(__("No profiles are selected."));
+                               }
+                       },
+                       activateProfile: function() {
+                               var sel_rows = this.getSelectedProfiles();
+
+                               if (sel_rows.length == 1) {
+
+                                       var ok = confirm(__("Activate selected profile?"));
+
+                                       if (ok) {
+                                               notify_progress("Loading, please wait...");
+
+                                               var query = "?op=rpc&subop=setprofile&id="+
+                                                       param_escape(sel_rows.toString());
+
+                                               new Ajax.Request("backend.php", {
+                                                       parameters: query,
+                                                       onComplete: function(transport) {
+                                                               window.location.reload();
+                                                       } });
+                                       }
+
+                               } else {
+                                       alert(__("Please choose a profile to activate."));
+                               }
+                       },
+                       addProfile: function() {
+                               if (this.validate()) {
+                                       notify_progress("Creating profile...", true);
+
+                                       var query = "?op=rpc&subop=addprofile&title=" +
+                                               param_escape(dialog.attr('value').newprofile);
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       notify('');
+                                                       editProfiles();
+                                               } });
+
+                               }
+                       },
+                       execute: function() {
+                               if (this.validate()) {
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
+       } catch (e) {
+               exception_error("editProfiles", e);
+       }
+}
+
+function activatePrefProfile() {
+
+       var sel_rows = getSelectedFeedCats();
+
+       if (sel_rows.length == 1) {
+
+               var ok = confirm(__("Activate selected profile?"));
+
                if (ok) {
-                       closeInfoBox();
-       
-                       notify_progress("Removing feed...");
-               
-                       var query = "backend.php?op=pref-feeds&subop=remove&ids="+
-                               param_escape(id);
-       
-                       new Ajax.Request(query, {
-                                       onComplete: function(transport) {
-                                                       feedlist_callback2(transport);
+                       notify_progress("Loading, please wait...");
+
+                       var query = "?op=rpc&subop=setprofile&id="+
+                               param_escape(sel_rows.toString());
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       window.location.reload();
                                } });
                }
-       
-       } catch (e) {
-               exception_error("unsubscribeFeed", e);
+
+       } else {
+               alert(__("Please choose a profile to activate."));
        }
 
        return false;
+}
+
+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 feedsEditSave() {
+function resetFeedOrder() {
        try {
+               notify_progress("Loading, please wait...");
 
-               var ok = confirm(__("Save changes to selected feeds?"));
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&subop=feedsortreset",
+                       onComplete: function(transport) {
+                               updateFeedList();
+                       } });
 
-               if (ok) {
 
-                       var f = document.forms["batch_edit_feed_form"];
+       } catch (e) {
+               exception_error("resetFeedOrder");
+       }
+}
 
-                       var query = Form.serialize("batch_edit_feed_form");
+function resetCatOrder() {
+       try {
+               notify_progress("Loading, please wait...");
 
-                       /* Form.serialize ignores unchecked checkboxes */
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&subop=catsortreset",
+                       onComplete: function(transport) {
+                               updateFeedList();
+                       } });
 
-                       if (!query.match("&hidden=") && 
-                                       f.hidden.disabled == false) {
-                               query = query + "&hidden=false";
-                       }
 
-                       if (!query.match("&rtl_content=") && 
-                                       f.rtl_content.disabled == false) {
-                               query = query + "&rtl_content=false";
-                       }
+       } catch (e) {
+               exception_error("resetCatOrder");
+       }
+}
 
-                       if (!query.match("&private=") && 
-                                       f.private.disabled == false) {
-                               query = query + "&private=false";
-                       }
+function editCat(id, item, event) {
+       try {
+               var new_name = prompt(__('Rename category to:'), item.name);
 
-                       if (!query.match("&cache_images=") && 
-                                       f.cache_images.disabled == false) {
-                               query = query + "&cache_images=false";
-                       }
+               if (new_name && new_name != item.name) {
 
-                       if (!query.match("&include_in_digest=") && 
-                                       f.include_in_digest.disabled == false) {
-                               query = query + "&include_in_digest=false";
-                       }
-       
-                       closeInfoBox();
-       
-                       notify_progress("Saving feeds...");
-       
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       feedlist_callback2(transport); 
-                               } });
+                       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();
+                       } });
                }
 
-               return false;
        } catch (e) {
-               exception_error("feedsEditSave", e);
+               exception_error("editCat", e);
        }
 }
 
-function batchFeedsToggleField(cb, elem, label) {
+function editLabel(id, event) {
        try {
-               var f = document.forms["batch_edit_feed_form"];
-               var l = document.getElementById(label);
+               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",
+                       setLabelColor: function(id, fg, bg) {
+
+                               var kind = '';
+                               var color = '';
+
+                               if (fg && bg) {
+                                       kind = 'both';
+                               } else if (fg) {
+                                       kind = 'fg';
+                                       color = fg;
+                               } else if (bg) {
+                                       kind = 'bg';
+                                       color = bg;
+                               }
 
-               if (cb.checked) {
-                       f[elem].disabled = false;
+                               var query = "?op=pref-labels&subop=color-set&kind="+kind+
+                                       "&ids=" + param_escape(id) + "&fg=" + param_escape(fg) +
+                                       "&bg=" + param_escape(bg) + "&color=" + param_escape(color);
 
-                       if (l) {
-                               l.className = "";
-                       };
+               //              console.log(query);
 
-//                     new Effect.Highlight(f[elem], {duration: 1, startcolor: "#fff7d5",
-//                             queue: { position:'end', scope: 'BPEFQ', limit: 1 } } );
+                               var e = $("LICID-" + id);
 
-               } else {
-                       f[elem].disabled = true;
+                               if (e) {
+                                       if (fg) e.style.color = fg;
+                                       if (bg) e.style.backgroundColor = bg;
+                               }
+
+                               new Ajax.Request("backend.php", { parameters: query });
+
+                               updateFilterList();
+                       },
+                       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);
+                                       this.setLabelColor(id, fg_color, bg_color);
+                                       this.hide();
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       updateFilterList();
+                                       } });
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
 
-                       if (l) {
-                               l.className = "insensitive";
-                       };
+       } catch (e) {
+               exception_error("editLabel", e);
+       }
+}
+
+function clearTwitterCredentials() {
+       try {
+               var ok = confirm(__("This will clear your stored authentication information for Twitter. Continue?"));
+
+               if (ok) {
+                       notify_progress("Clearing credentials...");
+
+                       var query = "?op=pref-feeds&subop=remtwitterinfo";
 
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       notify_info("Twitter credentials have been cleared.");
+                                       updateFeedList();
+                               } });
                }
+
        } catch (e) {
-               exception_error("batchFeedsToggleField", e);
+               exception_error("clearTwitterCredentials", e);
        }
 }
 
-/*
-function colorPicker(caller, id, fg, bg) {
+function customizeCSS() {
        try {
-               var picker = document.getElementById("colorPicker");
+               var query = "backend.php?op=dlg&id=customizeCSS";
+
+               if (dijit.byId("cssEditDlg"))
+                       dijit.byId("cssEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "cssEditDlg",
+                       title: __("Customize stylesheet"),
+                       style: "width: 600px",
+                       execute: function() {
+                               notify_progress('Saving data...', true);
+                               new Ajax.Request("backend.php", {
+                                       parameters: dojo.objectToQuery(this.attr('value')),
+                                       onComplete: function(transport) {
+                                               notify('');
+                                               window.location.reload();
+                               } });
 
+                       },
+                       href: query});
 
-               picker.style.left = caller.offsetLeft;
-               picker.style.top = caller.offsetTop;
+               dialog.show();
 
        } catch (e) {
-               exception_error("colorPicker", e);
+               exception_error("customizeCSS", e);
        }
-}*/
+}