]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
experimental display of labelColorIndicators in FeedTree
[tt-rss.git] / prefs.js
index 0c627b21931ce03ee8e1aad187ad7997b0201108..4851611a384e8f9ca724690ad437d3d8e17d2f76 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -1,5 +1,3 @@
-var active_feed_cat = false;
-
 var init_params = new Array();
 
 var caller_subop = false;
@@ -25,7 +23,6 @@ function feedlist_callback2(transport) {
                        caller_subop = false;
                }
                notify("");
-               remove_splash();
 
        } catch (e) {
                exception_error("feedlist_callback2", e);
@@ -35,7 +32,6 @@ function feedlist_callback2(transport) {
 function filterlist_callback2(transport) {
        dijit.byId('filterConfigTab').attr('content', transport.responseText); 
        notify("");
-       remove_splash();
 }
 
 function labellist_callback2(transport) {
@@ -46,7 +42,6 @@ function labellist_callback2(transport) {
                closeInfoBox();
 
                notify("");
-               remove_splash();
 
        } catch (e) {
                exception_error("labellist_callback2", e);
@@ -58,7 +53,6 @@ function userlist_callback2(transport) {
                dijit.byId('userConfigTab').attr('content', transport.responseText); 
 
                notify("");
-               remove_splash();
        } catch (e) {
                exception_error("userlist_callback2", e);
        }
@@ -69,7 +63,6 @@ function prefslist_callback2(transport) {
                dijit.byId('genConfigTab').attr('content', transport.responseText); 
 
                notify("");
-               remove_splash();
        } catch (e) {
                exception_error("prefslist_callback2", e);
        }
@@ -79,54 +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 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) {
@@ -152,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_callback2(transport);
-                               } });
-
-               cat.value = "";
-
-       }
-}
-
 function addUser() {
 
        try {
@@ -293,63 +167,84 @@ function editUser(id, event) {
 }
 
 function editFilter(id, event) {
-
        try {
 
-               if (!event || !event.ctrlKey) {
+               var query = "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id);
 
-                       notify_progress("Loading, please wait...", true);
+               if (dijit.byId("filterEditDlg"))
+                       dijit.byId("filterEditDlg").destroyRecursive();
 
-                       var query = "?op=pref-filters&subop=edit&id=" + 
-                               param_escape(id);
-       
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               infobox_callback2(transport);
-                                               document.forms['filter_edit_form'].reg_exp.focus();
-                                       } });
-               } else if (event.ctrlKey) {
-                       var cb = $('FICHK-' + id);
-                       cb.checked = !cb.checked;
-                       toggleSelectRow(cb);
-               }
+               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();
 
-       } catch (e) {
-               exception_error("editFilter", e);
-       }
-}
+                                       notify_progress("Removing filter...");
+               
+                                       var id = this.attr('value').id;
 
-function editFeed(feed, event) {
+                                       var query = "?op=pref-filters&subop=remove&ids="+
+                                               param_escape(id);
 
-       try {
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       updateFilterList();
+                                               } });
+                               }
+                       },
 
-               if (event && !event.ctrlKey) {
+                       execute: function() {
+                               if (this.validate()) {
 
-                       notify_progress("Loading, please wait...");
+                                       var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + 
+                                               param_escape(dialog.attr('value').reg_exp);
 
-//                     selectTableRows('prefFeedList', 'none');        
-//                     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();
-                                       } });
+                                       notify_progress("Verifying regular expression...");
 
-               } else if (event.ctrlKey) {
-//                     var cb = $('FRCHK-' + feed);
-//                     cb.checked = !cb.checked;
-//                     toggleSelectRow(cb);
-               }
+                                       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();
 
 
        } catch (e) {
-               exception_error("editFeed", e);
+               exception_error("editFilter", e);
        }
 }
 
@@ -394,10 +289,9 @@ function getSelectedFilters() {
 
 }
 
-function getSelectedFeedCats() {
+/* function getSelectedFeedCats() {
        return getSelectedTableRowIds("prefFeedCatList");
-}
-
+} */
 
 function removeSelectedLabels() {
 
@@ -621,77 +515,11 @@ 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_callback2(transport);
-                               } });
-
-               }
-
-       } else {
-
-               alert(__("No categories are selected."));
-
-       }
-
-       return false;
-}
-
-function feedEditCancel() {
-       closeInfoBox();
-       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() {
        closeInfoBox();
        return false;
 }
 
-function filterEditCancel() {
-       closeInfoBox();
-       return false;
-}
-
 function userEditSave() {
 
        try {
@@ -724,55 +552,6 @@ function userEditSave() {
 }
 
 
-function filterEditSave() {
-       try {
-               var reg_exp = document.forms["filter_edit_form"].reg_exp.value;
-
-               var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + param_escape(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 {
-
-                                                       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) {
-               exception_error("filterEditSave", e);
-       }
-
-       return false;
-}
-
-
 function editSelectedUser() {
        var rows = getSelectedUsers();
 
@@ -913,16 +692,78 @@ function editSelectedFeeds() {
        
                notify("");
        
-               notify_progress("Loading, please wait...", true);
-       
-               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);
-                               } });
+               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);
@@ -946,7 +787,7 @@ 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);
@@ -954,81 +795,35 @@ function opmlImport() {
        }
 }
 
