]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
use dijit.form.Buttons in refactored filter/label dialogs
[tt-rss.git] / prefs.js
index 820c31eacccb56002873155d490f6cb4c4a20851..fdcf28e873cee2fde3d60254b88616ee48e3b1b3 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -1,50 +1,19 @@
 var active_feed_cat = false;
-var active_tab = false;
 
 var init_params = new Array();
 
 var caller_subop = false;
-var sanity_check_done = false;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
 
-var color_picker_active = false;
-var selection_disabled = false;
-var mouse_is_down = false;
-
-function replace_pubkey_callback(transport) {
-       try {   
-               var link = $("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 = $('prefContent');       
-               container.innerHTML=transport.responseText;
+               dijit.byId('feedConfigTab').attr('content', transport.responseText); 
+
                selectTab("feedConfig", true);
 
                if (caller_subop) {
@@ -55,71 +24,26 @@ function feedlist_callback2(transport) {
 
                        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 = $('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);
@@ -128,12 +52,9 @@ function labellist_callback2(transport) {
 
 function userlist_callback2(transport) {
        try {
-               var container = $('prefContent');
-               if (transport.readyState == 4) {
-                       container.innerHTML=transport.responseText;
-                       notify("");
-                       remove_splash();
-               }
+               dijit.byId('userConfigTab').attr('content', transport.responseText); 
+
+               notify("");
        } catch (e) {
                exception_error("userlist_callback2", e);
        }
@@ -141,10 +62,9 @@ function userlist_callback2(transport) {
 
 function prefslist_callback2(transport) {
        try {
-               var container = $('prefContent');
-               container.innerHTML=transport.responseText;
+               dijit.byId('genConfigTab').attr('content', transport.responseText); 
+
                notify("");
-               remove_splash();
        } catch (e) {
                exception_error("prefslist_callback2", e);
        }
@@ -154,35 +74,7 @@ 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 = $("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() {
+function init_profile_inline_editor() {
        try {
 
                if ($("prefFeedCatList")) {
@@ -190,24 +82,15 @@ function init_cat_inline_editor() {
 
                        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-", "");
+                                       var id = elems[i].id.replace("FCATT-", "");
                                                new Ajax.InPlaceEditor(elems[i],
-                                               'backend.php?op=pref-feeds&subop=editCats&action=save&cid=' + cat_id);
+                                               'backend.php?op=rpc&subop=saveprofile&id=' + 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);
+               exception_error("init_profile_inline_editor", e);
        }
 }
 
@@ -226,12 +109,13 @@ function updateFeedList(sort_key) {
                slat_checked = slat.checked;
        }
 
-       var query = "backend.php?op=pref-feeds" +
+       var query = "?op=pref-feeds" +
                "&sort=" + param_escape(sort_key) + 
                "&slat=" + param_escape(slat_checked) +
                "&search=" + param_escape(search);
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) { 
                        feedlist_callback2(transport); 
                } });
@@ -248,11 +132,12 @@ function updateUsersList(sort_key) {
                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, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
                                userlist_callback2(transport); 
                        } });
@@ -262,37 +147,6 @@ function updateUsersList(sort_key) {
        }
 }
 
-function addLabel() {
-
-       try {
-
-               var caption = prompt(__("Please enter label caption:"), "");
-       
-               if (caption == null) { 
-                       return false;
-               }
-       
-               if (caption == "") {
-                       alert(__("Can't create label: missing caption."));
-                       return false;
-               }
-       
-               // we can be called from some other tab
-               active_tab = "labelConfig";
-       
-               query = "backend.php?op=pref-labels&subop=add&caption=" + 
-                       param_escape(caption);
-       
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       infobox_submit_callback2(transport);
-                               } });
-
-       } catch (e) {
-               exception_error("addLabel", e);
-       }
-}
-
 function addFeed() {
 
        try {
@@ -306,10 +160,11 @@ function addFeed() {
                } else {
                        notify_progress("Adding feed...");
        
-                       var query = "backend.php?op=pref-feeds&subop=add&from=tt-rss&feed_url=" +
+                       var query = "?op=pref-feeds&subop=add&from=tt-rss&feed_url=" +
                                param_escape(link.value);
        
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                feedlist_callback2(transport);
                                        } });
@@ -324,6 +179,28 @@ function addFeed() {
 
 }
 
+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");
@@ -333,15 +210,16 @@ function addFeedCat() {
        } else {
                notify_progress("Adding feed category...");
 
-               var query = "backend.php?op=pref-feeds&subop=editCats&action=add&cat=" +
+               var query = "?op=pref-feeds&subop=editCats&action=add&cat=" +
                        param_escape(cat.value);
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
-                                       infobox_feed_cat_callback2(transport);
+                                       infobox_callback2(transport);
                                } });
 
-               link.value = "";
+               cat.value = "";
 
        }
 }
