headlines subtoolbar, misc api changes

backend.php

@@ -55,6 +55,13 @@
 
 	$fetch = $_GET["fetch"];
 
+	function getAllCounters($link) {
+		getLabelCounters($link);
+		getFeedCounters($link);
+		getTagCounters($link);
+		getGlobalCounters($link);
+	}	
+
 	/* FIXME this needs reworking */
 
 	function getGlobalCounters($link) {
@@ -408,10 +415,7 @@
 
 		if ($subop == "getAllCounters") {
 			print "<rpc-reply>";
-			getLabelCounters($link);
+			getAllCounters($link);
-			getFeedCounters($link);
-			getTagCounters($link);
-			getGlobalCounters($link);
 			print "</rpc-reply>";
 		}
 
@@ -466,18 +470,59 @@
 			print "</rpc-reply>";
 		}
 	
+		/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
 		if ($subop == "catchupSelected") {
 
 			$ids = split(",", $_GET["ids"]);
 
+			$cmode = sprintf("%d", $_GET["cmode"]);
+
 			foreach ($ids as $id) {
 
-				db_query($link, "UPDATE ttrss_user_entries SET unread=false,last_read = NOW()
+				if ($cmode == 0) {
-					WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+					db_query($link, "UPDATE ttrss_user_entries SET 
-
+					unread = false,last_read = NOW()
+					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+				} else if ($cmode == 1) {
+					db_query($link, "UPDATE ttrss_user_entries SET 
+					unread = true
+					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+				} else {
+					db_query($link, "UPDATE ttrss_user_entries SET 
+					unread = NOT unread,last_read = NOW()
+					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+				}
+			}
+			print "<rpc-reply>";
+			getAllCounters($link);
+			print "</rpc-reply>";
 		}
 
-			print "Marked active page as read.";
+		if ($subop == "markSelected") {
+
+			$ids = split(",", $_GET["ids"]);
+
+			$cmode = sprintf("%d", $_GET["cmode"]);
+
+			foreach ($ids as $id) {
+
+				if ($cmode == 0) {
+					db_query($link, "UPDATE ttrss_user_entries SET 
+					marked = false
+					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+				} else if ($cmode == 1) {
+					db_query($link, "UPDATE ttrss_user_entries SET 
+					marked = true
+					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+				} else {
+					db_query($link, "UPDATE ttrss_user_entries SET 
+					marked = NOT marked
+					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+				}
+			}
+			print "<rpc-reply>";
+			getAllCounters($link);
+			print "</rpc-reply>";
 		}
 
 		if ($subop == "sanityCheck") {
@@ -753,8 +798,6 @@
 
 		}
 
-		print "<table class=\"headlinesList\" id=\"headlinesList\" width=\"100%\">";
-
 		$search = $_GET["search"];
 
 		$search_mode = $_GET["smode"];
@@ -834,13 +877,77 @@
 			$query_strategy_part = "id > 0"; // dumb
 		}
 
-
 		$order_by = "updated DESC";
 
 //		if ($feed < -10) {
 //			$order_by = "feed_id,updated DESC";
 //		}
 
+		$feed_title = "";
+
+		if ($search && $search_mode == "All feeds") {
+			$feed_title = "Search results";
+		} else if (sprintf("%d", $feed) == 0) {
+			$feed_title = $feed;
+		} else if ($feed > 0) {
+			$result = db_query($link, "SELECT title,site_url FROM ttrss_feeds 
+				WHERE id = '$feed'");
+
+			$feed_title = db_fetch_result($result, 0, "title");
+			$feed_site_url = db_fetch_result($result, 0, "site_url");
+
+		} else if ($feed == -1) {
+			$feed_title = "Starred articles";
+		} else if ($feed < -10) {
+			$label_id = -$feed - 11;
+			$result = db_query($link, "SELECT description FROM ttrss_labels
+				WHERE id = '$label_id'");
+			$feed_title = db_fetch_result($result, 0, "description");
+		} else {
+			$feed_title = "?";
+		}
+
+		print "<table class=\"headlinesSubToolbar\" 
+			width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
+		
+		print "<td class=\"headlineActions\">
+			Select: 
+					<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 
+						'RROW-', 'RCHK-', true)\">All</a>,
+					<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 
+						'RROW-', 'RCHK-', true, 'Unread')\">Unread</a>,
+					<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 
+						'RROW-', 'RCHK-', false)\">None</a>
+			&nbsp;&nbsp;
+			Toggle: <a href=\"javascript:toggleUnread()\">Unread</a>,
+					<a href=\"javascript:toggleStarred()\">Starred</a>";
+
+/*		print "&nbsp;&nbsp;
+			View:
+				<a href=\"javascript:limitView('All')\">All</a>,
+				<a href=\"javascript:limitView('Unread')\">Unread</a>,
+				<a href=\"javascript:limitView('Starred')\">Starred</a>
+			&nbsp;&nbsp;
+			Feed:
+				<a href=\"javascript:updateCurrentFeed()\">Update</a>,
+				<a href=\"javascript:catchupCurrentFeed()\">Mark as read</a>"; */
+
+		print "</td>";
+
+		print "<td class=\"headlineTitle\">";
+
+		if ($feed_site_url) {
+			print "<a href=\"$feed_site_url\">$feed_title</a>";
+		} else {
+			print $feed_title;
+		}
+		
+		print "</td>";
+		print "</tr></table>";
+		
+		print "<table class=\"headlinesList\" id=\"headlinesList\" width=\"100%\">";
+
+
 		if ($feed < -10) error_reporting (0);
 
 		if (sprintf("%d", $feed) != 0) {
@@ -852,7 +959,9 @@
 			}
 
 			$result = db_query($link, "SELECT 
-					id,title,updated,unread,feed_id,marked,link,last_read,
+					id,title,
+					SUBSTRING(updated,1,16) as updated,
+					unread,feed_id,marked,link,last_read,
 					SUBSTRING(last_read,1,19) as last_read_noms,
 					$vfeed_query_part
 					SUBSTRING(updated,1,19) as updated_noms
@@ -872,7 +981,9 @@
 			$feed_kind = "Tags";
 
 			$result = db_query($link, "SELECT
-				ttrss_entries.id as id,title,updated,unread,feed_id,
+				ttrss_entries.id as id,title,
+				SUBSTRING(updated,1,16) as updated,
+				unread,feed_id,
 				marked,link,last_read,
 				SUBSTRING(last_read,1,19) as last_read_noms,
 				$vfeed_query_part
@@ -956,17 +1067,23 @@
 			// onclick=\"javascript:view($id,$feed_id)\">
 
 			print "<td valign='center' align='center'>$update_pic</td>";
+
+			print "<td valign='center' align='center'>
+				<input type=\"checkbox\" onclick=\"toggleSelectRow(this)\"
+					class=\"feedCheckBox\" id=\"RCHK-$id\">
+				</td>";
+
 			print "<td valign='center' align='center'>$marked_pic</td>";
 
-			print "<td width='25%'>
+			print "<td width='20%'>
 				<a href=\"javascript:view($id,$feed_id);\">".$line["updated"]."</a></td>";
 
 			if ($line["feed_title"]) {			
-				print "<td width='50%'>$content_link</td>";
+				print "<td width='55%'>$content_link</td>";
 				print "<td width='20%'>
 					<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a></td>";
 			} else {
-				print "<td width='70%'>$content_link</td>";
+				print "<td width='75%'>$content_link</td>";
 			}
 
 			print "</tr>";

functions.js

@@ -32,6 +32,13 @@ function rpc_notify_callback() {
 	}
 }
 
+function rpc_pnotify_callback() {
+	var container = parent.document.getElementById('notify');
+	if (xmlhttp_rpc.readyState == 4) {
+		container.innerHTML=xmlhttp_rpc.responseText;
+	}
+}
+
 function param_escape(arg) {
 	if (typeof encodeURIComponent != 'undefined')
 		return encodeURIComponent(arg);	
@@ -469,7 +476,8 @@ function selectTableRow(r, do_select) {
 	}
 }
 
-function selectTableRowsByIdPrefix(content_id, prefix, check_prefix, do_select) {
+function selectTableRowsByIdPrefix(content_id, prefix, check_prefix, do_select, 
+	classcheck) {
 
 	var content = document.getElementById(content_id);
 
@@ -479,6 +487,8 @@ function selectTableRowsByIdPrefix(content_id, prefix, check_prefix, do_select)
 	}
 
 	for (i = 0; i < content.rows.length; i++) {
+		if (!classcheck || content.rows[i].className.match(classcheck)) {
+	
 			if (content.rows[i].id.match(prefix)) {
 				selectTableRow(content.rows[i], do_select);
 			}
@@ -490,6 +500,7 @@ function selectTableRowsByIdPrefix(content_id, prefix, check_prefix, do_select)
 				check.checked = do_select;
 			}
 		}
+	}
 }
 
 function getSelectedTableRowIds(content_id, prefix) {
@@ -504,7 +515,9 @@ function getSelectedTableRowIds(content_id, prefix) {
 	var sel_rows = new Array();
 
 	for (i = 0; i < content.rows.length; i++) {
-		if (content.rows[i].className.match("Selected")) {
+		if (content.rows[i].id.match(prefix) && 
+				content.rows[i].className.match("Selected")) {
+				
 			var row_id = content.rows[i].id.replace(prefix + "-", "");
 			sel_rows.push(row_id);	
 		}
@@ -514,3 +527,18 @@ function getSelectedTableRowIds(content_id, prefix) {
 
 }
 
+function toggleSelectRow(sender) {
+	var parent_row = sender.parentNode.parentNode;
+
+	if (sender.checked) {
+		if (!parent_row.className.match("Selected")) {
+			parent_row.className = parent_row.className + "Selected";
+		}
+	} else {
+		if (parent_row.className.match("Selected")) {
+			parent_row.className = parent_row.className.replace("Selected", "");
+		}
+	}
+}
+
+

prefs.js

@@ -195,20 +195,6 @@ function updateUsersList() {
 
 }
 
-function toggleSelectRow(sender) {
-	var parent_row = sender.parentNode.parentNode;
-
-	if (sender.checked) {
-		if (!parent_row.className.match("Selected")) {
-			parent_row.className = parent_row.className + "Selected";
-		}
-	} else {
-		if (parent_row.className.match("Selected")) {
-			parent_row.className = parent_row.className.replace("Selected", "");
-		}
-	}
-}
-
 function addLabel() {
 
 	if (!xmlhttp_ready(xmlhttp)) {

tt-rss.css

@@ -686,3 +686,17 @@ td.selectPrompt {
 	font-size : x-small;
 	color : gray;
 }
+
+table.headlinesSubToolbar td.headlineActions {
+	font-size : x-small;
+	color : gray;
+	padding : 5px 0px 5px 5px;
+}
+
+table.headlinesSubToolbar td.headlineTitle {
+	font-size : x-small;
+	color : gray;
+	padding : 5px 5px 5px 0px;
+	text-align : right;
+}
+

tt-rss.php

@@ -131,9 +131,7 @@
 		<input type="submit" 
 			class="button" onclick="javascript:search()" value="Search">
 
-		&nbsp; 
+		&nbsp;View: 
-		
-		View: 
 		
 		<select id="viewbox" onchange="javascript:viewCurrentFeed(0, '')">
 			<option>All Articles</option>
@@ -174,6 +172,14 @@
 		
 		</select>
 
+<!--		&nbsp;Selection:
+
+		<select id="headopbox">
+			<option id="hopToggleRead">Toggle (un)read</option>
+		</select>
+
+		<input class="button" type="submit" onclick="headopGo()" value="Go"> -->
+
 		&nbsp;Feed: <input class="button" type="submit"
 			onclick="javascript:viewCurrentFeed(0, 'ForceUpdate')" value="Update">
 

viewfeed.js

@@ -77,6 +77,11 @@ function view(id, feed_id) {
 
 }
 
+function rowToggleMark(row) {
+
+
+
+}
 
 function toggleMark(id, toggle) {
 
@@ -133,7 +138,7 @@ function toggleMark(id, toggle) {
 	}
 
 	xmlhttp_rpc.open("GET", query, true);
-	xmlhttp_rpc.onreadystatechange=rpc_notify_callback;
+	xmlhttp_rpc.onreadystatechange=rpc_pnotify_callback;
 	xmlhttp_rpc.send(null);
 
 }
@@ -208,6 +213,92 @@ function localHotkeyHandler(keycode) {
 
 }
 
+function toggleUnread() {
+	try {
+		if (!xmlhttp_ready(xmlhttp_rpc)) {
+			printLockingError();
+			return;
+		}
+	
+		var rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
+
+		for (i = 0; i < rows.length; i++) {
+			var row = document.getElementById("RROW-" + rows[i]);
+			if (row) {
+				var nc = row.className;
+				nc = nc.replace("Unread", "");
+				nc = nc.replace("Selected", "");
+
+				if (row.className.match("Unread")) {
+					row.className = nc + "Selected";
+				} else {
+					row.className = nc + "UnreadSelected";
+				}
+			}
+		}
+
+		if (rows.length > 0) {
+
+			var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
+				param_escape(rows.toString()) + "&cmode=2";
+
+			xmlhttp_rpc.open("GET", query, true);
+			xmlhttp_rpc.onreadystatechange=all_counters_callback;
+			xmlhttp_rpc.send(null);
+
+		}
+
+	} catch (e) {
+		exception_error(e);
+	}
+}
+
+function toggleStarred() {
+	try {
+		if (!xmlhttp_ready(xmlhttp_rpc)) {
+			printLockingError();
+			return;
+		}
+	
+		var rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
+
+		for (i = 0; i < rows.length; i++) {
+			var row = document.getElementById("RROW-" + rows[i]);
+			var mark_img = document.getElementById("FMARKPIC-" + rows[i]);
+
+			if (row && mark_img) {
+
+				if (mark_img.alt == "Set mark") {
+					mark_img.src = "images/mark_set.png";
+					mark_img.alt = "Reset mark";
+					mark_img.setAttribute('onclick', 
+						'javascript:toggleMark('+rows[i]+', false)');
+
+				} else {
+					mark_img.src = "images/mark_unset.png";
+					mark_img.alt = "Set mark";
+					mark_img.setAttribute('onclick', 
+						'javascript:toggleMark('+rows[i]+', true)');
+				}
+			}
+		}
+
+		if (rows.length > 0) {
+
+			var query = "backend.php?op=rpc&subop=markSelected&ids=" +
+				param_escape(rows.toString()) + "&cmode=2";
+
+			xmlhttp_rpc.open("GET", query, true);
+			xmlhttp_rpc.onreadystatechange=all_counters_callback;
+			xmlhttp_rpc.send(null);
+
+		}
+
+	} catch (e) {
+		exception_error(e);
+	}
+}
+
 function init() {
 	document.onkeydown = hotkey_handler;
 }