-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() {
+       new Ajax.Request("backend.php", {
+               parameters: "?op=pref-labels",
+               onComplete: function(transport) {
+                       labellist_callback2(transport);
+               } });
 }
 
-function updateLabelList(sort_key) {
+function updatePrefsList() {
+       new Ajax.Request("backend.php", {
+               parameters: "?op=pref-prefs",
+               onComplete: function(transport) { 
+                       prefslist_callback2(transport); 
+               } });
+}
 
+function selectTab(id, noupdate, subop) {
        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 updatePrefsList() {
-
-       var query = "?op=pref-prefs";
-
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) { 
-                       prefslist_callback2(transport); 
-               } });
-
-}
-
-function selectTab(id, noupdate, subop) {
-       try {
-
-               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 (!noupdate) {
+                       notify_progress("Loading, please wait...");
+                       closeInfoBox();
 
                        if (id == "feedConfig") {
                                updateFeedList();
@@ -1046,14 +841,6 @@ function selectTab(id, noupdate, subop) {
                        dijit.byId("pref-tabs").selectChild(tab);
 
                }
-
-               /* clean selection from all tabs */
-       
-               $$("#prefTabs div").invoke('removeClassName', 'Selected');
-
-               /* mark new tab as selected */
-
-               $(id + "Tab").addClassName("Selected");
        
        } catch (e) {
                exception_error("selectTab", e);
@@ -1061,7 +848,6 @@ function selectTab(id, noupdate, subop) {
 }
 
 function init_second_stage() {
-
        try {
 
                document.onkeydown = pref_hotkey_handler;
@@ -1072,23 +858,20 @@ function init_second_stage() {
                        caller_subop = caller_subop + ":" + getURLParam("subopparam");
                }
 
-               loading_set_progress(60);
+               loading_set_progress(50);
 
                notify("");
 
                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);
-               remove_splash();
 
        } catch (e) {
                exception_error("init_second_stage", e);
@@ -1105,7 +888,11 @@ function init() {
                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");
@@ -1117,6 +904,7 @@ function init() {
                dojo.require("dijit.tree.dndSource");
                dojo.require("dijit.InlineEditBox");
                dojo.require("dijit.ColorPalette");
+               dojo.require("dijit.ProgressBar"); 
 
                dojo.registerModulePath("lib", "..");
                dojo.registerModulePath("fox", "../..");
@@ -1126,15 +914,15 @@ function init() {
                dojo.require("fox.PrefFilterTree");
                dojo.require("fox.PrefLabelTree");
 
-               loading_set_progress(30);
-
-               var query = "?op=rpc&subop=sanityCheck";
+               dojo.addOnLoad(function() {
+                       loading_set_progress(50);
 
-               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);
@@ -1176,6 +964,7 @@ function validatePrefsReset() {
 
 function pref_hotkey_handler(e) {
        try {
+               if (e.target.nodeName == "INPUT") return;
 
                var keycode;
                var shift_key = false;
@@ -1204,17 +993,6 @@ function pref_hotkey_handler(e) {
                        closeInfoBox();
                } 
 
-               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
 
@@ -1298,7 +1076,7 @@ function pref_hotkey_handler(e) {
                        }
 
                        if (keycode == 84 && shift_key) { // T
-                               displayDlg('feedBrowser');
+                               feedBrowser();
                                return false;
                        }
 
@@ -1363,104 +1141,75 @@ function pref_hotkey_handler(e) {
 
 function editFeedCats() {
        try {
-               var query = "?op=pref-feeds&subop=editCats";
-
-               notify_progress("Loading, please wait...");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               infobox_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;
-                       }
+               var query = "backend.php?op=pref-feeds&subop=editCats";
 
-                       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;
-                       }
+               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."));                       
+                               }
+                       },
+                       addCategory: function() {
+                               if (this.validate()) {
+                                       notify_progress("Creating category...");
 
-               var query = Form.serialize("change_pass_form");
-       
-               notify_progress("Changing password...");
+                                       var query = "?op=pref-feeds&subop=editCats&action=add&cat=" +
+                                               param_escape(this.attr('value').newcat);
 
-               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";
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       notify('');
+                                                       dialog.attr('content', transport.responseText);
+                                                       updateFeedList();
+                                               } });
                                }
-               
-                               document.forms['change_pass_form'].reset();
-                       } });
+                       },
+                       execute: function() {
+                               if (this.validate()) {
+                               }
+                       },
+                       href: query});
 
+               dialog.show();
 
        } catch (e) {
-               exception_error("changeUserPassword", e);
+               exception_error("editFeedCats", e);
        }
-       
-       return false;
 }
 
-function changeUserEmail() {
-
-       try {
-
-               var query = Form.serialize("change_email_form");
-       
-               notify_progress("Saving...");
-       
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               notify_callback2(transport); 
-                       } });
-
-       } catch (e) {
-               exception_error("changeUserPassword", e);
-       }
-       
-       return false;
-
+function showFeedsWithErrors() {
+       displayDlg('feedUpdateErrors');
 }
 
 function opmlRegenKey() {
@@ -1499,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 {
@@ -1641,132 +1360,26 @@ function rescore_all_feeds() {
        }
 }
 
-function removeFilter(id, title) {
-
-       try {
-
-               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 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";
-                       }
-       
-                       closeInfoBox();
-       
-                       notify_progress("Saving feeds...");
-       
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       feedlist_callback2(transport); 
-                               } });
-
-               }
-
-               return false;
-       } catch (e) {
-               exception_error("feedsEditSave", 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 labelColorReset() {
        try {
                var labels = getSelectedLabels();
 
-               var ok = confirm(__("Reset label colors to default?"));
+               if (labels.length > 0) {
+                       var ok = confirm(__("Reset selected labels to default colors?"));
 
-               if (ok) {
-
-                       var query = "?op=pref-labels&subop=color-reset&ids="+
-                               param_escape(labels.toString());
+                       if (ok) {
+                               var query = "?op=pref-labels&subop=color-reset&ids="+
+                                       param_escape(labels.toString());
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) {
                                                labellist_callback2(transport);
                                        } });
+                       }
+
+               } else {
+                       alert(__("No labels are selected."));
                }
 
        } catch (e) {
@@ -1774,54 +1387,103 @@ function labelColorReset() {
        }
 }
 
-function setLabelColor(id, fg, bg) {
-       try {
 
-               var kind = '';
-               var color = '';
-
-               if (fg && bg) {
-                       kind = 'both';
-               } else if (fg) {
-                       kind = 'fg';
-                       color = fg;
-               } else if (bg) {
-                       kind = 'bg';
-                       color = bg;
-               }
+function inPreferences() {
+       return true;
+}
 
-               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);
+function editProfiles() {
+       try {
 
-//             console.log(query);
+               if (dijit.byId("profileEditDlg"))
+                       dijit.byId("profileEditDlg").destroyRecursive();
 
-               var e = $("LICID-" + id);
+               var query = "backend.php?op=dlg&id=editPrefProfiles";
 
-               if (e) {                
-                       if (fg) e.style.color = fg;
-                       if (bg) e.style.backgroundColor = bg;
-               }
+               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);
 
-               new Ajax.Request("backend.php", { parameters: query });
+                                       var query = "?op=rpc&subop=addprofile&title=" + 
+                                               param_escape(dialog.attr('value').newprofile);
 
-               updateFilterList();
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       notify('');
+                                                       editProfiles();
+                                               } });
 
