]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
experimental display of labelColorIndicators in FeedTree
[tt-rss.git] / prefs.js
index 64fe0a3d57cc37254d3a556c705da62d22bcb142..4851611a384e8f9ca724690ad437d3d8e17d2f76 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -1,25 +1,17 @@
-var active_feed_cat = false;
-var active_tab = false;
-
 var init_params = new Array();
 
 var caller_subop = false;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
 
-var color_picker_active = false;
-var selection_disabled = false;
-var mouse_is_down = false;
-
-var db = false;
-var store = false;
+var seq = "";
 
 function feedlist_callback2(transport) {
 
        try {   
 
-               var container = $('prefContent');       
-               container.innerHTML=transport.responseText;
+               dijit.byId('feedConfigTab').attr('content', transport.responseText); 
+
                selectTab("feedConfig", true);
 
                if (caller_subop) {
@@ -30,11 +22,7 @@ function feedlist_callback2(transport) {
 
                        caller_subop = false;
                }
-               if (typeof correctPNG != 'undefined') {
-                       correctPNG();
-               }
                notify("");
-               remove_splash();
 
        } catch (e) {
                exception_error("feedlist_callback2", e);
@@ -42,53 +30,18 @@ function feedlist_callback2(transport) {
 }
 
 function filterlist_callback2(transport) {
-       var container = $('prefContent');
-       container.innerHTML=transport.responseText;
-       if (typeof correctPNG != 'undefined') {
-               correctPNG();
-       }
+       dijit.byId('filterConfigTab').attr('content', transport.responseText); 
        notify("");
-       remove_splash();
-}
-
-function init_label_inline_editor() {
-       try {
-               if ($("prefLabelList")) {
-                       var elems = $("prefLabelList").getElementsByTagName("SPAN");
-
-                       for (var i = 0; i < elems.length; i++) {
-                               if (elems[i].id && elems[i].id.match("LILT-")) {
-
-                                       var id = elems[i].id.replace("LILT-", "");
-
-                                       new Ajax.InPlaceEditor(elems[i],
-                                               'backend.php?op=pref-labels&subop=save&id=' + id,
-                                               {cols: 20, rows: 1});
-
-                               }
-                       }
-               }
-
-       } catch (e) {
-               exception_error("init_label_inline_editor", e);
-       }
 }
 
 function labellist_callback2(transport) {
 
        try {
 
-               var container = $('prefContent');
-                       closeInfoBox();
-                       container.innerHTML=transport.responseText;
+               dijit.byId('labelConfigTab').attr('content', transport.responseText); 
+               closeInfoBox();
 
-                       init_label_inline_editor();
-       
-                       if (typeof correctPNG != 'undefined') {
-                               correctPNG();
-                       }
-                       notify("");
-                       remove_splash();
+               notify("");
 
        } catch (e) {
                exception_error("labellist_callback2", e);
@@ -97,12 +50,9 @@ function labellist_callback2(transport) {
 
 function userlist_callback2(transport) {
        try {
-               var container = $('prefContent');
-               if (transport.readyState == 4) {
-                       container.innerHTML=transport.responseText;
-                       notify("");
-                       remove_splash();
-               }
+               dijit.byId('userConfigTab').attr('content', transport.responseText); 
+
+               notify("");
        } catch (e) {
                exception_error("userlist_callback2", e);
        }
@@ -110,10 +60,9 @@ function userlist_callback2(transport) {
 
 function prefslist_callback2(transport) {
        try {
-               var container = $('prefContent');
-               container.innerHTML=transport.responseText;
+               dijit.byId('genConfigTab').attr('content', transport.responseText); 
+
                notify("");
-               remove_splash();
        } catch (e) {
                exception_error("prefslist_callback2", e);
        }
@@ -123,83 +72,12 @@ function notify_callback2(transport) {
        notify_info(transport.responseText);     
 }
 
-function init_profile_inline_editor() {
-       try {
-
-               if ($("prefFeedCatList")) {
-                       var elems = $("prefFeedCatList").getElementsByTagName("SPAN");
-
-                       for (var i = 0; i < elems.length; i++) {
-                               if (elems[i].id && elems[i].id.match("FCATT-")) {
-                                       var id = elems[i].id.replace("FCATT-", "");
-                                               new Ajax.InPlaceEditor(elems[i],
-                                               'backend.php?op=rpc&subop=saveprofile&id=' + id);
-                               }
-                       }
-               }
-
-       } catch (e) {
-               exception_error("init_profile_inline_editor", e);
-       }
-}
-
-function init_cat_inline_editor() {
-       try {
-
-               if ($("prefFeedCatList")) {
-                       var elems = $("prefFeedCatList").getElementsByTagName("SPAN");
-
-                       for (var i = 0; i < elems.length; i++) {
-                               if (elems[i].id && elems[i].id.match("FCATT-")) {
-                                       var cat_id = elems[i].id.replace("FCATT-", "");
-                                               new Ajax.InPlaceEditor(elems[i],
-                                               'backend.php?op=pref-feeds&subop=editCats&action=save&cid=' + cat_id);
-                               }
-                       }
-               }
-
-       } catch (e) {
-               exception_error("init_cat_inline_editor", e);
-       }
-}
-
-function infobox_feed_cat_callback2(transport) {
-       try {
-               infobox_callback2(transport);
-               init_cat_inline_editor();
-       } catch (e) {
-               exception_error("infobox_feed_cat_callback2", e);
-       }
-}
-
 function updateFeedList(sort_key) {
-
-       try {
-
-       var feed_search = $("feed_search");
-       var search = "";
-       if (feed_search) { search = feed_search.value; }
-
-       var slat = $("show_last_article_times");
-
-       var slat_checked = false;
-       if (slat) {
-               slat_checked = slat.checked;
-       }
-
-       var query = "?op=pref-feeds" +
-               "&sort=" + param_escape(sort_key) + 
-               "&slat=" + param_escape(slat_checked) +
-               "&search=" + param_escape(search);
-
        new Ajax.Request("backend.php", {
-               parameters: query,
+               parameters: "?op=pref-feeds",
                onComplete: function(transport) { 
                        feedlist_callback2(transport); 
                } });
-       } catch (e) {
-               exception_error("updateFeedList", e);
-       }
 }
 
 function updateUsersList(sort_key) {
@@ -225,83 +103,6 @@ function updateUsersList(sort_key) {
        }
 }
 
-function addFeed() {
-
-       try {
-
-               var link = $("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 = "?op=pref-feeds&subop=add&from=tt-rss&feed_url=" +
-                               param_escape(link.value);
-       
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               feedlist_callback2(transport);
-                                       } });
-       
-                       link.value = "";
-       
-               }
-
-       } catch (e) {
-               exception_error("addFeed", e);
-       }
-
-}
-
-function addPrefProfile() {
-
-       var profile = $("fadd_profile");
-
-       if (profile.value.length == 0) {
-               alert(__("Can't add profile: no name specified."));
-       } else {
-               notify_progress("Adding profile...");
-
-               var query = "?op=rpc&subop=addprofile&title=" + 
-                       param_escape(profile.value);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       editProfiles();
-                               } });
-
-       }
-}
-
-
-function addFeedCat() {
-
-       var cat = $("fadd_cat");
-
-       if (cat.value.length == 0) {
-               alert(__("Can't add category: no name specified."));
-       } else {
-               notify_progress("Adding feed category...");
-
-               var query = "?op=pref-feeds&subop=editCats&action=add&cat=" +
-                       param_escape(cat.value);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_feed_cat_callback2(transport);
-                               } });
-
-               link.value = "";
-
-       }
-}
-
 function addUser() {
 
        try {
@@ -333,15 +134,14 @@ 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);
 
                var query = "?op=pref-users&subop=edit&id=" +
@@ -351,85 +151,147 @@ function editUser(id) {
                        parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
+                                       document.forms['user_edit_form'].login.focus(); 
                                } });
 
