add updated triple-pane theme

[tt-rss.git] / tt-rss.js

diff --git a/tt-rss.js b/tt-rss.js
index 8b04eae617f670b0752060f77f46c95a553a2ab0..6d3cc73778139bad149da76ebce2d44a507ae2bd 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -202,10 +202,6 @@ function scheduleFeedUpdate(force) {
        query_str = query_str + "&omode=" + omode;
        query_str = query_str + "&uctr=" + global_unread;
 
-       var date = new Date();
-       var timestamp = Math.round(date.getTime() / 1000);
-       query_str = query_str + "&ts=" + timestamp
-
        debug("REFETCH query: " + query_str);
 
        new Ajax.Request("backend.php", {
@@ -234,10 +230,6 @@ function updateFeedList(silent, fetch) {
        if (getActiveFeedId() && !activeFeedIsCat()) {
                query_str = query_str + "&actid=" + getActiveFeedId();
        }
-
-       var date = new Date();
-       var timestamp = Math.round(date.getTime() / 1000);
-       query_str = query_str + "&ts=" + timestamp
        
        if (fetch) query_str = query_str + "&fetch=yes";
 
@@ -283,7 +275,6 @@ function viewCurrentFeed(subop) {
        if (getActiveFeedId() != undefined) {
                viewfeed(getActiveFeedId(), subop, activeFeedIsCat());
        } else {
-               disableContainerChildren("headlinesToolbar", false, document);
 //             viewfeed(-1, subop); // FIXME
        }
        return false; // block unneeded form submits
@@ -315,10 +306,6 @@ function resetSearch() {
        }
 }
 
-function searchCancel() {
-       closeInfoBox(true);
-}
-
 function search() {
        closeInfoBox(); 
        viewCurrentFeed(0, "");
@@ -367,8 +354,6 @@ function init() {
 
                init_gears();
 
-               disableContainerChildren("headlinesToolbar", true);
-
                Form.disable("main_toolbar_form");
 
                if (!genericSanityCheck()) 
@@ -431,7 +416,7 @@ function resize_headlines(delta_x, delta_y) {
                                4) + "px";
                        resize_grab.style.display = "block";
 
-                       resize_handle.src = "themes/"+getInitParam('theme')+"/images/resize_handle_vert.png";
+                       //resize_handle.src = "themes/"+getInitParam('theme')+"/images/resize_handle_vert.png";
                        resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
        
                } else {
@@ -541,13 +526,15 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcSearch") {
-                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+                               function() { 
+                                       document.forms['search_form'].query.focus();
+                               });
                        return;
                }
        
                if (opid == "qmcAddFeed") {
-                       displayDlg('quickAddFeed', '',
-                                          function () {$('feed_url').focus();});
+                       quickAddFeed();
                        return;
                }
 
@@ -579,31 +566,6 @@ function quickMenuGo(opid) {
                        return;
                }
 
-               if (opid == "qmcClearFeed") {
-                       var actid = getActiveFeedId();
-
-                       if (!actid) {
-                               alert(__("Please select some feed first."));
-                               return;
-                       }
-
-                       if (activeFeedIsCat() || actid < 0) {
-                               alert(__("You can't clear this type of feed."));
-                               return;
-                       }       
-
-                       var fn = getFeedName(actid);
-
-                       var pr = __("Erase all non-starred articles in %s?").replace("%s", fn);
-
-                       if (confirm(pr)) {
-                               clearFeedArticles(actid);
-                       }
-               
-                       return;
-               }
-       
-
                if (opid == "qmcUpdateFeeds") {
                        scheduleFeedUpdate(true);
                        return;
@@ -620,7 +582,8 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcAddFilter") {
-                       displayDlg("quickAddFilter", getActiveFeedId());
+                       displayDlg('quickAddFilter', '',
+                          function () {document.forms['filter_add_form'].reg_exp.focus();});
                }
 
                if (opid == "qmcAddLabel") {
@@ -663,27 +626,6 @@ function quickMenuGo(opid) {
        }
 }
 
-function unsubscribeFeed(feed_id, title) {
-
-
-       var msg = __("Unsubscribe from %s?").replace("%s", title);
-
-       if (title == undefined || confirm(msg)) {
-               notify_progress("Removing feed...");
-
-               var query = "?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       dlg_frefresh_callback(transport, feed_id);
-                               } });
-       }
-
-       return false;
-}
-
-
 function updateFeedTitle(t) {
        active_title_text = t;
        updateTitle();
@@ -827,6 +769,7 @@ function editFeedDlg(feed) {
                        parameters: query,
                        onComplete: function(transport) { 
                                infobox_callback2(transport); 
+                               document.forms["edit_feed_form"].title.focus();
                        } });
 
        } catch (e) {
@@ -858,7 +801,7 @@ function feedEditSave() {
                                dlg_frefresh_callback(transport); 
                        } });
 
-
+               cache_flush();
                closeInfoBox();
 
                return false;
@@ -868,28 +811,13 @@ function feedEditSave() {
        } 
 }
 
-function clearFeedArticles(feed_id) {
-
-       notify_progress("Clearing feed...");
-
-       var query = "?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
-
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) {
-                               dlg_frefresh_callback(transport, feed_id);
-                       } });
-
-       return false;
-}
-
 function collapse_feedlist() {
        try {
                debug("collapse_feedlist");
                
                var theme = getInitParam("theme");
-               if (theme != "" && theme != "compact" && theme != "graycube" &&
-                               theme != "old-skool") return;
+               if (theme != "" && 
+                               !getInitParam("theme_options").match("collapse_feedlist")) return;
 
                var fl = $("feeds-holder");
                var fh = $("headlines-frame");
@@ -952,12 +880,12 @@ function collapse_feedlist() {
 }
 
 function viewModeChanged() {
-       cache_empty();
+       cache_flush();
        return viewCurrentFeed(0, '')
 }
 
 function viewLimitChanged() {
-       cache_empty();
+       cache_flush();
        return viewCurrentFeed(0, '')
 }
 
@@ -1098,7 +1026,10 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 191 || keychar == '/') { // /
-                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+                                       function() { 
+                                               document.forms['search_form'].query.focus();
+                                       });
                                return false;
                        }
 
@@ -1284,7 +1215,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 83) { // s
-                               displayDlg("quickAddFeed");
+                               quickAddFeed();
                                return false;
                        }
 
@@ -1320,7 +1251,8 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 70) { // f
-                               displayDlg("quickAddFilter", getActiveFeedId());
+                               displayDlg('quickAddFilter', '',
+                                  function () {document.forms['filter_add_form'].reg_exp.focus();});
                                return false;
                        }
 
@@ -1421,41 +1353,6 @@ function feedsSortByUnread() {
        return feeds_sort_by_unread;
 }
 
-function addLabel() {
-
-       try {
-
-               var caption = prompt(__("Please enter label caption:"), "");
-
-               if (caption != undefined) {
-       
-                       if (caption == "") {
-                               alert(__("Can't create label: missing caption."));
-                               return false;
-                       }
-
-                       var query = "?op=pref-labels&subop=add&caption=" + 
-                               param_escape(caption);
-
-                       notify_progress("Loading, please wait...", true);
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       updateFeedList();
-                       } });
-
-               }
-
-       } catch (e) {
-               exception_error("addLabel", e);
-       }
-}
-
-function visitOfficialSite() {
-       window.open("http://tt-rss.org/");
-}
-
 function inPreferences() {
        return false;
 }