fix broken toolbar in combined view mode

diff --git a/functions.php b/functions.php
index 889274c4e3ea07e1f725ab6d7af9bf74b17c4f11..368171727b4b16afeadb3da38a8586cdd06eba88 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -2672,7 +2672,11 @@
                                                                <a href=\"javascript:cdmSelectArticles('none')\">None</a>
                                                &nbsp;&nbsp;
                                                Toggle: <a href=\"javascript:selectionToggleUnread(true)\">Unread</a>,
-                                                               <a href=\"javascript:selectionToggleMarked(true)\">Starred</a>";
+                                                       <a href=\"javascript:selectionToggleMarked(true)\">Starred</a>
+                                               &nbsp;&nbsp;
+                                               Mark as read:
+                                                       <a href=\"#\" onclick=\"catchupPage()\">Page</a>,
+                                                       <a href=\"#\" onclick=\"catchupCurrentFeed()\">Feed</a>";
                        
                                print "</td>";
 

diff --git a/viewfeed.js b/viewfeed.js
index 16ff989c9cf8382aba4339cd462dcd1a4011250e..f6917aaaef0d283cab6f9e568ee7c84b41a02034 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -327,7 +327,7 @@ function selectionToggleMarked(cdm_mode) {
 
 function cdmGetSelectedArticles() {
        var sel_articles = new Array();
-       var container = document.getElementById("headlinesContainer");
+       var container = document.getElementById("headlinesInnerContainer");
 
        for (i = 0; i < container.childNodes.length; i++) {
                var child = container.childNodes[i];
@@ -343,7 +343,7 @@ function cdmGetSelectedArticles() {
 
 // mode = all,none,unread
 function cdmSelectArticles(mode) {
-       var container = document.getElementById("headlinesContainer");
+       var container = document.getElementById("headlinesInnerContainer");
 
        for (i = 0; i < container.childNodes.length; i++) {
                var child = container.childNodes[i];