+               } else if (event.ctrlKey) {
+                       var cb = $('UMCHK-' + id);
+                       cb.checked = !cb.checked;
+                       toggleSelectRow(cb);
+               }
+
        } catch (e) {
                exception_error("editUser", e);
        }
                
 }
 
-function editFilter(id) {
-
+function editFilter(id, event) {
        try {
 
-               disableHotkeys();
+               var query = "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id);
 
-               notify_progress("Loading, please wait...");
+               if (dijit.byId("filterEditDlg"))
+                       dijit.byId("filterEditDlg").destroyRecursive();
 
-               selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
-               selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
+               dialog = new dijit.Dialog({
+                       id: "filterEditDlg",
+                       title: __("Edit Filter"),
+                       style: "width: 600px",
+                       removeFilter: function() {
+                               var title = this.attr('value').reg_exp;
+                               var msg = __("Remove filter %s?").replace("%s", title);
+               
+                               if (confirm(msg)) {
+                                       this.hide();
 
-               var query = "?op=pref-filters&subop=edit&id=" + 
-                       param_escape(id);
+                                       notify_progress("Removing filter...");
+               
+                                       var id = this.attr('value').id;
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                               } });
-       } catch (e) {
-               exception_error("editFilter", e);
-       }
-}
+                                       var query = "?op=pref-filters&subop=remove&ids="+
+                                               param_escape(id);
 
-function editFeed(feed) {
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       updateFilterList();
+                                               } });
+                               }
+                       },
 