@@ -363,10 +241,11 @@ function addUser() {
        
                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, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
                                userlist_callback2(transport); 
                        } });
@@ -376,79 +255,98 @@ 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) {
-
+function editFilter(id, event) {
        try {
 
-               disableHotkeys();
-
-               notify_progress("Loading, please wait...");
-
-               disableContainerChildren("filterOpToolbar", false);
+               var query = "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id);
+
+               if (dijit.byId("filterEditDlg"))
+                       dijit.byId("filterEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "filterEditDlg",
+                       title: __("Edit Filter"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       this.hide();
+                                       notify_progress("Savind data...", true);
+                                       new Ajax.Request("backend.php", {
+                                               parameters: dojo.objectToQuery(this.attr('value')),
+                                               onComplete: function(transport) {
+                                                       updateFilterList();                             
+                                       }});
+                               }
+                       },
+                       href: query});
 
-               selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
-               selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
+               dialog.show();
 
-               var query = "backend.php?op=pref-filters&subop=edit&id=" + 
-                       param_escape(id);
 
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                               } });
        } catch (e) {
                exception_error("editFilter", e);
        }
 }
 
-function editFeed(feed) {
+function editFeed(feed, event) {
 
        try {
 
-               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);
+               if (event && !event.ctrlKey) {
+
+                       notify_progress("Loading, please wait...");
+
+//                     selectTableRows('prefFeedList', 'none');        
+//                     selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
        
-               var query = "backend.php?op=pref-feeds&subop=editfeed&id=" +
-                       param_escape(feed);
+                       var query = "?op=pref-feeds&subop=editfeed&id=" +
+                               param_escape(feed);
        
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                               } });
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                               infobox_callback2(transport);
+                                               document.forms["edit_feed_form"].title.focus();
+                                       } });
+
+               } else if (event.ctrlKey) {
+//                     var cb = $('FRCHK-' + feed);
+//                     cb.checked = !cb.checked;
+//                     toggleSelectRow(cb);
+               }
+
 
        } catch (e) {
                exception_error("editFeed", e);
@@ -456,23 +354,48 @@ function editFeed(feed) {
 }
 
 function getSelectedLabels() {
-       return getSelectedTableRowIds("prefLabelList", "LILRR");
+       var tree = dijit.byId("labelTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
 }
 
 function getSelectedUsers() {
-       return getSelectedTableRowIds("prefUserList", "UMRR");
+       return getSelectedTableRowIds("prefUserList");
 }
 
 function getSelectedFeeds() {
-       return getSelectedTableRowIds("prefFeedList", "FEEDR");
+       var tree = dijit.byId("feedTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
 }
 
 function getSelectedFilters() {
-       return getSelectedTableRowIds("prefFilterList", "FILRR");
+       var tree = dijit.byId("filterTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
+
 }
 
 function getSelectedFeedCats() {
-       return getSelectedTableRowIds("prefFeedCatList", "FCATR");
+       return getSelectedTableRowIds("prefFeedCatList");
 }
 
 
@@ -487,10 +410,11 @@ 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);
                                        } });
@@ -511,15 +435,16 @@ function removeSelectedUsers() {
        
                if (sel_rows.length > 0) {
        
-                       var ok = confirm(__("Remove selected users?"));
+                       var ok = confirm(__("Remove selected users? Neither default admin nor your account will be removed."));
        
                        if (ok) {
                                notify_progress("Removing selected users...");
                
-                               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, {
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) { 
                                                userlist_callback2(transport); 
                                        } });
@@ -550,10 +475,11 @@ function removeSelectedFilters() {
                        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);
                                        } });
@@ -583,14 +509,17 @@ function removeSelectedFeeds() {
        
                        if (ok) {
        
-                               notify_progress("Unsubscribing from selected feeds...");
+                               notify_progress("Unsubscribing from selected feeds...", true);
                
-                               var query = "backend.php?op=pref-feeds&subop=remove&ids="+
+                               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();
                                                } });
                        }
        
@@ -643,12 +572,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('');
                                } });
@@ -663,6 +593,34 @@ function purgeSelectedFeeds() {
        return false;
 }
 
