last-minute theme compatibility fixes for 1.2.7

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index bbcfdce360ca62f053f5c4b4fd2ccaa12023dd09..d9348b44dcf19c591c1802d5a30b040391378a25 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -949,7 +949,7 @@
                }
 
                $feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\" 
-                       href=\"#\" onclick=\"javascript:viewfeed('$feed_id', '', false);\">$feed_title</a>";
+                       href=\"javascript:viewfeed('$feed_id', '', false);\">$feed_title</a>";
 
                print "<li id=\"FEEDR-$feed_id\" class=\"$class\">";
                if (get_pref($link, 'ENABLE_FEED_ICONS')) {
@@ -2371,7 +2371,7 @@
                                }
        
                                $content_query_part = "content as content_preview,";
-                               
+
                                $query = "SELECT 
                                                guid,
                                                ttrss_entries.id,ttrss_entries.title,
@@ -2694,7 +2694,9 @@
        function print_headline_subtoolbar($link, $feed_site_url, $feed_title, 
                        $bottom = false, $rtl_content = false, $feed_id = 0,
                        $is_cat = false, $search = false, $match_on = false,
-                       $search_mode = false) {
+                       $search_mode = false, $offset = 0) {
+
+                       $user_page_offset = $offset + 1;
 
                        if (!$bottom) {
                                $class = "headlinesSubToolbar";
@@ -2713,46 +2715,82 @@
                                $rtl_cpart = "";
                        }
 
+                       $page_prev_link = "javascript:viewFeedGoPage(-1)";
+                       $page_next_link = "javascript:viewFeedGoPage(1)";
+                       $page_first_link = "javascript:viewFeedGoPage(0)";
+
+                       $catchup_page_link = "catchupPage()";
+                       $catchup_feed_link = "catchupCurrentFeed()";
+
                        if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
 
-                               print "<td class=\"headlineActions$rtl_cpart\">".
-                                       _('Select:')."
-                                                               <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)\">All</a>,
-                                                               <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)\">Unread</a>,
-                                                               <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)\">None</a>
-                                               &nbsp;&nbsp;".
-                                               _('Toggle:')." <a href=\"javascript:selectionToggleUnread()\">Unread</a>,
-                                                       <a href=\"javascript:selectionToggleMarked()\">Starred</a>
-                                               &nbsp;&nbsp;".
-                                               _('Mark as read:')."
-                                                       <a href=\"#\" onclick=\"catchupPage()\">Page</a>,
-                                                       <a href=\"#\" onclick=\"catchupCurrentFeed()\">Feed</a>";
-                               print "</td>";
-
-                               if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
-                                       print "<td class=\"headlineActions$rtl_cpart\">
-                                               <a href=\"javascript:labelFromSearch('$search', '$search_mode',
-                                                               '$match_on', '$feed_id', '$is_cat');\">
-                                                       "._('Convert this search to label')."</a></td>";
-                               }
+                               $sel_all_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)";
+                               $sel_unread_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)";
+                               $sel_none_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)";
 
-                       } else {
+                               $tog_unread_link = "javascript:selectionToggleUnread()";
+                               $tog_marked_link = "javascript:selectionToggleMarked()";
 
-                               print "<td class=\"headlineActions$rtl_cpart\">".
-                                       _('Select:')."
-                                                               <a href=\"javascript:cdmSelectArticles('all')\">"._('All')."</a>,
-                                                               <a href=\"javascript:cdmSelectArticles('unread')\">"._('Unread')."</a>,
-                                                               <a href=\"javascript:cdmSelectArticles('none')\">"._('None')."</a>
-                                               &nbsp;&nbsp;".
-                                               _('Toggle:')." <a href=\"javascript:selectionToggleUnread(true)\">"._('Unread')."</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>";
+                       } else {
 
+                               $sel_all_link = "javascript:cdmSelectArticles('all')";
+                               $sel_unread_link = "javascript:cdmSelectArticles('unread')";
+                               $sel_none_link = "javascript:cdmSelectArticles('none')";
+
+                               $tog_unread_link = "javascript:selectionToggleUnread(true)";
+                               $tog_marked_link = "javascript:selectionToggleMarked(true)";
+
+                       }
+
+                       print "<td class=\"headlineActions$rtl_cpart\">
+                               <ul class=\"headlineDropdownMenu\">
+                               <li class=\"top2\">
+                               Select:
+                                       <a href=\"$sel_all_link\">All</a>,
+                                       <a href=\"$sel_unread_link\">Unread</a>,
+                                       <a href=\"$sel_none_link\">None</a></li>
+                               <li class=\"vsep\">&nbsp;</li>
+                               <li class=\"top\">Selection<ul>
+                                       <li onclick=\"$tog_unread_link\">Toggle Unread</li>
+                                       <li onclick=\"$tog_marked_link\">Toggle Starred</li></ul></li>
+                               <li class=\"vsep\">&nbsp;</li>
+                               <li class=\"top\">Mark as read<ul>
+                                       <li onclick=\"$catchup_page_link\">This Page</li>
+                                       <li onclick=\"$catchup_feed_link\">Entire Feed</li></ul></li>
+                               <li class=\"vsep\">&nbsp;</li>
+                               <!-- <li class=\"top2\">
+                               Page:
+                                       <a href=\"$page_prev_link\">Previous</a>,
+                                       <a href=\"$page_next_link\">Next</a></li> -->
+
+                               <li class=\"top\"><a href=\"$page_next_link\">Next Page</a><ul>
+                                       <li onclick=\"$page_prev_link\">Previous Page</li>
+                                       <li onclick=\"$page_first_link\">First Page</li></ul></li>
+                               </ul>  
+
+                               </td>"; 
+
+                       // old style subtoolbar:
+
+/*                     print "<td class=\"headlineActions$rtl_cpart\">".
+                               _('Select:')."
+                                                       <a href=\"$sel_all_link\">All</a>,
+                                                       <a href=\"$sel_unread_link\">Unread</a>,
+                                                       <a href=\"$sel_none_link\">None</a>
+                                       &nbsp;&nbsp;".
+                                       _('Toggle:')." <a href=\"$tog_unread_link\">Unread</a>,
+                                               <a href=\"$tog_marked_link\">Starred</a>
+                                       &nbsp;&nbsp;".
+                                       _('Mark as read:')."
+                                               <a href=\"#\" onclick=\"$catchup_page_link\">Page</a>,
+                                               <a href=\"#\" onclick=\"$catchup_feed_link\">Feed</a>";
+                       print "</td>";  */
+
+                       if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
+                               print "<td class=\"headlineActions$rtl_cpart\">
+                                       <a href=\"javascript:labelFromSearch('$search', '$search_mode',
+                                                       '$match_on', '$feed_id', '$is_cat');\">
+                                               "._('Convert to Label')."</a></td>";
                        }
 
                        print "<td class=\"headlineTitle$rtl_cpart\">";
@@ -2770,8 +2808,12 @@
                                $search_q = "&q=$search&m=$match_on&smode=$search_mode";
                        }
 
+                       if ($user_page_offset > 1) {
+                               print " [$user_page_offset] ";
+                       }
+
                        if (!$bottom) {
-                               print "&nbsp;
+                               print "
                                        <a target=\"_new\" 
                                                href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
                                                <img class=\"noborder\"