-       try {
+                       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) {
+                                                       handle_rpc_reply(transport);
+                                                       var response = transport.responseXML;
+
+                                                       if (response) {
+                                                               var s = response.getElementsByTagName("status")[0].firstChild.nodeValue;
+       
+                                                               notify('');
+
+                                                               if (s == "INVALID") {
+                                                                       alert("Match regular expression seems to be invalid.");
+                                                                       return;
+                                                               } else {
+                                                                       notify_progress("Saving data...", true);
+
+                                                                       console.log(dojo.objectToQuery(dialog.attr('value')));
+
+                                                                       new Ajax.Request("backend.php", {
+                                                                               parameters: dojo.objectToQuery(dialog.attr('value')),
+                                                                               onComplete: function(transport) {
+                                                                                       dialog.hide();
+                                                                                       updateFilterList();                             
+                                                                       }})
+                                                               }       
+                                                       }
+                                       }});
+                               }
+                       },
+                       href: query});
+
+               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);
-       
-               var query = "?op=pref-feeds&subop=editfeed&id=" +
-                       param_escape(feed);
-       
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                                       document.forms["edit_feed_form"].title.focus();
-                               } });
 
        } 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() {
 
@@ -653,87 +515,8 @@ function removeSelectedPrefProfiles() {
        return false;
 }
 
-function removeSelectedFeedCats() {
-
-       var sel_rows = getSelectedFeedCats();
-
-       if (sel_rows.length > 0) {
-
-               var ok = confirm(__("Remove selected categories?"));
-
-               if (ok) {
-                       notify_progress("Removing selected categories...");
-       
-                       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) {
-                                       infobox_feed_cat_callback2(transport);
-                               } });
-
-               }
-
-       } else {
-
-               alert(__("No categories are selected."));
-
-       }
-
-       return false;
-}
-
-function feedEditCancel() {
-
-       closeInfoBox();
-
-       selectPrefRows('feed', false); // cleanup feed selection
-
-       return false;
-}
-
-function feedEditSave() {
-
-       try {
-       
-               // FIXME: add parameter validation
-
-               var query = Form.serialize("edit_feed_form");
-
-               notify_progress("Saving feed...");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               feedlist_callback2(transport); 
-                       } });
-
-               closeInfoBox();
-
-               return false;
-
-       } catch (e) {
-               exception_error("feedEditSave", e);
-       } 
-}
-
 function userEditCancel() {
-
-       selectPrefRows('user', false); // cleanup feed selection
-       closeInfoBox();
-
-       return false;
-}
-
-function filterEditCancel() {
-
-       try {
-               selectPrefRows('filter', false); // cleanup feed selection
-       } catch (e) { }
-
        closeInfoBox();
-
        return false;
 }
 
@@ -769,30 +552,6 @@ function userEditSave() {
 }
 
 
-function filterEditSave() {
-
-       try {
-
-               notify_progress("Saving filter...");
-       
-               var query = "?" + Form.serialize("filter_edit_form");
-       
-               closeInfoBox();
-
-               new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               filterlist_callback2(transport);
-                       } });
-
-       } catch (e) {
-               exception_error("filterEditSave", e);
-       }
-
-       return false;
-}
-
-
 function editSelectedUser() {
        var rows = getSelectedUsers();
 
@@ -917,7 +676,7 @@ function editSelectedFeed() {
 
        notify("");
 
-       editFeed(rows[0]);
+       editFeed(rows[0], {});
 
 }
 
@@ -933,24 +692,84 @@ function editSelectedFeeds() {
        
                notify("");
        
-               disableHotkeys();
-       
-               notify_progress("Loading, please wait...");
-       
-               var query = "?op=pref-feeds&subop=editfeeds&ids=" +
+               var query = "backend.php?op=pref-feeds&subop=editfeeds&ids=" +
                        param_escape(rows.toString());
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                               } });
-
-       } catch (e) {
-               exception_error("editSelectedFeeds", e);
-       }
-}
-
+               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);
+       }
+}
+
 function piggie(enable) {
        if (enable) {
                console.log("I LOVEDED IT!");
@@ -968,102 +787,43 @@ function opmlImport() {
        var opml_file = $("opml_file");
 
        if (opml_file.value.length == 0) {
-               alert(__("No OPML file to upload."));
+               alert(__("Please choose an OPML file first."));
                return false;
        } else {
+               notify_progress("Importing, please wait...", true);
                return true;
        }
-
-       notify_progress("Importing, please wait...", true);
 }
 
-function updateFilterList(sort_key) {
-       try {
-
-               var filter_search = $("filter_search");
-               var search = "";
-               if (filter_search) { search = filter_search.value; }
-       
-               var query = "?op=pref-filters&sort=" + 
-                       param_escape(sort_key) + 
-                       "&search=" + param_escape(search);
-
-               new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               filterlist_callback2(transport);
-                       } });
-
-       } catch (e) {
-               exception_error("updateFilterList", e);
-       }
-
+function updateFilterList() {
+       new Ajax.Request("backend.php", {
+               parameters: "?op=pref-filters",
+               onComplete: function(transport) {
+                       filterlist_callback2(transport);
+               } });
 }
 