+function removeSelectedPrefProfiles() {
+
+       var sel_rows = getSelectedFeedCats();
+
+       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...");
+       
+                       var query = "?op=rpc&subop=remprofiles&ids="+
+                               param_escape(sel_rows.toString());
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       editProfiles();
+                               } });
+               }
+
+       } else {
+               alert(__("No profiles selected."));
+       }
+
+       return false;
+}
+
 function removeSelectedFeedCats() {
 
        var sel_rows = getSelectedFeedCats();
@@ -674,12 +632,13 @@ function removeSelectedFeedCats() {
                if (ok) {
                        notify_progress("Removing selected categories...");
        
-                       var query = "backend.php?op=pref-feeds&subop=editCats&action=remove&ids="+
+                       var query = "?op=pref-feeds&subop=editCats&action=remove&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);
+                                       infobox_callback2(transport);
                                } });
 
                }
@@ -694,18 +653,7 @@ function removeSelectedFeedCats() {
 }
 
 function feedEditCancel() {
-
-       try {
-               $("subscribe_to_feed_btn").disabled = false;
-               $("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;
 }
 
@@ -735,22 +683,12 @@ function feedEditSave() {
 }
 
 function userEditCancel() {
-
-       selectPrefRows('user', false); // cleanup feed selection
        closeInfoBox();
-
        return false;
 }
 
 function filterEditCancel() {
-
-       try {
-               $("create_filter_btn").disabled = false;
-               selectPrefRows('filter', false); // cleanup feed selection
-       } catch (e) { }
-
        closeInfoBox();
-
        return false;
 }
 
@@ -787,20 +725,44 @@ function userEditSave() {
 
 
 function filterEditSave() {
-
        try {
+               var reg_exp = document.forms["filter_edit_form"].reg_exp.value;
 
-               notify_progress("Saving filter...");
-       
-               var query = "backend.php?" + Form.serialize("filter_edit_form");
-       
-               closeInfoBox();
-       
-               $("create_filter_btn").disabled = false;
+               var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + param_escape(reg_exp);
+
+               notify_progress("Verifying regular expression...");
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
-                                               filterlist_callback2(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 {
+
+                                                       var query = "?" + Form.serialize("filter_edit_form");
+                                       
+                                                       notify_progress("Saving filter...");
+                       
+                                                       Form.disable("filter_edit_form");
+
+                                                       new Ajax.Request("backend.php", {
+                                                                       parameters: query,
+                                                                       onComplete: function(transport) {
+                                                                                       closeInfoBox();
+                                                                                       filterlist_callback2(transport);
+                                                               } });
+                                               }
+                                       }
                        } });
 
        } catch (e) {
@@ -852,10 +814,11 @@ function resetSelectedUserPass() {
                
                        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, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        userlist_callback2(transport); 
                                } });
@@ -887,9 +850,10 @@ function selectedUserDetails() {
        
                var id = rows[0];
        
-               var query = "backend.php?op=pref-users&subop=user-details&id=" + id;
+               var query = "?op=pref-users&subop=user-details&id=" + id;
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
                                } });
@@ -928,13 +892,12 @@ function editSelectedFeed() {
        }
 
        if (rows.length > 1) {
-               alert(__("Please select one feed."));
-               return;
+               return editSelectedFeeds();
        }
 
        notify("");
 
-       editFeed(rows[0]);
+       editFeed(rows[0], {});
 
 }
 
@@ -950,14 +913,13 @@ function editSelectedFeeds() {
        
                notify("");
        
-               disableHotkeys();
-       
-               notify_progress("Loading, please wait...");
+               notify_progress("Loading, please wait...", true);
        
-               var query = "backend.php?op=pref-feeds&subop=editfeeds&ids=" +
+               var query = "?op=pref-feeds&subop=editfeeds&ids=" +
                        param_escape(rows.toString());
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
                                } });
@@ -969,7 +931,7 @@ function editSelectedFeeds() {
 
 function piggie(enable) {
        if (enable) {
-               debug("I LOVEDED IT!");
+               console.log("I LOVEDED IT!");
                var piggie = $("piggie");
 
                Element.show(piggie);
@@ -979,7 +941,7 @@ function piggie(enable) {
        }
 }
 
-function validateOpmlImport() {
+function opmlImport() {
        
        var opml_file = $("opml_file");
 
@@ -987,6 +949,7 @@ function validateOpmlImport() {
                alert(__("No OPML file to upload."));
                return false;
        } else {
+               notify_progress("Importing, please wait...", true);
                return true;
        }
 }
@@ -998,11 +961,12 @@ function updateFilterList(sort_key) {
                var search = "";
                if (filter_search) { search = filter_search.value; }
        
-               var query = "backend.php?op=pref-filters&sort=" + 
+               var query = "?op=pref-filters&sort=" + 
                        param_escape(sort_key) + 
                        "&search=" + param_escape(search);
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                filterlist_callback2(transport);
                        } });
@@ -1021,11 +985,12 @@ function updateLabelList(sort_key) {
                var search = "";
                if (label_search) { search = label_search.value; }
        
-               var query = "backend.php?op=pref-labels&sort=" + 
+               var query = "?op=pref-labels&sort=" + 
                        param_escape(sort_key) +
                        "&search=" + param_escape(search);
        
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                labellist_callback2(transport);
                        } });