+                               }
+                       },
+                       execute: function() {
+                               if (this.validate()) {
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
        } catch (e) {
-               exception_error("colorPickerDo", e);
+               exception_error("editProfiles", e);
        }
 }
 
-function inPreferences() {
-       return true;
-}
-
-function editProfiles() {
-       displayDlg('editPrefProfiles', false, function() {
-               init_profile_inline_editor();                   
-                       });
-}
-
 function activatePrefProfile() {
 
        var sel_rows = getSelectedFeedCats();
@@ -1961,45 +1623,74 @@ function editCat(id, item, event) {
 
 function editLabel(id, event) {
        try {
-               var query = "?op=pref-labels&subop=edit&id=" +
+               var query = "backend.php?op=pref-labels&subop=edit&id=" +
                        param_escape(id);
 
-               notify_progress("Loading, please wait...", true);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               infobox_callback2(transport);
-                       } });
-
-       } catch (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;
+               if (dijit.byId("labelEditDlg"))
+                       dijit.byId("labelEditDlg").destroyRecursive();
 
-               var query = Form.serialize('label_edit_form');
+               dialog = new dijit.Dialog({
+                       id: "labelEditDlg",
+                       title: __("Label Editor"),
+                       style: "width: 600px",
+                       setLabelColor: function(id, fg, bg) {
 
-               dijit.byId('labelTree').setNameById(id, caption);
-               setLabelColor(id, fg_color, bg_color);
+                               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 });
 
-               closeInfoBox();
-               updateFilterList();
+                               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) { 
-                       } });
+               dialog.show();
 
        } catch (e) {
-               exception_error("editLabelSave", e);
+               exception_error("editLabel", e);
        }
 }
+
+