-function updateLabelList(sort_key) {
-
-       try {
-
-               var label_search = $("label_search");
-               var search = "";
-               if (label_search) { search = label_search.value; }
-       
-               var query = "?op=pref-labels&sort=" + 
-                       param_escape(sort_key) +
-                       "&search=" + param_escape(search);
-       
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               labellist_callback2(transport);
-                       } });
-
-       } catch (e) {
-               exception_error("updateLabelList", e);
-       }
+function updateLabelList() {
+       new Ajax.Request("backend.php", {
+               parameters: "?op=pref-labels",
+               onComplete: function(transport) {
+                       labellist_callback2(transport);
+               } });
 }
 
 function updatePrefsList() {
-
-       var query = "?op=pref-prefs";
-
        new Ajax.Request("backend.php", {
-               parameters: query,
+               parameters: "?op=pref-prefs",
                onComplete: function(transport) { 
                        prefslist_callback2(transport); 
                } });
-
 }
 
 function selectTab(id, noupdate, subop) {
-
-//     alert(id);
-
-       if (!id) id = active_tab;
-
        try {
-
-               try {
-                       if (id != active_tab) {
-                               var c = $('prefContent');       
-                               c.scrollTop = 0;
-                       }
-               } catch (e) { };
-
                if (!noupdate) {
-
-                       console.log("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();
@@ -1076,68 +836,40 @@ function selectTab(id, noupdate, subop) {
                        } else if (id == "userConfig") {
                                updateUsersList();
                        }
-               }
 
-               /* clean selection from all tabs */
-       
-               var tabs_holder = $("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 = $(id + "Tab");
        
-               if (tab) {
-                       if (!tab.className.match("Selected")) {
-                               tab.className = tab.className + "Selected";
-                       }
-               }
-       
-               active_tab = id;
-
        } catch (e) {
                exception_error("selectTab", e);
        }
 }
 
 function init_second_stage() {
-
        try {
-               active_tab = getInitParam("prefs_active_tab");
-               if (!$(active_tab+"Tab")) active_tab = "genConfig";
-               if (!active_tab || active_tab == '0') active_tab = "genConfig";
 
                document.onkeydown = pref_hotkey_handler;
-               document.onmousedown = mouse_down_handler;
-               document.onmouseup = mouse_up_handler;
 
-               var tab = getURLParam('tab');
-               
                caller_subop = getURLParam('subop');
 
                if (getURLParam("subopparam")) {
                        caller_subop = caller_subop + ":" + getURLParam("subopparam");
                }
 
-               if (tab) {
-                       active_tab = tab;
-               }
+               loading_set_progress(50);
 
-               if (navigator.userAgent.match("Opera")) {       
-                       setTimeout("selectTab()", 500);
-               } else {
-                       selectTab(active_tab);
-               }
                notify("");
 
-               loading_set_progress(60);
+               dojo.addOnLoad(function() {
+                       var tab = getURLParam('tab');
+
+                       if (tab) {
+                               tab = dijit.byId(tab + "Tab");
+                               if (tab) dijit.byId("pref-tabs").selectChild(tab);
+                       }
+               });
 
                setTimeout("hotkey_prefix_timeout()", 5*1000);
 
@@ -1150,20 +882,47 @@ function init() {
 
        try {
        
-               if (getURLParam('debug')) {
-                       Element.show("debug_output");
-                       console.log('debug mode activated');
-               }
+               dojo.require("dijit.layout.TabContainer");
+               dojo.require("dijit.layout.BorderContainer");
+               dojo.require("dijit.layout.AccordionContainer");
+               dojo.require("dijit.layout.ContentPane");
+               dojo.require("dijit.Dialog");
+               dojo.require("dijit.form.Button");
+               dojo.require("dijit.form.Select");
+               dojo.require("dijit.form.FilteringSelect");
+               dojo.require("dijit.form.TextBox");
+               dojo.require("dijit.form.CheckBox");
+               dojo.require("dijit.form.ValidationTextBox");
+               dojo.require("dijit.form.RadioButton");
+               dojo.require("dijit.form.Select");
+               dojo.require("dijit.Toolbar");
+               dojo.require("dojo.data.ItemFileWriteStore");
+               dojo.require("dijit.Tree");
+               dojo.require("dijit.form.DropDownButton");
+               dojo.require("dijit.form.Form");
+               dojo.require("dijit.Menu");
+               dojo.require("dijit.tree.dndSource");
+               dojo.require("dijit.InlineEditBox");
+               dojo.require("dijit.ColorPalette");
+               dojo.require("dijit.ProgressBar"); 
+
+               dojo.registerModulePath("lib", "..");
+               dojo.registerModulePath("fox", "../..");
+
+               dojo.require("lib.CheckBoxTree");
+               dojo.require("fox.PrefFeedTree");
+               dojo.require("fox.PrefFilterTree");
+               dojo.require("fox.PrefLabelTree");
+
+               dojo.addOnLoad(function() {
+                       loading_set_progress(50);
 
-               loading_set_progress(30);
-
-               var query = "?op=rpc&subop=sanityCheck";
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               backend_sanity_check_callback(transport);
-                       } });
+                       new Ajax.Request("backend.php", {
+                               parameters: {op: "rpc", subop: "sanityCheck"},
+                                       onComplete: function(transport) { 
+                                       backend_sanity_check_callback(transport);
+                               } });
+               });
 
        } catch (e) {
                exception_error("init", e);
@@ -1202,90 +961,10 @@ function validatePrefsReset() {
 
 }
 
-function selectPrefRows(kind, select) {
-
-       if (kind) {
-               var opbarid = false;    
-               var nchk = false;
-               var nrow = false;
-               var lname = false;
-
-               if (kind == "feed") {
-                       opbarid = "feedOpToolbar";
-                       nrow = "FEEDR-";
-                       nchk = "FRCHK-";                        
-                       lname = "prefFeedList";
-               } else if (kind == "fcat") {
-                       opbarid = "catOpToolbar";
-                       nrow = "FCATR-";
-                       nchk = "FCCHK-";
-                       lname = "prefFeedCatList";
-               } else if (kind == "filter") {
-                       opbarid = "filterOpToolbar";
-                       nrow = "FILRR-";
-                       nchk = "FICHK-";
-                       lname = "prefFilterList";
-               } else if (kind == "label") {
-                       opbarid = "labelOpToolbar";
-                       nrow = "LILRR-";
-                       nchk = "LICHK-";
-                       lname = "prefLabelList";
-               } else if (kind == "user") {
-                       opbarid = "userOpToolbar";
-                       nrow = "UMRR-";
-                       nchk = "UMCHK-";
-                       lname = "prefUserList";
-               } else if (kind == "fbrowse") {
-                       opbarid = "browseOpToolbar";
-                       nrow = "FBROW-";
-                       nchk = "FBCHK-";
-                       lname = "browseFeedList";
-               }
-
-               if (opbarid) {
-                       selectTableRowsByIdPrefix(lname, nrow, nchk, select);
-               }
-
-       } 
-}
-
-
-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();
-               }
-
-       } 
-}
-
-function toggleSelectFBListRow(sender) {
-       toggleSelectListRow(sender);
-}
-
-var seq = "";
 
 function pref_hotkey_handler(e) {
        try {
+               if (e.target.nodeName == "INPUT") return;
 
                var keycode;
                var shift_key = false;
@@ -1310,17 +989,12 @@ function pref_hotkey_handler(e) {
                        if (Element.visible("hotkey_help_overlay")) {
                                Element.hide("hotkey_help_overlay");
                        }
-                       colorPickerHideAll();
                        hotkey_prefix = false;
                        closeInfoBox();
                } 
 
-               if (!hotkeys_enabled) {
-                       console.log("hotkeys disabled");
-                       return;
-               }
-
                if (keycode == 16) return; // ignore lone shift
+               if (keycode == 17) return; // ignore lone ctrl
 
                if ((keycode == 67 || keycode == 71) && !hotkey_prefix) {
                        hotkey_prefix = keycode;
@@ -1353,16 +1027,6 @@ function pref_hotkey_handler(e) {
 
                if (!hotkey_prefix) {
 
-                       if (keycode == 68 && shift_key) { // d
-                               if (!Element.visible("debug_output")) {
-                                       Element.show("debug_output");
-                                       console.log('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");
@@ -1380,7 +1044,7 @@ function pref_hotkey_handler(e) {
                                for (var i = 0; i < search_boxes.length; i++) {
                                        var elem = $(search_boxes[i]);
                                        if (elem) {
-                                               focus_element(search_boxes[i]);
+                                               $(search_boxes[i]).focus();
                                                return false;
                                        }
                                }
@@ -1412,7 +1076,7 @@ function pref_hotkey_handler(e) {
                        }
 
                        if (keycode == 84 && shift_key) { // T
-                               displayDlg('feedBrowser');
+                               feedBrowser();
                                return false;
                        }
 
@@ -1456,8 +1120,7 @@ function pref_hotkey_handler(e) {
                }
 
                if ($("piggie")) {
-       
-                       if (seq.match("807371717369")) {
+                       if (seq.match("8073717369")) {
                                seq = "";
                                piggie(true);
                        } else {
@@ -1478,144 +1141,75 @@ function pref_hotkey_handler(e) {
 
 function editFeedCats() {
        try {
-               var query = "?op=pref-feeds&subop=editCats";
-
-               new Ajax.Request("backend.php", {
-                       parameters: 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 (f.CONFIRM_PASSWORD.value == "") {
-                               new Effect.Highlight(f.CONFIRM_PASSWORD);
-                               notify_error("Entered passwords do not match.");
-                               return false;
-                       }
-
-                       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;
-                       }
-
-               }
-
-               var query = Form.serialize("change_pass_form");
-       
-               notify_progress("Changing password...");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               if (transport.responseText.indexOf("ERROR: ") == 0) {
-                                       notify_error(transport.responseText.replace("ERROR: ", ""));
-                               } else {
-                                       notify_info(transport.responseText);
-                                       var warn = $("default_pass_warning");
-                                       if (warn) warn.style.display = "none";
+               var query = "backend.php?op=pref-feeds&subop=editCats";
+
+               if (dijit.byId("feedCatEditDlg"))
+                       dijit.byId("feedCatEditDlg").destroyRecursive();
+
+               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 (sel_rows.length > 0) {                      
+                                       var ok = confirm(__("Remove selected categories?"));
+                       
+                                       if (ok) {
+                                               notify_progress("Removing selected categories...", true);
+                               
+                                               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) {
+                                                               notify('');
+                                                               dialog.attr('content', transport.responseText);
+                                                               updateFeedList();
+                                                       } });
+                       
+                                       }
+                       
+                               } else {        
+                                       alert(__("No categories are selected."));                       
                                }
-               
-                               document.forms['change_pass_form'].reset();
-                       } });
-
-
-       } catch (e) {
-               exception_error("changeUserPassword", e);
-       }
-       
-       return false;
-}
+                       },
+                       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 pubRegenKey() {
-
-       try {
-               var ok = confirm(__("Replace current publishing address with a new one?"));
-       
-               if (ok) {
-       
-                       notify_progress("Trying to change address...", true);
-       
-                       var query = "?op=rpc&subop=regenPubKey";
-       
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               var new_link = transport.responseXML.getElementsByTagName("link")[0];
-       
-                                               var e = $('pub_feed_url');
-       
-                                               if (new_link) {
-                                                       e.href = new_link.firstChild.nodeValue;
-                                                       e.innerHTML = new_link.firstChild.nodeValue;
-       
-                                                       new Effect.Highlight(e);
-
-                                                       notify('');
-       
-                                               } else {
-                                                       notify_error("Could not change feed URL.");
-                                               }
-                               } });
-               }
-       } catch (e) {
-               exception_error("pubRegenKey", e);
-       }
-       return false;
+function showFeedsWithErrors() {
+       displayDlg('feedUpdateErrors');
 }
 
 function opmlRegenKey() {
@@ -1654,36 +1248,6 @@ function opmlRegenKey() {
        }
        return false;
 }
-function validatePrefsSave() {
-       try {
-
-               var ok = confirm(__("Save current configuration?"));
-
-               if (ok) {
-
-                       var query = Form.serialize("pref_prefs_form");
-                       query = query + "&subop=save-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);
-                                       }
-                       } });
-
-               }
-
-       } catch (e) {
-               exception_error("validatePrefsSave", e);
-       }
-
-       return false;
-}
 
 function feedActionChange() {
        try {
@@ -1796,344 +1360,337 @@ function rescore_all_feeds() {
        }
 }
 
-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 = "?op=pref-filters&subop=remove&ids="+
-                               param_escape(id);
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               filterlist_callback2(transport);
-                       } });
-
-               }
-
-       } catch (e) {
-               exception_error("removeFilter", e);
-       }
-
-       return false;
-}
-
-/*function unsubscribeFeed(id, title) {
+               if (labels.length > 0) {
+                       var ok = confirm(__("Reset selected labels to default colors?"));
 
-       try {
+                       if (ok) {
+                               var query = "?op=pref-labels&subop=color-reset&ids="+
+                                       param_escape(labels.toString());
 
-               var msg = __("Unsubscribe from %s?").replace("%s", title);
-       
-               var ok = confirm(msg);
-       
-               if (ok) {
-                       closeInfoBox();
-       
-                       notify_progress("Removing feed...");
-               
-                       var query = "?op=pref-feeds&subop=remove&ids="+
-                               param_escape(id);
-       
-                       new Ajax.Request("backend.php", {
+                               new Ajax.Request("backend.php", {
                                        parameters: query,
                                        onComplete: function(transport) {
-                                                       feedlist_callback2(transport);
-                               } });
-               }
-       
-       } catch (e) {
-               exception_error("unsubscribeFeed", e);
-       }
-
-       return false;
-
-} */
-
-function feedsEditSave() {
-       try {
-
-               var ok = confirm(__("Save changes to selected feeds?"));
-
-               if (ok) {
-
-                       var f = document.forms["batch_edit_feed_form"];
-
-                       var query = Form.serialize("batch_edit_feed_form");
-
-                       /* Form.serialize ignores unchecked checkboxes */
-
-                       if (!query.match("&rtl_content=") && 
-                                       f.rtl_content.disabled == false) {
-                               query = query + "&rtl_content=false";
-                       }
-
-                       if (!query.match("&private=") && 
-                                       f.private.disabled == false) {
-                               query = query + "&private=false";
-                       }
-
-                       if (!query.match("&cache_images=") && 
-                                       f.cache_images.disabled == false) {
-                               query = query + "&cache_images=false";
-                       }
-
-                       if (!query.match("&include_in_digest=") && 
-                                       f.include_in_digest.disabled == false) {
-                               query = query + "&include_in_digest=false";
+                                               labellist_callback2(transport);
+                                       } });
                        }