@@ -1037,9 +1002,10 @@ function updateLabelList(sort_key) {
 
 function updatePrefsList() {
 
-       var query = "backend.php?op=pref-prefs";
+       var query = "?op=pref-prefs";
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) { 
                        prefslist_callback2(transport); 
                } });
@@ -1047,23 +1013,11 @@ function updatePrefsList() {
 }
 
 function selectTab(id, noupdate, subop) {
-
-//     alert(id);
-
-       if (!id) id = active_tab;
-
        try {
 
-               try {
-                       if (id != active_tab) {
-                               var c = $('prefContent');       
-                               c.scrollTop = 0;
-                       }
-               } catch (e) { };
-
                if (!noupdate) {
 
-                       debug("selectTab: " + id + "(NU: " + noupdate + ")");
+                       console.log("selectTab: " + id + "(NU: " + noupdate + ")");
        
                        notify_progress("Loading, please wait...");
        
@@ -1087,184 +1041,108 @@ function selectTab(id, noupdate, subop) {
                        } else if (id == "userConfig") {
                                updateUsersList();
                        }
+
+                       var tab = dijit.byId(id + "Tab");
+                       dijit.byId("pref-tabs").selectChild(tab);
+
                }
 
                /* clean selection from all tabs */
        
-               var tabs_holder = $("prefTabs");
-               var tab = tabs_holder.firstChild;
-
-               while (tab) {
-                       if (tab.className && tab.className.match("prefsTabSelected")) {
-                               tab.className = "prefsTab";
-                       }
-                       tab = tab.nextSibling;
-               }
+               $$("#prefTabs div").invoke('removeClassName', 'Selected');
 
                /* mark new tab as selected */
 
-               tab = $(id + "Tab");
-       
-               if (tab) {
-                       if (!tab.className.match("Selected")) {
-                               tab.className = tab.className + "Selected";
-                       }
-               }
+               $(id + "Tab").addClassName("Selected");
        
-               active_tab = id;
-
        } catch (e) {
                exception_error("selectTab", e);
        }
 }
 
