functionality updates

2005-08-21 16:01:18 +01:00 · 2005-08-21 16:01:18 +01:00 · a1a8a2be02
parent d76a3b036c
commit a1a8a2be02
6 changed files with 209 additions and 135 deletions
--- a/backend.php
+++ b/backend.php
@ -20,7 +20,7 @@
 				WHERE feed_id = ttrss_feeds.id AND unread = true) as unread
 			FROM ttrss_feeds ORDER BY title");			

-		print "<ul>";
+		print "<table width=\"100%\">";

 		$lnum = 0;

@ -36,13 +36,20 @@
 			
 //			if ($lnum == 2 || $lnum == 0) $feed = "<b>$feed</b>";

-			$feed = "<a href=\"javascript:viewfeed($feed_id, 0);\">$feed ($unread/$total)</a>";
+			if ($unread > 0) $class .= "Unread";

-			print "<li class=\"$class\">$feed</li>";
+			print "<tr class=\"$class\" id=\"FEEDR-$feed_id\">";
+
+			$feed = "<a href=\"javascript:viewfeed($feed_id, 0);\">$feed</a>";
+			print "<td id=\"FEEDN-$feed_id\">$feed</td>";
+			print "<td id=\"FEEDU-$feed_id\">$unread</td>";
+			print "<td id=\"FEEDT-$feed_id\">$total</td>";
+
+			print "</tr>";
 			++$lnum;
 		}

-		print "</ul>";
+		print "</table>";

 	}

@ -50,6 +57,8 @@

 		$id = $_GET["id"];

+		$result = pg_query("UPDATE ttrss_entries SET unread = false WHERE id = '$id'");
+
 		$result = pg_query("SELECT title,link,content FROM ttrss_entries
 			WHERE	id = '$id'");

@ -72,9 +81,10 @@
 	if ($op == "viewfeed") {

 		$feed = $_GET["feed"];
-//		$feed = 0; // for speed
-
 		$skip = $_GET["skip"];
+		$ext = $_GET["ext"];
+
+		if ($ext == "undefined") $ext = "";

 		$result = pg_query("SELECT * FROM ttrss_feeds WHERE id = '$feed'");

@ -82,6 +92,8 @@

 			$line = pg_fetch_assoc($result);

+			if (!$ext) {
+
 				$rss = fetch_rss($line["feed_url"]);
 	
 				if ($rss) {
@ -162,11 +174,25 @@
 	
 					}
 		
-				print "<table class=\"headlines\" width=\"100%\">";
-				print "<tr><td colspan=\"2\" class=\"title\">" . $rss->channel["title"] . "</td></tr>";
+				}

-				$result = pg_query("SELECT id,title,updated,unread FROM ttrss_entries WHERE
-					feed_id = '$feed' ORDER BY updated LIMIT 10 OFFSET $skip");
+			} else {
+
+				if ($ext == "MarkAllRead")  {
+
+					pg_query("UPDATE ttrss_entries SET unread = false 
+						WHERE feed_id = '$feed'");
+				}
+
+			}
+		}
+
+		print "<table class=\"headlines\" width=\"100%\">";
+		print "<tr><td colspan=\"2\" class=\"title\">" . $line["title"] . "</td></tr>";
+
+		$result = pg_query("SELECT id,title,updated,unread,feed_id FROM
+			ttrss_entries WHERE
+			feed_id = '$feed' ORDER BY updated LIMIT ".HEADLINES_PER_PAGE." OFFSET $skip");

 		$lnum = 0;

@ -177,7 +203,7 @@
 			if ($line["unread"] == "t") 
 				$class .= "Unread";

-					$content_link = "<a href=\"javascript:view(".$line["id"].");\">".$line["title"]."</a>";
+			$content_link = "<a href=\"javascript:view(".$line["id"].",".$line["feed_id"].");\">".$line["title"]."</a>";
 			
 			print "<tr class='$class' id='RROW-".$line["id"]."'>";
 			print "<td class='headlineUpdated'>".$line["updated"]."</td>";
@ -190,21 +216,35 @@

 		print "<tr><td colspan=\"2\" class=\"headlineToolbar\">";

-				$next_skip = $skip + 10;
-				$prev_skip = $skip - 10;
+		$next_skip = $skip + HEADLINES_PER_PAGE;
+		$prev_skip = $skip - HEADLINES_PER_PAGE;

 		print "<a class=\"button\" 
 			href=\"javascript:viewfeed($feed, $prev_skip);\">Previous Page</a>";
 		print "&nbsp;";
 		print "<a class=\"button\" 
 			href=\"javascript:viewfeed($feed, $next_skip);\">Next Page</a>";
+		print "&nbsp;&nbsp;&nbsp;";
+		
+		print "<a class=\"button\" 
+			href=\"javascript:viewfeed($feed, 0, 'MarkAllRead');\">Mark all as read</a>";

 		print "</td></tr>";
 		print "</table>";

-			}
+		$result = pg_query("SELECT id, (SELECT count(id) FROM ttrss_entries 
+			WHERE feed_id = ttrss_feeds.id) AS total,
+		(SELECT count(id) FROM ttrss_entries
+			WHERE feed_id = ttrss_feeds.id AND unread = true) as unread
+		FROM ttrss_feeds WHERE id = '$feed'");			
+
+		$total = pg_fetch_result($result, 0, "total");
+		$unread = pg_fetch_result($result, 0, "unread");
+
+		print "<div class=\"invisible\" id=\"FACTIVE\">$feed</div>";
+		print "<div class=\"invisible\" id=\"FTOTAL\">$total</div>";
+		print "<div class=\"invisible\" id=\"FUNREAD\">$unread</div>";

-		}
 	}