-       
-                       closeInfoBox();
-       
-                       notify_progress("Saving feeds...");
-       
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       feedlist_callback2(transport); 
-                               } });
 
+               } else {
+                       alert(__("No labels are selected."));
                }
 
-               return false;
        } catch (e) {
-               exception_error("feedsEditSave", e);
+               exception_error("labelColorReset", e);
        }
 }
 
-function batchFeedsToggleField(cb, elem, label) {
-       try {
-               var f = document.forms["batch_edit_feed_form"];
-               var l = $(label);
-
-               if (cb.checked) {
-                       f[elem].disabled = false;
-
-                       if (l) {
-                               l.className = "";
-                       };
-
-//                     new Effect.Highlight(f[elem], {duration: 1, startcolor: "#fff7d5",
-//                             queue: { position:'end', scope: 'BPEFQ', limit: 1 } } );
-
-               } else {
-                       f[elem].disabled = true;
-
-                       if (l) {
-                               l.className = "insensitive";
-                       };
 
-               }
-       } catch (e) {
-               exception_error("batchFeedsToggleField", e);
-       }
+function inPreferences() {
+       return true;
 }
 
-function labelColorReset() {
+function editProfiles() {
        try {
-               var labels = getSelectedLabels();
 
-               var ok = confirm(__("Reset label colors to default?"));
+               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);
 
-               if (ok) {
+                                       var query = "?op=rpc&subop=addprofile&title=" + 
+                                               param_escape(dialog.attr('value').newprofile);
 
-                       var query = "?op=pref-labels&subop=color-reset&ids="+
-                               param_escape(labels.toString());
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       notify('');
+                                                       editProfiles();
+                                               } });
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               labellist_callback2(transport);
-                                       } });
-               }
+                               }
+                       },
+                       execute: function() {
+                               if (this.validate()) {
+                               }
+                       },
+                       href: query});
 