-function backend_sanity_check_callback2(transport) {
+function init_second_stage() {
 
        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;
-               }
+               document.onkeydown = pref_hotkey_handler;
 
-               var reply = transport.responseXML.firstChild.firstChild;
+               caller_subop = getURLParam('subop');
 
-               if (!reply) {
-                       fatalError(3, "Sanity Check: Invalid RPC reply", transport.responseText);
-                       return;
+               if (getURLParam("subopparam")) {
+                       caller_subop = caller_subop + ":" + getURLParam("subopparam");
                }
 
-               var error_code = reply.getAttribute("error-code");
-       
-               if (error_code && error_code != 0) {
-                       return fatalError(error_code, reply.getAttribute("error-msg"));
-               }
+               loading_set_progress(50);
 
-               debug("sanity check ok");
+               notify("");
 
-               var params = reply.nextSibling;
+               dojo.addOnLoad(function() {
 
-               if (params) {
-                       debug('reading init-params...');
-                       var param = params.firstChild;
+                       var tab = getURLParam('tab');
 
-                       while (param) {
-                               var k = param.getAttribute("key");
-                               var v = param.getAttribute("value");
-                               debug(k + " => " + v);
-                               init_params[k] = v;                                     
-                               param = param.nextSibling;
+                       if (tab) {
+                               tab = dijit.byId(tab + "Tab");
+                               if (tab) dijit.byId("pref-tabs").selectChild(tab);
                        }
-               }
 
-               sanity_check_done = true;
+                       });
 
-               init_second_stage();
+               setTimeout("hotkey_prefix_timeout()", 5*1000);
 
        } catch (e) {
-               exception_error("backend_sanity_check_callback", e);
+               exception_error("init_second_stage", e);
        }
 }
 
-function init_second_stage() {
+function init() {
 
        try {
-               active_tab = getInitParam("prefs_active_tab");
-               if (!$(active_tab+"Tab")) active_tab = "genConfig";
-               if (!active_tab || active_tab == '0') active_tab = "genConfig";
+       
+               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.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);
 
-               document.onkeydown = pref_hotkey_handler;
-               document.onmousedown = mouse_down_handler;
-               document.onmouseup = mouse_up_handler;
+                       new Ajax.Request("backend.php", {
+                               parameters: {op: "rpc", subop: "sanityCheck"},
+                                       onComplete: function(transport) { 
+                                       backend_sanity_check_callback(transport);
+                               } });
+               });
 
-               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);
-               }
-               notify("");
-
-               loading_set_progress(60);
-
-               setTimeout("hotkey_prefix_timeout()", 5*1000);
-
-       } 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 = $("sfeed_set_fcat");
-       var cat_id = cat_sel[cat_sel.selectedIndex].value;
-
-       if (sel_rows.length > 0) {
-
-               notify_progress("Changing category of selected feeds...");
-
-               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."));
-
-       }
-
-}
+       } catch (e) {
+               exception_error("init", e);
+       }
+}
 
 function validatePrefsReset() {
        try {
@@ -1274,136 +1152,30 @@ function validatePrefsReset() {
 
                        var query = Form.serialize("pref_prefs_form");
                        query = query + "&subop=reset-config";
-                       debug(query);
+                       console.log(query);
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
-                                       prefs_reset_callback2(transport);
+                                       var msg = transport.responseText;
+                                       if (msg.match("PREFS_THEME_CHANGED")) {
+                                               window.location.reload();
+                                       } else {
+                                               notify_info(msg);
+                                               selectTab();
+                                       }
                                } });
 
                }
 
        } catch (e) {
-               exception_error("validatePrefsSave", e);
+               exception_error("validatePrefsReset", e);
        }
 
        return false;
 
 }
 
