]> git.wh0rd.org - tt-rss.git/blobdiff - backend.php
git.wh0rd.org / tt-rss.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
inputify buttons, store view modes in session cookies, disable headline toolbar initially
[tt-rss.git] / backend.php
diff --git a/backend.php b/backend.php
index 88d19641ff33f73c4cda1abdda21099aac463db2..492141b934365b2463d63b592e1d261217b23875 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -197,6 +197,7 @@
                        print "<html><head>
                                <title>Tiny Tiny RSS : Article $id</title>
                                <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
+                               <script type=\"text/javascript\" src=\"functions.js\"></script>
                                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
                                </head><body>";
                }
@@ -219,18 +220,14 @@
                                <td>&nbsp;</td></tr>";
 
                        if ($line["comments"] && $line["comments"] != $line["link"]) {
-//                             print "<tr class=\"titleInner\"><td align=\"right\"><b>Comments:</b></td>
-//                                     <td><a href=\"".$line["comments"]."\">".$line["comments"]."</a></td>
-//                                     <td>&nbsp;</td> </tr>";
-
                                $comments_prompt = "(<a href=\"".$line["comments"]."\">Comments</a>)";
                        }
                        
                        print "<tr class=\"titleBottom\"><td align=\"right\"><b>Link:</b></td>
                                <td><a href=\"".$line["link"]."\">".$line["link"]."</a> $comments_prompt</td>
-                               <td>&nbsp;</td></tr>";
+                               <td>&nbsp;</td></tr>"; 
                        print "<tr><td valign=\"top\" class=\"post\" 
-                               colspan=\"2\">" . $line["content"] . "</td>
+                               colspan=\"2\" width=\"100%\">" . $line["content"] . "</td>
                                <td valign=\"top\">$feed_icon</td>
                        </tr>";
                        print "</table>";        
@@ -249,6 +246,7 @@
                $subop = $_GET["subop"];
                $view_mode = $_GET["view"];
                $addheader = $_GET["addheader"];
+               $limit = $_GET["limit"];
 
                if (!$skip) $skip = 0;
 