+               dialog.show();
        } catch (e) {
-               exception_error("labelColorReset", e);
+               exception_error("editProfiles", e);
        }
 }
 
-function labelColorAsk(id, kind) {
-       try {
+function activatePrefProfile() {
 
-               var p = null
+       var sel_rows = getSelectedFeedCats();
 
-               if (kind == "fg") {
-                       p = prompt(__("Please enter new label foreground color:"));
-               } else {
-                       p = prompt(__("Please enter new label background color:"));
-               }
+       if (sel_rows.length == 1) {
 
-               if (p != null) {
+               var ok = confirm(__("Activate selected profile?"));
 
-                       var query = "?op=pref-labels&subop=color-set&kind=" + kind +
-                               "&ids="+        param_escape(id) + "&color=" + param_escape(p);
+               if (ok) {
+                       notify_progress("Loading, please wait...");
+       
+                       var query = "?op=rpc&subop=setprofile&id="+
+                               param_escape(sel_rows.toString());
 
-                       selectPrefRows('label', false);
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       window.location.reload();
+                               } });
+               }
 
-                       var e = $("LICID-" + id);
+       } else {
+               alert(__("Please choose a profile to activate."));
+       }
 
-                       if (e) {                
-                               if (kind == "fg") {
-                                       e.style.color = p
-                               } else {
-                                       e.style.backgroundColor = p;
-                               }
-                       }
+       return false;
+}
 