-function feedBrowserSubscribe() {
-       try {
-
-               var selected = getSelectedFeedsFromBrowser();
-
-               if (selected.length > 0) {
-                       closeInfoBox();
-
-                       var query = "backend.php?op=pref-feeds&subop=massSubscribe&ids="+
-                               param_escape(selected.toString());
-
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) { 
-                                       feedlist_callback2(transport); 
-                               } });
-
-               } else {
-                       alert(__("No feeds are selected."));
-               }
-
-       } catch (e) {
-               exception_error("feedBrowserSubscribe", e);
-       }
-}
-
-function updateBigFeedBrowserBtn() {
-       notify_progress("Loading, please wait...");
-       return updateBigFeedBrowser();
-}
-
-function selectPrefRows(kind, select) {
-
-       if (kind) {
-               var opbarid = false;    
-               var nchk = false;
-               var nrow = false;
-               var lname = false;
-
-               if (kind == "feed") {
-                       opbarid = "feedOpToolbar";
-                       nrow = "FEEDR-";
-                       nchk = "FRCHK-";                        
-                       lname = "prefFeedList";
-               } else if (kind == "fcat") {
-                       opbarid = "catOpToolbar";
-                       nrow = "FCATR-";
-                       nchk = "FCCHK-";
-                       lname = "prefFeedCatList";
-               } else if (kind == "filter") {
-                       opbarid = "filterOpToolbar";
-                       nrow = "FILRR-";
-                       nchk = "FICHK-";
-                       lname = "prefFilterList";
-               } else if (kind == "label") {
-                       opbarid = "labelOpToolbar";
-                       nrow = "LILRR-";
-                       nchk = "LICHK-";
-                       lname = "prefLabelList";
-               } else if (kind == "user") {
-                       opbarid = "userOpToolbar";
-                       nrow = "UMRR-";
-                       nchk = "UMCHK-";
-                       lname = "prefUserList";
-               }
-
-               if (opbarid) {
-                       selectTableRowsByIdPrefix(lname, nrow, nchk, select);
-                       disableContainerChildren(opbarid, !select);
-               }
-
-       } 
-}
-
-
-function toggleSelectPrefRow(sender, kind) {
-
-       toggleSelectRow(sender);
-
-       if (kind) {
-               var opbarid = false;    
-               var nsel = -1;
-               
-               if (kind == "feed") {
-                       opbarid = "feedOpToolbar";
-                       nsel = getSelectedFeeds();
-               } else if (kind == "fcat") {
-                       opbarid = "catOpToolbar";
-                       nsel = getSelectedFeedCats();
-               } else if (kind == "filter") {
-                       opbarid = "filterOpToolbar";
-                       nsel = getSelectedFilters();
-               } else if (kind == "label") {
-                       opbarid = "labelOpToolbar";
-                       nsel = getSelectedLabels();
-               } else if (kind == "user") {
-                       opbarid = "userOpToolbar";
-                       nsel = getSelectedUsers();
-               }
-
-               if (opbarid && nsel != -1) {
-                       disableContainerChildren(opbarid, nsel == false);
-               }
-
-       } 
-}
-
-function toggleSelectFBListRow(sender) {
-       toggleSelectListRow(sender);
-       disableContainerChildren("fbrOpToolbar", getSelectedFeedsFromBrowser() == 0);
-}
-
-var seq = "";
 
 function pref_hotkey_handler(e) {
        try {
@@ -1431,17 +1203,23 @@ function pref_hotkey_handler(e) {
                        if (Element.visible("hotkey_help_overlay")) {
                                Element.hide("hotkey_help_overlay");
                        }
-                       colorPickerHideAll();
                        hotkey_prefix = false;
                        closeInfoBox();
                } 
 
-               if (!hotkeys_enabled) {
-                       debug("hotkeys disabled");
+               var dialog = dijit.byId("infoBox");
+               var dialog_visible = false;
+
+               if (dialog)
+                       dialog_visible = Element.visible(dialog.domNode);
+
+               if (dialog_visible || !hotkeys_enabled) {
+                       console.log("hotkeys disabled");
                        return;
                }
 
                if (keycode == 16) return; // ignore lone shift
+               if (keycode == 17) return; // ignore lone ctrl
 
                if ((keycode == 67 || keycode == 71) && !hotkey_prefix) {
                        hotkey_prefix = keycode;
@@ -1454,7 +1232,7 @@ function pref_hotkey_handler(e) {
                        cmdline.innerHTML = keychar;
                        Element.show(cmdline);
 
-                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
+                       console.log("KP: PREFIX=" + keycode + " CHAR=" + keychar);
                        return;
                }
 
@@ -1474,16 +1252,6 @@ function pref_hotkey_handler(e) {
 
                if (!hotkey_prefix) {
 
-                       if (keycode == 68 && shift_key) { // d
-                               if (!Element.visible("debug_output")) {
-                                       Element.show("debug_output");
-                                       debug('debug mode activated');
-                               } else {
-                                       Element.hide("debug_output");
-                               }
-                               return;
-                       }
-       
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
                                        //Element.show("hotkey_help_overlay");
@@ -1501,7 +1269,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;
                                        }
                                }
@@ -1514,20 +1282,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
                        }
@@ -1538,7 +1301,7 @@ function pref_hotkey_handler(e) {
                        }
 
                        if (keycode == 84 && shift_key) { // T
-                               browseFeeds();
+                               displayDlg('feedBrowser');
                                return false;
                        }
 
@@ -1582,8 +1345,7 @@ function pref_hotkey_handler(e) {
                }
 
                if ($("piggie")) {
-       
-                       if (seq.match("807371717369")) {
+                       if (seq.match("8073717369")) {
                                seq = "";
                                piggie(true);
                        } else {
@@ -1592,9 +1354,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) {
@@ -1604,19 +1366,14 @@ function pref_hotkey_handler(e) {
 
 function editFeedCats() {
        try {
-               $("subscribe_to_feed_btn").disabled = true;
-       
-               try {
-                       $("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";
+               var query = "?op=pref-feeds&subop=editCats";
+
+               notify_progress("Loading, please wait...");
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
-                               infobox_feed_cat_callback2(transport);
+                               infobox_callback2(transport);
                        } });
        } catch (e) {
                exception_error("editFeedCats", e);
@@ -1663,12 +1420,20 @@ function changeUserPassword() {
 
                var query = Form.serialize("change_pass_form");
        
-               notify_progress("Trying to change password...");
+               notify_progress("Changing password...");
 
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) { 
-                               changepass_callback2(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";
+                               }
+               
+                               document.forms['change_pass_form'].reset();
                        } });
 
 
@@ -1685,7 +1450,7 @@ function changeUserEmail() {
 
                var query = Form.serialize("change_email_form");
        
-               notify_progress("Trying to change e-mail...");
+               notify_progress("Saving...");
        
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -1701,31 +1466,42 @@ function changeUserEmail() {
 
 }
 
-function feedlistToggleSLAT() {
-       notify_progress("Loading, please wait...");
-       updateFeedList()
-}
-
-function pubRegenKey() {
+function opmlRegenKey() {
 
-       var ok = confirm(__("Replace current publishing address with a new one?"));
-
-       if (ok) {
-
-               notify_progress("Trying to change address...");
-
-               var query = "backend.php?op=rpc&subop=regenPubKey";
+       try {
+               var ok = confirm(__("Replace current OPML publishing address with a new one?"));
+       
+               if (ok) {
+       
+                       notify_progress("Trying to change address...", true);
+       
+                       var query = "?op=rpc&subop=regenOPMLKey";
+       
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                               var new_link = transport.responseXML.getElementsByTagName("link")[0];
+       
+                                               var e = $('pub_opml_url');
+       
+                                               if (new_link) {
+                                                       e.href = new_link.firstChild.nodeValue;
+                                                       e.innerHTML = new_link.firstChild.nodeValue;
+       
+                                                       new Effect.Highlight(e);
 
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       replace_pubkey_callback(transport);
+                                                       notify('');
+       
+                                               } else {
+                                                       notify_error("Could not change feed URL.");
+                                               }
                                } });
-
+               }
+       } catch (e) {
+               exception_error("opmlRegenKey", e);
        }
-
        return false;
 }
-
 function validatePrefsSave() {
        try {
 
@@ -1735,12 +1511,17 @@ function validatePrefsSave() {
 
                        var query = Form.serialize("pref_prefs_form");
                        query = query + "&subop=save-config";
-                       debug(query);
+                       console.log(query);
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
-                               notify_callback2(transport); 
+                                       var msg = transport.responseText;
+                                       if (msg.match("PREFS_THEME_CHANGED")) {
+                                               window.location.reload();
+                                       } else {
+                                               notify_info(msg);
+                                       }
                        } });
 
                }
@@ -1807,9 +1588,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('');
                        } });
@@ -1829,10 +1611,11 @@ 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);
                        } });