@@ -256,7 +254,7 @@
 
                if ($addheader) {
                        print "<html><head>
-                               <title>Tiny Tiny RSS : Article $id</title>
+                               <title>Tiny Tiny RSS : Feed $feed</title>
                                <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
                                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
                                <script type=\"text/javascript\" src=\"functions.js\"></script>
@@ -293,27 +291,6 @@
 
                $feed_last_updated = "Updated: " . $line["last_updated"];
 
-               if (!$addheader) {
-
-                       print "<tr><td class=\"search\" colspan=\"4\">
-                               Search: <input id=\"searchbox\"
-                               onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
-                               onchange=\"javascript:search($feed);\"> ";
-
-                       print " <a class=\"button\" href=\"javascript:resetSearch()\">Reset</a>";
-       
-                       print "&nbsp;&nbsp;View: ";
-       
-                       print_select("viewbox", $view_mode, array("All Posts", "Starred"),
-                               "onchange=\"javascript:viewfeed('$feed', '0', '');\"");
-
-                       print "</td></tr>"; 
-               
-                       print "<tr>
-                       <td colspan=\"4\" class=\"title\">" . $line["title"] . "</td></tr>"; 
-
-               }
-
                $search = $_GET["search"];
 
                if ($search) {
@@ -329,6 +306,10 @@
                        $view_query_part = " marked = true AND ";
                }
 
+               if ($view_mode == "Unread") {
+                       $view_query_part = " unread = true AND ";
+               }
+
                $result = pg_query("SELECT count(id) AS total_entries 
                        FROM ttrss_entries WHERE 
                        $search_query_part
@@ -336,12 +317,23 @@
 
                $total_entries = pg_fetch_result($result, 0, "total_entries");
 
-               if (!$addheader) {
-                       $limit_query_part = "LIMIT ".HEADLINES_PER_PAGE." OFFSET $skip";
-               }
+               $result = pg_query("SELECT count(id) AS unread_entries 
+                       FROM ttrss_entries WHERE 
+                       $search_query_part
+                       unread = true AND
+                       feed_id = '$feed'");
+
+               $unread_entries = pg_fetch_result($result, 0, "unread_entries");
+
+/*             if ($limit < $unread_entries) 
+                       $limit = $unread_entries;
+
+               if ($limit != "All") {
+                       $limit_query_part = "LIMIT " . $limit;
+               } */
 
                $result = pg_query("SELECT 
-                               id,title,updated,unread,feed_id,marked,
+                               id,title,updated,unread,feed_id,marked,link,
                                EXTRACT(EPOCH FROM last_read) AS last_read_ts,
                                EXTRACT(EPOCH FROM updated) AS updated_ts
                        FROM
@@ -383,10 +375,11 @@
                                        alt=\"Set mark\" onclick='javascript:toggleMark($id, true)'>";
                        }
 
-                       $content_link = "<a href=\"javascript:view($id,$feed_id);\">" .
+                       $content_link = "<a id=\"FTITLE-$id\" href=\"javascript:view($id,$feed_id);\">" .
                                $line["title"] . "</a>";
                                
-                       print "<tr class='$class' id='RROW-$id'>";
+                       print "<tr class='$class' id='RROW-$id'";
+                       // onclick=\"javascript:view($id,$feed_id)\">
 
                        print "<td id='FUPDPIC-$id' valign='center' 
                                class='headlineUpdateMark'>$update_pic</td>";
@@ -398,6 +391,8 @@
                                <a href=\"javascript:view($id,$feed_id);\">".$line["updated"]."</a></td>";
                        print "<td class='headlineTitle'>$content_link</td>";
 
+                       print "<td class=\"invisible\" id=\"FLINK-$id\">".$line["link"]."</td>";
+
                        print "</tr>";
 
                        ++$lnum;
@@ -411,65 +406,6 @@
                        ++$lnum;
                        print "<tr><td>&nbsp;</td></tr>";
                }
-
-               // start unholy navbar block
-
-               if (!$addheader) {
-
-                       print "<tr><td colspan=\"4\" class=\"headlineToolbar\">";
-                       
-                       $next_skip = $skip + HEADLINES_PER_PAGE;
-                       $prev_skip = $skip - HEADLINES_PER_PAGE;
-       
-                       print "Navigate: ";
-       
-                       if ($prev_skip >= 0) {
-                               print "<a class=\"button\" 
-                                       href=\"javascript:viewfeed($feed, $prev_skip);\">Previous Page</a>";
-                       } else {
-                               print "<a class=\"disabledButton\">Previous Page</a>";
-                       }
-                       print "&nbsp;";
-       
-                       if ($next_skip < $total_entries) {              
-                               print "<a class=\"button\" 
-                                       href=\"javascript:viewfeed($feed, $next_skip);\">Next Page</a>";
-                       } else {
-                               print "<a class=\"disabledButton\">Next Page</a>";
-                       }                       
-                       print "&nbsp;&nbsp;Feed: ";
-       
-                       print "<a class=\"button\" 
-                               href=\"javascript:viewfeed($feed, 0, 'ForceUpdate');\">Update</a>";
-                       
-                       print "&nbsp;&nbsp;Mark as read: ";
-                       
-                       if ($num_unread > 0) {
-                               print "<a class=\"button\" id=\"btnCatchupPage\" 
-                                       href=\"javascript:catchupPage($feed);\">This Page</a>";
-                               print "&nbsp;";
-                       } else {
-                               print "<a class=\"disabledButton\">This Page</a>";
-                               print "&nbsp;";
-                       }
-               
-                       print "<a class=\"button\" 
-                               href=\"javascript:viewfeed($feed, $skip, 'MarkAllRead');\">All Posts</a>";
-
-               }
-
-/*             print "&nbsp;&nbsp;Unmark: ";
-
-               print "<a class=\"button\" 
-                       href=\"javascript:unmarkPosts(false);\">This Page</a>";
-               print "&nbsp;";
-
-               print "<a class=\"button\" 
-                       href=\"javascript:unmarkPosts(true);\">All Posts</a>"; */
-
-               print "</td></tr>";
-
-               // end unholy navbar block
                
                print "</table>";
 
@@ -500,6 +436,8 @@
                        } else if ($unread <= 0) {      
                                        feedr.className = feedr.className.replace(\"Unread\", \"\");
                        }       
+
+                       //p_notify('');
                </script>";
 
                if ($addheader) {
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/