subtoolbar is now sticky

diff --git a/backend.php b/backend.php
index 656d88dfaccc815368cf7baba8d8f77f89faae01..72b3dab6481fcf3837fb3b1f1faff97e75e4f1cd 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -799,98 +799,14 @@
                                Could not display feed (query failed). Please check label match syntax or local configuration.</div>";
                        return;
                }
-
-               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) {
-
-                       if (!$bottom) {
-                               $class = "headlinesSubToolbar";
-                               $tid = "headlineActionsTop";
-                       } else {
-                               $class = "headlinesSubToolbar";
-                               $tid = "headlineActionsBottom";
-                       }
-
-                       print "<table class=\"$class\" id=\"$tid\"
-                               width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
-
-                       if ($rtl_content) {
-                               $rtl_cpart = "RTL";
-                       } else {
-                               $rtl_cpart = "";
-                       }
-
-                       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>";
-
-                               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>";
-                               }
-
-                       } else {
-
-                               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>";
-                       
-                               print "</td>";
-
-                       }
-
-                       print "<td class=\"headlineTitle$rtl_cpart\">";
-               
-                       if ($feed_site_url) {
-                               if (!$bottom) {
-                                       $target = "target=\"_blank\"";
-                               }
-                               print "<a $target href=\"$feed_site_url\">$feed_title</a>";
-                       } else {
-                               print $feed_title;
-                       }
-
-                       if ($search) {
-                               $search_q = "&q=$search&m=$match_on&smode=$search_mode";
-                       }
-
-                       if (!$bottom) {
-                               print "&nbsp;
-                                       <a target=\"_new\" 
-                                               href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
-                                               <img class=\"noborder\" 
-                                                       alt=\"Generated feed\" src=\"images/feed-icon-12x12.png\">
-                                       </a>";
-                       }
-                               
-                       print "</td>";
-                       print "</tr></table>";
-
-               }
        
                if (db_num_rows($result) > 0) {
 
                        print_headline_subtoolbar($link, $feed_site_url, $feed_title, false, 
                                $rtl_content, $feed, $cat_view, $search, $match_on, $search_mode);
 
+                       print "<div id=\"headlinesInnerContainer\">";
+
                        if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
                                print "<table class=\"headlinesList\" id=\"headlinesList\" 
                                        cellspacing=\"0\" width=\"100%\">";
@@ -1043,8 +959,10 @@
                                print "</table>";
                        }
 
-                       print_headline_subtoolbar($link, 
-                               "javascript:catchupPage()", "Mark page as read", true, $rtl_content);
+                       print "</div>";
+
+//                     print_headline_subtoolbar($link, 
+//                             "javascript:catchupPage()", "Mark page as read", true, $rtl_content);
 
 
                } else {

diff --git a/functions.php b/functions.php
index c218b6876f3d8f12153c2ebe6508c97c735f857b..7028958f05f92a8c425208abca4258865deab4ac 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -2597,4 +2597,93 @@
                        mb_strtolower(strip_tags($title)));
        }
 
+       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) {
+
+                       if (!$bottom) {
+                               $class = "headlinesSubToolbar";
+                               $tid = "headlineActionsTop";
+                       } else {
+                               $class = "headlinesSubToolbar";
+                               $tid = "headlineActionsBottom";
+                       }
+
+                       print "<table class=\"$class\" id=\"$tid\"
+                               width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
+
+                       if ($rtl_content) {
+                               $rtl_cpart = "RTL";
+                       } else {
+                               $rtl_cpart = "";
+                       }
+
+                       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>";
+                               }
+
+                       } else {
+
+                               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>";
+                       
+                               print "</td>";
+
+                       }
+
+                       print "<td class=\"headlineTitle$rtl_cpart\">";
+               
+                       if ($feed_site_url) {
+                               if (!$bottom) {
+                                       $target = "target=\"_blank\"";
+                               }
+                               print "<a $target href=\"$feed_site_url\">$feed_title</a>";
+                       } else {
+                               print $feed_title;
+                       }
+
+                       if ($search) {
+                               $search_q = "&q=$search&m=$match_on&smode=$search_mode";
+                       }
+
+                       if (!$bottom) {
+                               print "&nbsp;
+                                       <a target=\"_new\" 
+                                               href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
+                                               <img class=\"noborder\" 
+                                                       alt=\"Generated feed\" src=\"images/feed-icon-12x12.png\">
+                                       </a>";
+                       }
+                               
+                       print "</td>";
+                       print "</tr></table>";
+
+               }
+
 ?>

diff --git a/tt-rss.css b/tt-rss.css
index aa4c96c6c59d0267d4d98dd95cbac6007ff2a88d..d01699aa6c7d83ad27cbfc23ace706f37b8dcaf6 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1285,7 +1285,7 @@ div.headlines_normal {
        height : 305px;
        top : 85px;
        right : 0px;
-       overflow : auto;
+       overflow : hidden;
        font-size : small;
        border-collapse : collapse;
 }
@@ -1337,3 +1337,16 @@ div.headlines_cdm {
        margin-left : 1px;
        background-color : white;
 }
+
+#headlineActionsTop {
+/*     border-width : 0px 0px 1px 0px;
+       border-style : solid;
+       border-color : #c0c0c0;
+       background-color : #fafafa; */
+       font-size : x-small;
+}
+
+#headlinesInnerContainer {
+       height : 280px;
+       overflow : auto;
+}

diff --git a/tt-rss.php b/tt-rss.php
index bd61bed9afd78b18f2ac74ae3ea83c46fbc1f48d..23cb712a8040b74ccea36ef8133125e3efe63c9e 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -199,8 +199,8 @@ window.onload = init;
                &nbsp;<input class="button" type="submit"
                        onclick="viewCurrentFeed('ForceUpdate')" value="Update">
 
-               <input class="button" type="submit"
-                       onclick="catchupCurrentFeed()" value="Mark as read"> 
+               <!-- <input class="button" type="submit"
+                       onclick="catchupCurrentFeed()" value="Mark as read">  -->
 
        </div>