@@ -1851,9 +1634,10 @@ 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);
                } });
@@ -1869,14 +1653,15 @@ function removeFilter(id, title) {
                var ok = confirm(msg);
        
                if (ok) {
-                       closeInfoBox();
-       
+                       dijit.byId("filterEditDlg").hide();
+
                        notify_progress("Removing filter...");
                
-                       var query = "backend.php?op=pref-filters&subop=remove&ids="+
+                       var query = "?op=pref-filters&subop=remove&ids="+
                                param_escape(id);
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                filterlist_callback2(transport);
                        } });
@@ -1890,36 +1675,6 @@ function removeFilter(id, title) {
        return false;
 }
 
-function unsubscribeFeed(id, title) {
-
-       try {
-
-               var msg = __("Unsubscribe from %s?").replace("%s", title);
-       
-               var ok = confirm(msg);
-       
-               if (ok) {
-                       closeInfoBox();
-       
-                       notify_progress("Removing feed...");
-               
-                       var query = "backend.php?op=pref-feeds&subop=remove&ids="+
-                               param_escape(id);
-       
-                       new Ajax.Request(query, {
-                                       onComplete: function(transport) {
-                                                       feedlist_callback2(transport);
-                               } });
-               }
-       
-       } catch (e) {
-               exception_error("unsubscribeFeed", e);
-       }
-
-       return false;
-
-}
-
 function feedsEditSave() {
        try {
 
@@ -1933,11 +1688,6 @@ function feedsEditSave() {
 
                        /* Form.serialize ignores unchecked checkboxes */
 
-                       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";
@@ -2012,10 +1762,11 @@ function labelColorReset() {
 
                if (ok) {
 
-                       var query = "backend.php?op=pref-labels&subop=color-reset&ids="+
+                       var query = "?op=pref-labels&subop=color-reset&ids="+
                                param_escape(labels.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                labellist_callback2(transport);
                                        } });
@@ -2026,127 +1777,254 @@ function labelColorReset() {
        }
 }
 
-function labelColorAsk(id, kind) {
+function setLabelColor(id, fg, bg) {
        try {
 
-               var p = null
+               var kind = '';
+               var color = '';
 
-               if (kind == "fg") {
-                       p = prompt(__("Please enter new label foreground color:"));
-               } else {
-                       p = prompt(__("Please enter new label background color:"));
+               if (fg && bg) {
+                       kind = 'both';
+               } else if (fg) {
+                       kind = 'fg';
+                       color = fg;
+               } else if (bg) {
+                       kind = 'bg';
+                       color = bg;
                }
 
-               if (p != null) {
+               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);
 
-                       var query = "backend.php?op=pref-labels&subop=color-set&kind=" + kind +
-                               "&ids="+        param_escape(id) + "&color=" + param_escape(p);
+//             console.log(query);
 
-                       selectPrefRows('label', false);
+               var e = $("LICID-" + id);
 
-                       var e = $("LICID-" + id);
+               if (e) {                
+                       if (fg) e.style.color = fg;
+                       if (bg) e.style.backgroundColor = bg;
+               }
 
-                       if (e) {                
-                               if (kind == "fg") {
-                                       e.style.color = p
-                               } else {
-                                       e.style.backgroundColor = p;
-                               }
-                       }
+               new Ajax.Request("backend.php", { parameters: query });
 
-                       new Ajax.Request(query);
-               }
+               updateFilterList();
 
        } catch (e) {
-               exception_error("labelColorReset", e);
+               exception_error("colorPickerDo", e);
        }
 }
 
+function inPreferences() {
+       return true;
+}
 
-function colorPicker(id, fg, bg) {
-       try {
-               var picker = $("colorPicker-" + id);
+function editProfiles() {
+       displayDlg('editPrefProfiles', false, function() {
+               init_profile_inline_editor();                   
+                       });
+}
 
-               if (picker) Element.show(picker);
+function activatePrefProfile() {
+
+       var sel_rows = getSelectedFeedCats();
+
+       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."));
+       }
+
+       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("colorPicker", e);
+               exception_error("opml_import_handler", e);
+       }
+}
+
+function clearFeedAccessKeys() {
+
+       var ok = confirm(__("This will invalidate all previously generated feed URLs. Continue?"));
+
+       if (ok) {
+               notify_progress("Clearing URLs...");
+
+               var query = "?op=rpc&subop=clearKeys";
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               notify_info("Generated URLs cleared.");
+                       } });
        }
+       
+       return false;
 }
 
