From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Wed, 1 Nov 2006 04:49:48 +0000 (+0100)
Subject: fix broken toolbar in combined view mode
X-Git-Tag: 1.2.5~11
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b2128f017e36b8b04fffd0419eb4a888a4080ad8;p=tt-rss.git

fix broken toolbar in combined view mode
---

diff --git a/functions.php b/functions.php
index 889274c4..36817172 100644
--- 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 16ff989c..f6917aaa 100644
--- 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];