-                       new Ajax.Request("backend.php", { parameters: query });
-               }
+function opmlImportDone() {
+       closeInfoBox();
+       updateFeedList();
+}
 
+function opmlImportHandler(iframe) {
+       try {
+               var tmp = new Object();
+               tmp.responseText = iframe.document.body.innerHTML;
+               notify('');
+               infobox_callback2(tmp);
        } catch (e) {
-               exception_error("labelColorReset", e);
+               exception_error("opml_import_handler", e);
        }
 }
 
+function clearFeedAccessKeys() {
 
-function colorPicker(id, fg, bg) {
-       try {
-               var picker = $("colorPicker-" + id);
+       var ok = confirm(__("This will invalidate all previously generated feed URLs. Continue?"));
 
-               if (picker) Element.show(picker);
+       if (ok) {
+               notify_progress("Clearing URLs...");
 
-       } catch (e) {
-               exception_error("colorPicker", e);
+               var query = "?op=rpc&subop=clearKeys";
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               notify_info("Generated URLs cleared.");
+                       } });
        }
+       
+       return false;
 }
 
-function colorPickerHideAll() {
+function handle_rpc_reply(transport, scheduled_call) {
        try {
-               if ($("prefLabelList")) {
+               if (transport.responseXML) {
 
-                       var elems = $("prefLabelList").getElementsByTagName("DIV");
+                       if (!transport_error_check(transport)) return false;
 
-                       for (var i = 0; i < elems.length; i++) {
-                               if (elems[i].id && elems[i].id.match("colorPicker-")) {
-                                       Element.hide(elems[i]);
-                               }
-                       }
+               } else {
+                       notify_error("Error communicating with server.");
                }
 
        } catch (e) {
-               exception_error("colorPickerHideAll", e);
+               exception_error("handle_rpc_reply", e, transport);
        }
+
+       return true;
 }
 
-function colorPickerDo(id, fg, bg) {
+function resetFeedOrder() {
        try {
+               notify_progress("Loading, please wait...");
 
-               var query = "?op=pref-labels&subop=color-set&kind=both"+
-                       "&ids=" + param_escape(id) + "&fg=" + param_escape(fg) + 
-                       "&bg=" + param_escape(bg);
-
-               var e = $("LICID-" + id);
-
-               if (e) {                
-                       e.style.color = fg;
-                       e.style.backgroundColor = bg;
-               }
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&subop=feedsortreset",
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
 
-               new Ajax.Request("backend.php", { parameters: query });
 
        } catch (e) {
-               exception_error("colorPickerDo", e);
+               exception_error("resetFeedOrder");
        }
 }
 
-function colorPickerActive(b) {
-       color_picker_active = b;
-}
-
-function mouse_down_handler(e) {
+function resetCatOrder() {
        try {
+               notify_progress("Loading, please wait...");
 
-               /* do not prevent right click */
-               if (e && e.button && e.button == 2) return;
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&subop=catsortreset",
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
 
-               if (selection_disabled) {
-                       document.onselectstart = function() { return false; };
-                       return false;
-               }
 
        } catch (e) {
-               exception_error("mouse_down_handler", e);
+               exception_error("resetCatOrder");
        }
 }
 
-function mouse_up_handler(e) {
+function editCat(id, item, event) {
        try {
-               mouse_is_down = false;
+               var new_name = prompt(__('Rename category to:'), item.name);
 
-               if (!selection_disabled) {
-                       document.onselectstart = null;
-               }
+               if (new_name && new_name != item.name) {
 
-               if (!color_picker_active) {
-                       colorPickerHideAll();
+                       notify_progress("Loading, please wait...");
+
+                       new Ajax.Request("backend.php", {
+                       parameters: {
+                               op: 'pref-feeds', 
+                               subop: 'renamecat',
+                               id: id,
+                               title: new_name,
+                       },
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
                }
 
        } catch (e) {
-               exception_error("mouse_up_handler", e);
+               exception_error("editCat", e);
        }
 }
 
-function inPreferences() {
-       return true;
-}
-
-function editProfiles() {
-       displayDlg('editPrefProfiles', false, function() {
-               init_profile_inline_editor();                   
-                       });
-}
+function editLabel(id, event) {
+       try {
+               var query = "backend.php?op=pref-labels&subop=edit&id=" +
+                       param_escape(id);
 
-function activatePrefProfile() {
+               if (dijit.byId("labelEditDlg"))
+                       dijit.byId("labelEditDlg").destroyRecursive();
 
-       var sel_rows = getSelectedFeedCats();
+               dialog = new dijit.Dialog({
+                       id: "labelEditDlg",
+                       title: __("Label Editor"),
+                       style: "width: 600px",
+                       setLabelColor: function(id, fg, bg) {
 
-       if (sel_rows.length == 1) {
-
-               var ok = confirm(__("Activate selected profile?"));
+                               var kind = '';
+                               var color = '';
+               
+                               if (fg && bg) {
+                                       kind = 'both';
+                               } else if (fg) {
+                                       kind = 'fg';
+                                       color = fg;
+                               } else if (bg) {
+                                       kind = 'bg';
+                                       color = bg;
+                               }
+               
+                               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);
+               
+               //              console.log(query);
+               
+                               var e = $("LICID-" + id);
+               
+                               if (e) {                
+                                       if (fg) e.style.color = fg;
+                                       if (bg) e.style.backgroundColor = bg;
+                               }
+               
+                               new Ajax.Request("backend.php", { parameters: query });
 
-               if (ok) {
-                       notify_progress("Loading, please wait...");
-       
-                       var query = "?op=rpc&subop=setprofile&id="+
-                               param_escape(sel_rows.toString());
+                               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});
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       window.location.reload();
-                               } });
-               }
+               dialog.show();
 
-       } else {
-               alert(__("Please choose a profile to activate."));
+       } catch (e) {
+               exception_error("editLabel", e);
        }
-
-       return false;
 }
 
-function opmlImportDone() {
-       closeInfoBox();
-       updateFeedList();
-}
 
-function opmlImportHandler(iframe) {
-       try {
-               var tmp = new Object();
-               tmp.responseText = iframe.document.body.innerHTML;
-               notify('');
-               infobox_callback2(tmp);
-       } catch (e) {
-               exception_error("opml_import_handler", e);
-       }
-}