--- a/config.php-dist
+++ b/config.php-dist
@ -1,4 +1,6 @@
 <?
 	define(DB_CONN, "host=localhost dbname=fox user=fox password=XXXXXXXXXXX");
+	define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache');
+	define(HEADLINES_PER_PAGE, 15);
 ?>

--- a/header.png
+++ b/header.png
--- a/tt-rss.css
+++ b/tt-rss.css
@ -62,7 +62,10 @@ table.main td.toolbar {

 table.main td.header {
 	font-size : 18pt;
-	background : #f0f0f0;
+	background-color : #f0f0f0;
+	background-image : url("header.png");
+	background-position : top left;
+	background-repeat : repeat-x;
 	height : 50px;
 	padding-left : 80px;
 	padding-top : 30px;
@ -127,3 +130,7 @@ ul {
 	padding : 0px;
 	border : 1px solid #f0f0f0;
 }
+
+.invisible {
+	display : none;
+}
--- a/tt-rss.js
+++ b/tt-rss.js
@ -50,7 +50,6 @@ function feedlist_callback() {
 	var container = document.getElementById('feeds');
 	if (xmlhttp.readyState == 4) {
 		container.innerHTML=xmlhttp.responseText;
-	} else {
 	}
 }

@ -58,7 +57,28 @@ function viewfeed_callback() {
 	var container = document.getElementById('headlines');
 	if (xmlhttp.readyState == 4) {
 		container.innerHTML = xmlhttp.responseText;
-	} else {
+
+		var factive = document.getElementById("FACTIVE");
+		var funread = document.getElementById("FUNREAD");
+		var ftotal = document.getElementById("FTOTAL");
+
+		if (ftotal && factive && funread) {
+			var feed_id = factive.innerHTML;
+
+			var feedr = document.getElementById("FEEDR-" + feed_id);
+			var feedt = document.getElementById("FEEDT-" + feed_id);
+			var feedu = document.getElementById("FEEDU-" + feed_id);
+
+			feedt.innerHTML = ftotal.innerHTML;
+			feedu.innerHTML = funread.innerHTML;
+
+			if (feedu.innerHTML > 0 && !feedr.className.match("Unread")) {
+					feedr.className = feedr.className + "Unread";
+			} else if (feedu.innerHTML <= 0) {	
+					feedr.className = feedr.className.replace("Unread", "");
+			}
+
+		}
 	}
 }

@ -66,7 +86,6 @@ function view_callback() {
 	var container = document.getElementById('content');
 	if (xmlhttp.readyState == 4) {
 		container.innerHTML=xmlhttp.responseText;		
-	} else {
 	}
 }

@ -79,28 +98,34 @@ function update_feed_list() {

 }

-function viewfeed(feed, skip) {
+function viewfeed(feed, skip, ext) {

 	notify("view-feed: " + feed);

 	document.getElementById('headlines').innerHTML='Loading headlines, please wait...';		
+	document.getElementById('content').innerHTML='&nbsp;';		

 	xmlhttp.open("GET", "backend.php?op=viewfeed&feed=" + param_escape(feed) +
-		"&skip=" + skip, true);
+		"&skip=" + param_escape(skip) + "&ext=" + param_escape(ext) , true);
 	xmlhttp.onreadystatechange=viewfeed_callback;
 	xmlhttp.send(null);

 }

-function view(id) {
+function view(id,feed_id) {

 	var crow = document.getElementById("RROW-" + id);

-	if (crow) {
+	if (crow.className.match("Unread")) {
+		var umark = document.getElementById("FEEDU-" + feed_id);
+		umark.innerHTML = umark.innerHTML - 1;
 		crow.className = crow.className.replace("Unread", "");
-	}

-	notify(crow.className);
+		if (umark.innerHTML == "0") {
+			var feedr = document.getElementById("FEEDR-" + feed_id);
+			feedr.className = feedr.className.replace("Unread", "");
+		}
+	}

 	document.getElementById('content').innerHTML='Loading, please wait...';		

--- a/tt-rss.php
+++ b/tt-rss.php
@ -17,7 +17,7 @@
 <tr>
 	<td class="toolbar" valign="middle" colspan="2">	
 		<a class="button">Preferences</a>
-		<a class="button" href="javascript:reload()">Refresh</a>
+		<a class="button" href="javascript:refresh()">Refresh</a>
 	</td>
 </tr>
 <tr>
@ -25,11 +25,11 @@
 		Here be feeds
 	</td>
 	<td id="headlines" class="headlines" valign="top">
-			Here be headlines
+		Please select the feed.
 	</td>
 </tr>
 	<td class="content" id="content" valign="top">
-		Here be content	
+		&nbsp;
 	</td>
 </tr>
 <tr>