-function 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 = "backend.php?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(query);
 
        } catch (e) {
-               exception_error("colorPickerDo", e);
+               exception_error("resetFeedOrder");
        }
 }
 
-function colorPickerActive(b) {
-       color_picker_active = b;
+function resetCatOrder() {
+       try {
+               notify_progress("Loading, please wait...");
+
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&subop=catsortreset",
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
+
+
+       } catch (e) {
+               exception_error("resetCatOrder");
+       }
 }
 
-function mouse_down_handler(e) {
+function editCat(id, item, event) {
        try {
+               var new_name = prompt(__('Rename category to:'), item.name);
 
-               /* do not prevent right click */
-               if (e && e.button && e.button == 2) return;
+               if (new_name && new_name != item.name) {
 
-               if (selection_disabled) {
-                       document.onselectstart = function() { return false; };
-                       return false;
+                       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_down_handler", e);
+               exception_error("editCat", e);
        }
 }
 
-function mouse_up_handler(e) {
+function editLabel(id, event) {
        try {
-               mouse_is_down = false;
+               var query = "backend.php?op=pref-labels&subop=edit&id=" +
+                       param_escape(id);
 
-               if (!selection_disabled) {
-                       document.onselectstart = null;
-               }
+               if (dijit.byId("labelEditDlg"))
+                       dijit.byId("labelEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "labelEditDlg",
+                       title: __("Label Editor"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       var caption = this.attr('value').id;
+                                       var caption = this.attr('value').caption;
+                                       var fg_color = this.attr('value').fg_color;
+                                       var bg_color = this.attr('value').bg_color;
+                                       var query = dojo.objectToQuery(this.attr('value'));
+
+                                       dijit.byId('labelTree').setNameById(id, caption);
+                                       setLabelColor(id, fg_color, bg_color);
+                                       this.hide();
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       updateFilterList();     
+                                       } });
+                               }
+                       },
+                       href: query});
 
-               if (!color_picker_active) {
-                       colorPickerHideAll();
-               }
+               dialog.show();
 
        } catch (e) {
-               exception_error("mouse_up_handler", e);
+               exception_error("editLabel", e);
        }
 }
 
+function editLabelSave() {
+       try {
+               var form = document.forms['label_edit_form'];
+
+               var id = form.id.value;
+               var caption = form.caption.value;
+               var fg_color = form.fg_color.value;
+               var bg_color = form.bg_color.value;
+
+               var query = Form.serialize('label_edit_form');
+
+               dijit.byId('labelTree').setNameById(id, caption);
+               setLabelColor(id, fg_color, bg_color);
+
+               closeInfoBox();
+               updateFilterList();
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                       } });
+
+       } catch (e) {
+               exception_error("editLabelSave", e);
+       }
+}